From 29cf879d111797ba08d57824153eb40cb1e9b819 Mon Sep 17 00:00:00 2001
From: lijun <lj7788@126.com>
Date: Fri, 25 Oct 2024 21:57:46 +0800
Subject: [PATCH] update code

---
 ruoyi-admin/pom.xml                           |  2 ++
 .../system/SysCaptchaController.java          |  1 +
 .../src/main/resources/templates/index.html   |  2 +-
 .../framework/config/ResourcesConfig.java     |  1 +
 .../ruoyi/framework/config/ShiroConfig.java   |  1 +
 .../shiro/service/SysPasswordService.java     |  5 ++++
 ruoyi-yanzhu/pom.xml                          | 29 +++++++++++++++++++
 .../controller/AttendanceCfgController.java   | 18 ++++++++++++
 .../com/yanzhu/jh/tools/SecurityUtils.java    |  4 +++
 9 files changed, 62 insertions(+), 1 deletion(-)
 create mode 100644 ruoyi-yanzhu/pom.xml
 create mode 100644 ruoyi-yanzhu/src/main/java/com/yanzhu/jh/project/controller/AttendanceCfgController.java
 create mode 100644 ruoyi-yanzhu/src/main/java/com/yanzhu/jh/tools/SecurityUtils.java

diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index 7405c16..2c7cec0 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -108,6 +108,8 @@
             <artifactId>mkl-screen</artifactId>
         </dependency>
 
+        <!-- 业务模块-->
+
         <dependency>
             <groupId>com.qcloud</groupId>
             <artifactId>cos_api</artifactId>
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysCaptchaController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysCaptchaController.java
index 739c469..d585ffa 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysCaptchaController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysCaptchaController.java
@@ -8,6 +8,7 @@ import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
+
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
diff --git a/ruoyi-admin/src/main/resources/templates/index.html b/ruoyi-admin/src/main/resources/templates/index.html
index f7f9b6d..47485e6 100644
--- a/ruoyi-admin/src/main/resources/templates/index.html
+++ b/ruoyi-admin/src/main/resources/templates/index.html
@@ -89,7 +89,7 @@
             </div>
         </nav>
     </div>
-    <!--左侧导航开始-->
+    <!--左侧导航开始111-->
     <nav class="navbar-default navbar-static-side" role="navigation">
 
         <div class="sidebar-collapse">
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java
index 5322ecd..75a430f 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java
@@ -45,6 +45,7 @@ public class ResourcesConfig implements WebMvcConfigurer
 
         /** swagger配置 */
         registry.addResourceHandler("/swagger-ui/**").addResourceLocations("classpath:/META-INF/resources/webjars/springfox-swagger-ui/");
+        registry.addResourceHandler("/yanzhu-ui/**").addResourceLocations("classpath:/yanzhu-ui/");
     }
 
     /**
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ShiroConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ShiroConfig.java
index 38e4e93..a2ea0e0 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ShiroConfig.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ShiroConfig.java
@@ -383,6 +383,7 @@ public class ShiroConfig
         filterChainDefinitionMap.put("/components/**", "anon");
         filterChainDefinitionMap.put("/js/**", "anon");
         filterChainDefinitionMap.put("/css/**", "anon");
+        filterChainDefinitionMap.put("/yanzhu-ui/**", "anon");
         filterChainDefinitionMap.put("/images/**", "anon");
         filterChainDefinitionMap.put("/fonts/**", "anon");
         filterChainDefinitionMap.put("/fileimg.makalu.cc/**", "anon");
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/service/SysPasswordService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/service/SysPasswordService.java
index 0aea63f..295babc 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/service/SysPasswordService.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/service/SysPasswordService.java
@@ -82,4 +82,9 @@ public class SysPasswordService
     {
         return new Md5Hash(loginName + password + salt).toHex();
     }
+
+    public static void main(String[] args){
+        String data="xdadminadmin123c73d0c";
+        System.out.println(new Md5Hash(data).toHex());
+    }
 }
diff --git a/ruoyi-yanzhu/pom.xml b/ruoyi-yanzhu/pom.xml
new file mode 100644
index 0000000..e687c80
--- /dev/null
+++ b/ruoyi-yanzhu/pom.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>ruoyi</artifactId>
+        <groupId>com.ruoyi</groupId>
+        <version>4.6.1</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>ruoyi-yanzhu</artifactId>
+
+    <description>
+        system系统模块
+    </description>
+
+    <dependencies>
+
+        <!-- 通用工具-->
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-common</artifactId>
+        </dependency>
+
+
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/ruoyi-yanzhu/src/main/java/com/yanzhu/jh/project/controller/AttendanceCfgController.java b/ruoyi-yanzhu/src/main/java/com/yanzhu/jh/project/controller/AttendanceCfgController.java
new file mode 100644
index 0000000..f7fd2ae
--- /dev/null
+++ b/ruoyi-yanzhu/src/main/java/com/yanzhu/jh/project/controller/AttendanceCfgController.java
@@ -0,0 +1,18 @@
+package com.ruoyi.system.controler.attendance;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+@Controller
+@RequestMapping("/mklapi/attendance/cfg")
+public class AttendanceCfgController {
+
+    @GetMapping("/test")
+    @ResponseBody
+    public AjaxResult test(){
+        return  AjaxResult.success("ok");
+    }
+}
diff --git a/ruoyi-yanzhu/src/main/java/com/yanzhu/jh/tools/SecurityUtils.java b/ruoyi-yanzhu/src/main/java/com/yanzhu/jh/tools/SecurityUtils.java
new file mode 100644
index 0000000..d2ab815
--- /dev/null
+++ b/ruoyi-yanzhu/src/main/java/com/yanzhu/jh/tools/SecurityUtils.java
@@ -0,0 +1,4 @@
+package com.yanzhu.jh.tools;
+
+public class SecurityUtils {
+}