v3.28.0 【优化】优化 Long、BigInteger、BigDecimal 的 JSON 序列化【优化】个人中心样式【优化】Spin加载

Merge pull request !90 from CoderKK/feat-json

README.md

@@ -4,14 +4,16 @@
 
 **<font color="#DC143C">国内首个满足《网络安全-三级等保》、《数据安全》</font>** 功能要求，支持登录限制、接口国产加解密、数据脱敏等一系列安全要求。
 
-前端提供 **<font color="#DC143C">JavaScript和TypeScript双版本</font>**，后端提供 **<font color="#DC143C">Java8+SpringBoot2.X和Java17+SpringBoot3.X 双版本</font>**。
+**<font color="#DC143C">支持国产数据库：【达梦、金仓、南大通用、OceanBase、GaussDB 高斯、阿里PolarDB、GoldenDB】等，主流数据库：【Mysql, PostgreSQL】等</font>**
+
+ **<font color="#DC143C">前端提供JavaScript和TypeScript双版本，后端提供Java8+SpringBoot2.X和Java17+SpringBoot3.X 双版本</font>**。
 
 同时 **<font color="#DC143C">重磅开源</font>** 开源六年来 **<font color="#DC143C">千余家企业验证过且正在使用</font>** 的代码规范: **<font color="#DC143C">《高质量代码思想》、《Vue3规范》、《Java规范》</font>** ，让大家在这浮躁的世界里感受到一股把代码写好的清流！同时又能节省大量时间，减少加班，快乐工作，保持谦逊，保持学习，**<font color="#DC143C">热爱代码，更热爱生活</font>** ！
 ### **技术体系**
 
 - 前端：JavaScript/TypeScript + Vue3 + Vite5 + Pinia + Ant Design Vue 4.X
 - 移动端：uniapp (vue3版本) + uni-ui + （同时支持APP、小程序、H5）
-- 后端：Java8/17 + SpringBoot2/3 + Sa Token + Mybatis-plus + 多种数据库
+- 后端：Java8/17 + SpringBoot2/3 + Sa Token + Mybatis-plus + 主流数据库/国产数据库
 - 官方文档：[https://smartadmin.vip](https://smartadmin.vip)
 - 电脑在线预览：[https://preview.smartadmin.vip](https://preview.smartadmin.vip)
 - 移动端在线预览：[https://app.smartadmin.vip](https://app.smartadmin.vip/#/pages/login/login)

smart-admin-api-java17-springboot3/pom.xml

@@ -16,55 +16,49 @@
     </modules>
 
     <properties>
-        <java.version>17</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <springboot.version>3.3.1</springboot.version>
-        <spring-mock.version>2.0.8</spring-mock.version>
-        <spring-security-crypto.version>6.4.3</spring-security-crypto.version>
-        <mybatis-plus.version>3.5.7</mybatis-plus.version>
+        <java.version>17</java.version>
+        <springboot.version>3.5.4</springboot.version>
+        <spring-security-crypto.version>6.5.1</spring-security-crypto.version>
+        <mybatis-plus.version>3.5.12</mybatis-plus.version>
         <p6spy.version>3.9.1</p6spy.version>
-        <knife4j.version>4.4.0</knife4j.version>
-        <fastjson.version>2.0.52</fastjson.version>
-        <druid.version>1.2.23</druid.version>
+        <springdoc-openapi.version>2.8.9</springdoc-openapi.version>
+        <knife4j.version>4.6.0</knife4j.version>
+        <fastjson.version>2.0.57</fastjson.version>
+        <druid.version>1.2.25</druid.version>
         <google-linkedhashmap.version>1.4.2</google-linkedhashmap.version>
         <google-guava.version>20.0</google-guava.version>
-        <user-agent-utils.version>1.21</user-agent-utils.version>
-        <reflections.version>0.9.11</reflections.version>
-        <commons-io.version>2.15.0</commons-io.version>
-        <commons-lang3.version>3.12.0</commons-lang3.version>
-        <commons-collections4.version>4.4</commons-collections4.version>
-        <commons-compress.version>1.26.0</commons-compress.version>
-        <commons-codec.version>1.13</commons-codec.version>
-        <commons-text.version>1.9</commons-text.version>
-        <xerces.version>2.12.0</xerces.version>
-        <fast-excel.version>1.0.0</fast-excel.version>
-        <poi.version>5.2.4</poi.version>
-        <ooxml-schemas.version>1.4</ooxml-schemas.version>
-        <aws-java-sdk.version>1.11.842</aws-java-sdk.version>
-        <log4j-spring-boot.version>2.23.1</log4j-spring-boot.version>
-        <hutool.version>5.8.29</hutool.version>
-        <velocity-engine-core.version>2.3</velocity-engine-core.version>
-        <jjwt.version>0.9.1</jjwt.version>
-        <jwks-rsa.version>0.9.0</jwks-rsa.version>
+        <reflections.version>0.10.2</reflections.version>
+        <commons-io.version>2.19.0</commons-io.version>
+        <commons-lang3.version>3.18.0</commons-lang3.version>
+        <commons-collections4.version>4.5.0</commons-collections4.version>
+        <commons-compress.version>1.27.1</commons-compress.version>
+        <commons-codec.version>1.18.0</commons-codec.version>
+        <commons-text.version>1.13.1</commons-text.version>
+        <fast-excel.version>1.2.0</fast-excel.version>
+        <poi.version>5.4.1</poi.version>
+        <awssdk-s3.version>2.31.78</awssdk-s3.version>
+        <mysql-connector-j.version>9.3.0</mysql-connector-j.version>
+        <hutool.version>5.8.39</hutool.version>
+        <velocity-engine-core.version>2.4.1</velocity-engine-core.version>
         <velocity-tools.version>3.1</velocity-tools.version>
-        <sa-token.version>1.41.0</sa-token.version>
+        <sa-token.version>1.44.0</sa-token.version>
         <ip2region.version>2.7.0</ip2region.version>
         <bcprov.version>1.80</bcprov.version>
-        <jackson-datatype-jsr310.version>2.13.4</jackson-datatype-jsr310.version>
-        <jackson-dataformat-yaml.version>2.16.1</jackson-dataformat-yaml.version>
         <smartdb.version>1.2.0</smartdb.version>
-        <redisson.version>3.25.0</redisson.version>
-        <snakeyaml.version>2.2</snakeyaml.version>
-        <freemarker.version>2.3.33</freemarker.version>
-        <jsoup.version>1.18.1</jsoup.version>
+        <redisson.version>3.50.0</redisson.version>
+        <snakeyaml.version>2.4</snakeyaml.version>
+        <freemarker.version>2.3.34</freemarker.version>
+        <jsoup.version>1.21.1</jsoup.version>
         <tika.version>3.1.0</tika.version>
+        <httpcomponents.version>5.5</httpcomponents.version>
     </properties>
 
     <dependencyManagement>
         <dependencies>
 
-            <!--BOM begin-->
+            <!--SpringBoot BOM begin-->
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-dependencies</artifactId>
@@ -72,19 +66,16 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
-            <!--BOM end-->
-
+            <!--SpringBoot BOM end-->
+            <!--mybatis-plus BOM begin-->
             <dependency>
                 <groupId>com.baomidou</groupId>
-                <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
+                <artifactId>mybatis-plus-bom</artifactId>
                 <version>${mybatis-plus.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.springframework.boot</groupId>
-                        <artifactId>spring-boot-starter-logging</artifactId>
-                    </exclusion>
-                </exclusions>
+                <type>pom</type>
+                <scope>import</scope>
             </dependency>
+            <!--mybatis-plus BOM end-->
 
             <dependency>
                 <groupId>org.springframework.security</groupId>
@@ -92,6 +83,12 @@
                 <version>${spring-security-crypto.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>com.mysql</groupId>
+                <artifactId>mysql-connector-j</artifactId>
+                <version>${mysql-connector-j.version}</version>
+            </dependency>
+
             <dependency>
                 <groupId>p6spy</groupId>
                 <artifactId>p6spy</artifactId>
@@ -99,7 +96,7 @@
             </dependency>
 
             <dependency>
-                <groupId>com.github.xiaoymin</groupId>
+                <groupId>com.github.xingfudeshi</groupId>
                 <artifactId>knife4j-openapi3-jakarta-spring-boot-starter</artifactId>
                 <version>${knife4j.version}</version>
             </dependency>
@@ -110,7 +107,6 @@
                 <version>${fastjson.version}</version>
             </dependency>
 
-            <!-- https://mvnrepository.com/artifact/com.alibaba/druid-spring-boot-starter -->
             <dependency>
                 <groupId>com.alibaba</groupId>
                 <artifactId>druid-spring-boot-3-starter</artifactId>
@@ -129,12 +125,6 @@
                 <version>${google-guava.version}</version>
             </dependency>
 
-            <dependency>
-                <groupId>eu.bitwalker</groupId>
-                <artifactId>UserAgentUtils</artifactId>
-                <version>${user-agent-utils.version}</version>
-            </dependency>
-
             <dependency>
                 <groupId>org.reflections</groupId>
                 <artifactId>reflections</artifactId>
@@ -178,9 +168,9 @@
             </dependency>
 
             <dependency>
-                <groupId>com.amazonaws</groupId>
-                <artifactId>aws-java-sdk-s3</artifactId>
-                <version>${aws-java-sdk.version}</version>
+                <groupId>software.amazon.awssdk</groupId>
+                <artifactId>s3</artifactId>
+                <version>${awssdk-s3.version}</version>
                 <exclusions>
                     <exclusion>
                         <artifactId>commons-logging</artifactId>
@@ -200,19 +190,6 @@
                 <artifactId>hutool-all</artifactId>
                 <version>${hutool.version}</version>
             </dependency>
-
-            <dependency>
-                <groupId>io.jsonwebtoken</groupId>
-                <artifactId>jjwt</artifactId>
-                <version>${jjwt.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>com.auth0</groupId>
-                <artifactId>jwks-rsa</artifactId>
-                <version>${jwks-rsa.version}</version>
-            </dependency>
-
             <!--velocity begin-->
             <dependency>
                 <groupId>org.apache.velocity</groupId>
@@ -239,6 +216,7 @@
                 <artifactId>sa-token-redis-jackson</artifactId>
                 <version>${sa-token.version}</version>
             </dependency>
+
             <!-- sa-token end -->
 
             <!--ip 地址-->
@@ -263,6 +241,10 @@
                         <artifactId>logback-classic</artifactId>
                         <groupId>ch.qos.logback</groupId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>org.bouncycastle</groupId>
+                        <artifactId>bcprov-jdk15on</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
 
@@ -272,12 +254,6 @@
                 <version>${poi.version}</version>
             </dependency>
 
-            <dependency>
-                <groupId>org.apache.poi</groupId>
-                <artifactId>poi-ooxml</artifactId>
-                <version>${poi.version}</version>
-            </dependency>
-
             <dependency>
                 <groupId>org.apache.poi</groupId>
                 <artifactId>poi-scratchpad</artifactId>
@@ -286,20 +262,8 @@
 
             <dependency>
                 <groupId>org.apache.poi</groupId>
-                <artifactId>ooxml-schemas</artifactId>
-                <version>${ooxml-schemas.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>com.fasterxml.jackson.datatype</groupId>
-                <artifactId>jackson-datatype-jsr310</artifactId>
-                <version>${jackson-datatype-jsr310.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>com.fasterxml.jackson.dataformat</groupId>
-                <artifactId>jackson-dataformat-yaml</artifactId>
-                <version>${jackson-dataformat-yaml.version}</version>
+                <artifactId>poi-ooxml-full</artifactId>
+                <version>${poi.version}</version>
             </dependency>
 
             <dependency>
@@ -313,6 +277,25 @@
                 <groupId>org.redisson</groupId>
                 <artifactId>redisson-spring-boot-starter</artifactId>
                 <version>${redisson.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.springframework.boot</groupId>
+                        <artifactId>spring-boot-starter-actuator</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.redisson</groupId>
+                        <artifactId>redisson-spring-data-32</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <artifactId>objenesis</artifactId>
+                        <groupId>org.objenesis</groupId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            <dependency>
+                <groupId>org.redisson</groupId>
+                <artifactId>redisson-spring-data-27</artifactId>
+                <version>${redisson.version}</version>
             </dependency>
 
             <dependency>
@@ -339,6 +322,12 @@
                 <version>${tika.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>org.apache.httpcomponents.client5</groupId>
+                <artifactId>httpclient5</artifactId>
+                <version>${httpcomponents.version}</version>
+            </dependency>
+
         </dependencies>
 
     </dependencyManagement>

smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/constant/AdminCacheConst.java

@@ -20,11 +20,6 @@ public class AdminCacheConst extends CacheKeyConst {
          */
         public static final String DEPARTMENT_LIST_CACHE = "department_list_cache";
 
-        /**
-         * 部门map
-         */
-        public static final String DEPARTMENT_MAP_CACHE = "department_map_cache";
-
         /**
          * 部门树
          */
@@ -54,4 +49,20 @@ public class AdminCacheConst extends CacheKeyConst {
         public static final String CATEGORY_TREE = "category_tree_cache";
     }
 
+    /**
+     * 登录相关
+     */
+    public static class Login {
+
+        /**
+         * 请求用户信息
+         */
+        public static final String REQUEST_EMPLOYEE = "login_request_employee";
+
+        /**
+         * 请求用户信息权限
+         */
+        public static final String USER_PERMISSION = "login_user_permission";
+    }
+
 }

smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/interceptor/AdminInterceptor.java

@@ -67,7 +67,8 @@ public class AdminInterceptor implements HandlerInterceptor {
             Method method = ((HandlerMethod) handler).getMethod();
             NoNeedLogin noNeedLogin = ((HandlerMethod) handler).getMethodAnnotation(NoNeedLogin.class);
             if (noNeedLogin != null) {
-                checkActiveTimeout(requestEmployee);
+                updateActiveTimeout(requestEmployee);
+                SmartRequestUtil.setRequestUser(requestEmployee);
                 return true;
             }
 
@@ -76,8 +77,8 @@ public class AdminInterceptor implements HandlerInterceptor {
                 return false;
             }
 
-            // 检测token 活跃频率
-            checkActiveTimeout(requestEmployee);
+            // 更新活跃
+            updateActiveTimeout(requestEmployee);
 
 
             // --------------- 第三步： 校验 权限 ---------------
@@ -122,15 +123,12 @@ public class AdminInterceptor implements HandlerInterceptor {
 
 
     /**
-     * 检测：token 最低活跃频率（单位：秒），如果 token 超过此时间没有访问系统就会被冻结
+     * 更新活跃时间
      */
-    private void checkActiveTimeout(RequestEmployee requestEmployee) {
-        // 用户不在线，也不用检测
+    private void updateActiveTimeout(RequestEmployee requestEmployee) {
         if (requestEmployee == null) {
             return;
         }
-
-        StpUtil.checkActiveTimeout();
         StpUtil.updateLastActiveToNow();
     }
 

smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/domain/form/GoodsQueryForm.java

@@ -17,7 +17,7 @@ import org.hibernate.validator.constraints.Length;
  * @Date 2021-10-25 20:26:54
  * @Wechat zhuoda1024
  * @Email lab1024@163.com
- * @Copyright <a href="https://1024lab.net">1024创新实验室</a>
+ * @Copyright  <a href="https://1024lab.net">1024创新实验室</a>
  */
 @Data
 public class GoodsQueryForm extends PageParam {

smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/domain/vo/GoodsVO.java

@@ -1,6 +1,5 @@
 package net.lab1024.sa.admin.module.business.goods.domain.vo;
 
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import net.lab1024.sa.admin.module.business.goods.constant.GoodsStatusEnum;

smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/controller/BankController.java

@@ -1,4 +1,4 @@
-package net.lab1024.sa.admin.module.business.oa.bank;
+package net.lab1024.sa.admin.module.business.oa.bank.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import io.swagger.v3.oas.annotations.Operation;
@@ -6,6 +6,7 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.annotation.Resource;
 import jakarta.validation.Valid;
 import net.lab1024.sa.admin.constant.AdminSwaggerTagConst;
+import net.lab1024.sa.admin.module.business.oa.bank.service.BankService;
 import net.lab1024.sa.admin.module.business.oa.bank.domain.BankCreateForm;
 import net.lab1024.sa.admin.module.business.oa.bank.domain.BankQueryForm;
 import net.lab1024.sa.admin.module.business.oa.bank.domain.BankUpdateForm;

smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/dao/BankDao.java

@@ -1,4 +1,4 @@
-package net.lab1024.sa.admin.module.business.oa.bank;
+package net.lab1024.sa.admin.module.business.oa.bank.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -7,7 +7,6 @@ import net.lab1024.sa.admin.module.business.oa.bank.domain.BankQueryForm;
 import net.lab1024.sa.admin.module.business.oa.bank.domain.BankVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Component;
 
 import java.util.List;
 

smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/service/BankService.java

@@ -1,8 +1,9 @@
-package net.lab1024.sa.admin.module.business.oa.bank;
+package net.lab1024.sa.admin.module.business.oa.bank.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
+import net.lab1024.sa.admin.module.business.oa.bank.dao.BankDao;
 import net.lab1024.sa.admin.module.business.oa.bank.domain.*;
 import net.lab1024.sa.admin.module.business.oa.enterprise.dao.EnterpriseDao;
 import net.lab1024.sa.admin.module.business.oa.enterprise.domain.entity.EnterpriseEntity;

smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/controller/EnterpriseController.java

@@ -1,4 +1,4 @@
-package net.lab1024.sa.admin.module.business.oa.enterprise;
+package net.lab1024.sa.admin.module.business.oa.enterprise.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import io.swagger.v3.oas.annotations.Operation;
@@ -8,6 +8,7 @@ import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.Valid;
 import lombok.extern.slf4j.Slf4j;
 import net.lab1024.sa.admin.constant.AdminSwaggerTagConst;
+import net.lab1024.sa.admin.module.business.oa.enterprise.service.EnterpriseService;
 import net.lab1024.sa.admin.module.business.oa.enterprise.domain.form.*;
 import net.lab1024.sa.admin.module.business.oa.enterprise.domain.vo.EnterpriseEmployeeVO;
 import net.lab1024.sa.admin.module.business.oa.enterprise.domain.vo.EnterpriseExcelVO;

smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/manager/EnterpriseEmployeeManager.java

@@ -1,4 +1,4 @@
-package net.lab1024.sa.admin.module.business.oa.enterprise;
+package net.lab1024.sa.admin.module.business.oa.enterprise.manager;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import net.lab1024.sa.admin.module.business.oa.enterprise.dao.EnterpriseEmployeeDao;

smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/service/EnterpriseService.java

@@ -1,4 +1,4 @@
-package net.lab1024.sa.admin.module.business.oa.enterprise;
+package net.lab1024.sa.admin.module.business.oa.enterprise.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.Lists;
@@ -13,6 +13,7 @@ import net.lab1024.sa.admin.module.business.oa.enterprise.domain.vo.EnterpriseEm
 import net.lab1024.sa.admin.module.business.oa.enterprise.domain.vo.EnterpriseExcelVO;
 import net.lab1024.sa.admin.module.business.oa.enterprise.domain.vo.EnterpriseListVO;
 import net.lab1024.sa.admin.module.business.oa.enterprise.domain.vo.EnterpriseVO;
+import net.lab1024.sa.admin.module.business.oa.enterprise.manager.EnterpriseEmployeeManager;
 import net.lab1024.sa.admin.module.system.department.service.DepartmentService;
 import net.lab1024.sa.base.common.code.UserErrorCode;
 import net.lab1024.sa.base.common.domain.PageResult;

smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/controller/InvoiceController.java

@@ -1,4 +1,4 @@
-package net.lab1024.sa.admin.module.business.oa.invoice;
+package net.lab1024.sa.admin.module.business.oa.invoice.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import io.swagger.v3.oas.annotations.Operation;
@@ -7,6 +7,7 @@ import jakarta.annotation.Resource;
 import jakarta.validation.Valid;
 import lombok.extern.slf4j.Slf4j;
 import net.lab1024.sa.admin.constant.AdminSwaggerTagConst;
+import net.lab1024.sa.admin.module.business.oa.invoice.service.InvoiceService;
 import net.lab1024.sa.admin.module.business.oa.invoice.domain.InvoiceAddForm;
 import net.lab1024.sa.admin.module.business.oa.invoice.domain.InvoiceQueryForm;
 import net.lab1024.sa.admin.module.business.oa.invoice.domain.InvoiceUpdateForm;

smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/dao/InvoiceDao.java

@@ -1,4 +1,4 @@
-package net.lab1024.sa.admin.module.business.oa.invoice;
+package net.lab1024.sa.admin.module.business.oa.invoice.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -7,7 +7,6 @@ import net.lab1024.sa.admin.module.business.oa.invoice.domain.InvoiceQueryForm;
 import net.lab1024.sa.admin.module.business.oa.invoice.domain.InvoiceVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Component;
 
 import java.util.List;
 

smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/service/InvoiceService.java

@@ -1,10 +1,11 @@
-package net.lab1024.sa.admin.module.business.oa.invoice;
+package net.lab1024.sa.admin.module.business.oa.invoice.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
-import net.lab1024.sa.admin.module.business.oa.enterprise.EnterpriseService;
+import net.lab1024.sa.admin.module.business.oa.enterprise.service.EnterpriseService;
 import net.lab1024.sa.admin.module.business.oa.enterprise.domain.vo.EnterpriseVO;
+import net.lab1024.sa.admin.module.business.oa.invoice.dao.InvoiceDao;
 import net.lab1024.sa.admin.module.business.oa.invoice.domain.*;
 import net.lab1024.sa.base.common.domain.PageResult;
 import net.lab1024.sa.base.common.domain.ResponseDTO;

smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/service/NoticeService.java

@@ -230,7 +230,7 @@ public class NoticeService {
                     noticeVisibleRange.setDataName(employeeEntity == null ? StringConst.EMPTY : employeeEntity.getActualName());
                 } else {
                     DepartmentVO departmentVO = departmentService.getDepartmentById(noticeVisibleRange.getDataId());
-                    noticeVisibleRange.setDataName(departmentVO == null ? StringConst.EMPTY : departmentVO.getName());
+                    noticeVisibleRange.setDataName(departmentVO == null ? StringConst.EMPTY : departmentVO.getDepartmentName());
                 }
             }
             updateFormVO.setVisibleRangeList(noticeVisibleRangeList);

smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/dao/DepartmentDao.java

@@ -5,7 +5,6 @@ import net.lab1024.sa.admin.module.system.department.domain.entity.DepartmentEnt
 import net.lab1024.sa.admin.module.system.department.domain.vo.DepartmentVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Component;
 
 import java.util.List;
 
@@ -32,4 +31,5 @@ public interface DepartmentDao extends BaseMapper<DepartmentEntity> {
      */
     List<DepartmentVO> listAll();
 
+    DepartmentVO selectDepartmentVO(@Param("departmentId")Long departmentId);
 }

smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/domain/entity/DepartmentEntity.java

@@ -31,12 +31,12 @@ public class DepartmentEntity {
     /**
      * 部门名称
      */
-    private String name;
+    private String departmentName;
 
     /**
      * 负责人员工 id
      */
-    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    @TableField(updateStrategy = FieldStrategy.NEVER)
     private Long managerId;
 
     /**

smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/domain/form/DepartmentAddForm.java

@@ -20,7 +20,7 @@ public class DepartmentAddForm {
     @Schema(description = "部门名称")
     @Length(min = 1, max = 50, message = "请输入正确的部门名称(1-50个字符)")
     @NotNull(message = "请输入正确的部门名称(1-50个字符)")
-    private String name;
+    private String departmentName;
 
     @Schema(description = "排序")
     @NotNull(message = "排序值")

smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/domain/vo/DepartmentVO.java

@@ -24,7 +24,7 @@ public class DepartmentVO implements Serializable {
     private Long departmentId;
 
     @Schema(description = "部门名称")
-    private String name;
+    private String departmentName;
 
     @Schema(description = "部门负责人姓名")
     private String managerName;

smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/manager/DepartmentCacheManager.java

@@ -29,7 +29,7 @@ import java.util.stream.Collectors;
  * @Date 2022-01-12 20:37:48
  * @Wechat zhuoda1024
  * @Email lab1024@163.com
- * @Copyright  <a href="https://1024lab.net">1024创新实验室</a>
+ * @Copyright <a href="https://1024lab.net">1024创新实验室</a>
  */
 @Slf4j
 @Service
@@ -42,7 +42,7 @@ public class DepartmentCacheManager {
         log.info("clear " + cache);
     }
 
-    @CacheEvict(value = {AdminCacheConst.Department.DEPARTMENT_LIST_CACHE, AdminCacheConst.Department.DEPARTMENT_MAP_CACHE, AdminCacheConst.Department.DEPARTMENT_SELF_CHILDREN_CACHE, AdminCacheConst.Department.DEPARTMENT_TREE_CACHE, AdminCacheConst.Department.DEPARTMENT_PATH_CACHE,}, allEntries = true)
+    @CacheEvict(value = {AdminCacheConst.Department.DEPARTMENT_LIST_CACHE, AdminCacheConst.Department.DEPARTMENT_SELF_CHILDREN_CACHE, AdminCacheConst.Department.DEPARTMENT_TREE_CACHE, AdminCacheConst.Department.DEPARTMENT_PATH_CACHE,}, allEntries = true)
     public void clearCache() {
         logClearInfo(AdminCacheConst.Department.DEPARTMENT_LIST_CACHE);
     }
@@ -56,19 +56,8 @@ public class DepartmentCacheManager {
         return departmentDao.listAll();
     }
 
-    /**
-     * 部门map
-     *
-     */
-    @Cacheable(AdminCacheConst.Department.DEPARTMENT_MAP_CACHE)
-    public Map<Long, DepartmentVO> getDepartmentMap() {
-        return departmentDao.listAll().stream().collect(Collectors.toMap(DepartmentVO::getDepartmentId, Function.identity()));
-    }
-
-
     /**
      * 缓存部门树结构
-     *
      */
     @Cacheable(AdminCacheConst.Department.DEPARTMENT_TREE_CACHE)
     public List<DepartmentTreeVO> getDepartmentTree() {
@@ -78,7 +67,6 @@ public class DepartmentCacheManager {
 
     /**
      * 缓存某个部门的下级id列表
-     *
      */
     @Cacheable(AdminCacheConst.Department.DEPARTMENT_SELF_CHILDREN_CACHE)
     public List<Long> getDepartmentSelfAndChildren(Long departmentId) {
@@ -89,7 +77,6 @@ public class DepartmentCacheManager {
 
     /**
      * 部门的路径名称
-     *
      */
     @Cacheable(AdminCacheConst.Department.DEPARTMENT_PATH_CACHE)
     public Map<Long, String> getDepartmentPathMap() {
@@ -110,22 +97,21 @@ public class DepartmentCacheManager {
      */
     private String buildDepartmentPath(DepartmentVO departmentVO, Map<Long, DepartmentVO> departmentMap) {
         if (Objects.equals(departmentVO.getParentId(), NumberUtils.LONG_ZERO)) {
-            return departmentVO.getName();
+            return departmentVO.getDepartmentName();
         }
         //父节点
         DepartmentVO parentDepartment = departmentMap.get(departmentVO.getParentId());
         if (parentDepartment == null) {
-            return departmentVO.getName();
+            return departmentVO.getDepartmentName();
         }
         String pathName = buildDepartmentPath(parentDepartment, departmentMap);
-        return pathName + "/" + departmentVO.getName();
+        return pathName + "/" + departmentVO.getDepartmentName();
 
     }
     // ---------------------- 构造树的一些方法 ------------------------------
 
     /**
      * 构建部门树结构
-     *
      */
     public List<DepartmentTreeVO> buildTree(List<DepartmentVO> voList) {
         if (CollectionUtils.isEmpty(voList)) {
@@ -140,7 +126,7 @@ public class DepartmentCacheManager {
         return treeVOList;
     }
 
-     /**
+    /**
      * 构建所有根节点的下级树形结构
      * 返回值为层序遍历结果
      * [由于departmentDao中listAll给出数据根据Sort降序 所以同一层中Sort值较大的优先遍历]
@@ -148,7 +134,7 @@ public class DepartmentCacheManager {
     private List<Long> recursiveBuildTree(List<DepartmentTreeVO> nodeList, List<DepartmentVO> allDepartmentList) {
         int nodeSize = nodeList.size();
         List<Long> childIdList = new ArrayList<>();
-        for(int i = 0; i < nodeSize; i++) {
+        for (int i = 0; i < nodeSize; i++) {
             int preIndex = i - 1;
             int nextIndex = i + 1;
             DepartmentTreeVO node = nodeList.get(i);
@@ -167,14 +153,14 @@ public class DepartmentCacheManager {
                 tempChildIdList = this.recursiveBuildTree(children, allDepartmentList);
             }
 
-            if(CollectionUtils.isEmpty(node.getSelfAndAllChildrenIdList())) {
+            if (CollectionUtils.isEmpty(node.getSelfAndAllChildrenIdList())) {
                 node.setSelfAndAllChildrenIdList(
                         new ArrayList<>()
                 );
             }
             node.getSelfAndAllChildrenIdList().add(node.getDepartmentId());
 
-            if(CollectionUtils.isNotEmpty(tempChildIdList)) {
+            if (CollectionUtils.isNotEmpty(tempChildIdList)) {
                 node.getSelfAndAllChildrenIdList().addAll(tempChildIdList);
                 childIdList.addAll(tempChildIdList);
             }
@@ -182,7 +168,7 @@ public class DepartmentCacheManager {
         }
 
         // 保证本层遍历顺序
-        for(int i = nodeSize - 1; i >= 0; i--) {
+        for (int i = nodeSize - 1; i >= 0; i--) {
             childIdList.add(0, nodeList.get(i).getDepartmentId());
         }
 
@@ -192,7 +178,6 @@ public class DepartmentCacheManager {
 
     /**
      * 获取子元素
-     *
      */
     private List<DepartmentTreeVO> getChildren(Long departmentId, List<DepartmentVO> voList) {
         List<DepartmentVO> childrenEntityList = voList.stream().filter(e -> departmentId.equals(e.getParentId())).collect(Collectors.toList());
@@ -205,7 +190,6 @@ public class DepartmentCacheManager {
 
     /**
      * 通过部门id,获取当前以及下属部门
-     *
      */
     public List<Long> selfAndChildrenIdList(Long departmentId, List<DepartmentVO> voList) {
         List<Long> selfAndChildrenIdList = Lists.newArrayList();

smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/service/DepartmentService.java

@@ -14,10 +14,7 @@ import net.lab1024.sa.base.common.domain.ResponseDTO;
 import net.lab1024.sa.base.common.util.SmartBeanUtil;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
-import java.util.Map;
 
 /**
  * 部门 service
@@ -26,7 +23,7 @@ import java.util.Map;
  * @Date 2022-01-12 20:37:48
  * @Wechat zhuoda1024
  * @Email lab1024@163.com
- * @Copyright  <a href="https://1024lab.net">1024创新实验室</a>
+ * @Copyright <a href="https://1024lab.net">1024创新实验室</a>
  */
 @Service
 public class DepartmentService {
@@ -44,7 +41,6 @@ public class DepartmentService {
 
     /**
      * 新增添加部门
-     *
      */
 
     public ResponseDTO<String> addDepartment(DepartmentAddForm departmentAddForm) {
@@ -57,7 +53,6 @@ public class DepartmentService {
 
     /**
      * 更新部门信息
-     *
      */
     public ResponseDTO<String> updateDepartment(DepartmentUpdateForm updateDTO) {
         if (updateDTO.getParentId() == null) {
@@ -78,7 +73,6 @@ public class DepartmentService {
      * 根据id删除部门
      * 1、需要判断当前部门是否有子部门,有子部门则不允许删除
      * 2、需要判断当前部门是否有员工，有员工则不能删除
-     *
      */
     public ResponseDTO<String> deleteDepartment(Long departmentId) {
         DepartmentEntity departmentEntity = departmentDao.selectById(departmentId);
@@ -122,7 +116,6 @@ public class DepartmentService {
 
     /**
      * 自身以及所有下级的部门id列表
-     *
      */
     public List<Long> selfAndChildrenIdList(Long departmentId) {
         return departmentCacheManager.getDepartmentSelfAndChildren(departmentId);
@@ -131,7 +124,6 @@ public class DepartmentService {
 
     /**
      * 获取所有部门
-     *
      */
     public List<DepartmentVO> listAll() {
         return departmentCacheManager.getDepartmentList();
@@ -140,10 +132,9 @@ public class DepartmentService {
 
     /**
      * 获取部门
-     *
      */
     public DepartmentVO getDepartmentById(Long departmentId) {
-        return departmentCacheManager.getDepartmentMap().get(departmentId);
+        return departmentDao.selectDepartmentVO(departmentId);
     }
 
     /**
@@ -153,38 +144,4 @@ public class DepartmentService {
         return departmentCacheManager.getDepartmentPathMap().get(departmentId);
     }
 
-    /**
-     * 查询全部父级部门（不包含自己）
-     *
-     */
-    public List<DepartmentVO> queryAllParentDepartment(Long departmentId) {
-        List<DepartmentVO> list = new ArrayList<>();
-
-        Map<Long, DepartmentVO> departmentMap = departmentCacheManager.getDepartmentMap();
-        DepartmentVO departmentVO = departmentMap.get(departmentId);
-        while (departmentVO != null) {
-            list.add(departmentVO);
-            departmentVO = departmentMap.get(departmentVO.getParentId());
-        }
-        Collections.reverse(list);
-        return list;
-    }
-
-    /**
-     * 查询全部父级部门（不包含自己）
-     *
-     */
-    public List<Long> queryAllParentDepartmentIdList(Long departmentId) {
-        List<Long> list = new ArrayList<>();
-
-        Map<Long, DepartmentVO> departmentMap = departmentCacheManager.getDepartmentMap();
-        DepartmentVO departmentVO = departmentMap.get(departmentId);
-        while (departmentVO != null) {
-            list.add(departmentVO.getDepartmentId());
-            departmentVO = departmentMap.get(departmentVO.getParentId());
-        }
-        Collections.reverse(list);
-        return list;
-    }
-
 }

smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/domain/entity/EmployeeEntity.java

@@ -23,6 +23,12 @@ public class EmployeeEntity {
     @TableId(type = IdType.AUTO)
     private Long employeeId;
 
+    /**
+     * 唯一id
+     */
+    private String employeeUid;
+
+
     /**
      * 登录账号
      */

smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/domain/form/EmployeeUpdatePasswordForm.java

@@ -2,9 +2,7 @@ package net.lab1024.sa.admin.module.system.employee.domain.form;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.Pattern;
 import lombok.Data;
-import net.lab1024.sa.base.common.util.SmartVerificationUtil;
 
 /**
  * 修改密码所需参数

smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/service/EmployeeService.java

@@ -138,16 +138,20 @@ public class EmployeeService {
         }
 
         EmployeeEntity entity = SmartBeanUtil.copy(employeeAddForm, EmployeeEntity.class);
+        // 员工uid
+        String employeeUid = cn.hutool.core.lang.UUID.randomUUID(true).toString(true);
+        entity.setEmployeeUid(employeeUid);
 
-        // 设置密码 默认密码
-        String password = securityPasswordService.randomPassword();
-        entity.setLoginPwd(SecurityPasswordService.getEncryptPwd(password));
+        // 设置密码 随机密码
+        String randomPassword = securityPasswordService.randomPassword();
+        String generateSaltPassword = this.generateSaltPassword(randomPassword, employeeUid);
+        entity.setLoginPwd(SecurityPasswordService.getEncryptPwd(generateSaltPassword));
 
         // 保存数据
         entity.setDeletedFlag(Boolean.FALSE);
         employeeManager.saveEmployee(entity, employeeAddForm.getRoleIdList());
 
-        return ResponseDTO.ok(password);
+        return ResponseDTO.ok(randomPassword);
     }
 
     /**
@@ -241,9 +245,6 @@ public class EmployeeService {
 
     /**
      * 更新登录人头像
-     *
-     * @param employeeUpdateAvatarForm
-     * @return
      */
     public ResponseDTO<String> updateAvatar(EmployeeUpdateAvatarForm employeeUpdateAvatarForm) {
         Long employeeId = employeeUpdateAvatarForm.getEmployeeId();
@@ -345,12 +346,12 @@ public class EmployeeService {
         }
 
         // 校验原始密码
-        if (!SecurityPasswordService.matchesPwd(updatePasswordForm.getOldPassword(),employeeEntity.getLoginPwd()) ) {
+        if (!SecurityPasswordService.matchesPwd(this.generateSaltPassword(updatePasswordForm.getOldPassword(), employeeEntity.getEmployeeUid()), employeeEntity.getLoginPwd())) {
             return ResponseDTO.userErrorParam("原密码有误，请重新输入");
         }
 
         // 新旧密码相同
-        if (Objects.equals(updatePasswordForm.getOldPassword(), updatePasswordForm.getNewPassword()) ){
+        if (Objects.equals(updatePasswordForm.getOldPassword(), updatePasswordForm.getNewPassword())) {
             return ResponseDTO.userErrorParam("新密码与原始密码相同，请重新输入");
         }
 
@@ -361,14 +362,13 @@ public class EmployeeService {
         }
 
         // 根据三级等保规则，校验密码是否重复
-        ResponseDTO<String> passwordRepeatTimes = securityPasswordService.validatePasswordRepeatTimes(requestUser, updatePasswordForm.getNewPassword());
+        ResponseDTO<String> passwordRepeatTimes = securityPasswordService.validatePasswordRepeatTimes(requestUser, this.generateSaltPassword(updatePasswordForm.getNewPassword(), employeeEntity.getEmployeeUid()));
         if (!passwordRepeatTimes.getOk()) {
             return ResponseDTO.error(passwordRepeatTimes);
         }
 
-
         // 更新密码
-        String newEncryptPassword = SecurityPasswordService.getEncryptPwd(updatePasswordForm.getNewPassword());
+        String newEncryptPassword = SecurityPasswordService.getEncryptPwd(this.generateSaltPassword(updatePasswordForm.getNewPassword(), employeeEntity.getEmployeeUid()));
         EmployeeEntity updateEntity = new EmployeeEntity();
         updateEntity.setEmployeeId(employeeId);
         updateEntity.setLoginPwd(newEncryptPassword);
@@ -395,7 +395,7 @@ public class EmployeeService {
         List<EmployeeVO> voList = employeeEntityList.stream().map(e -> {
             EmployeeVO employeeVO = SmartBeanUtil.copy(e, EmployeeVO.class);
             if (department != null) {
-                employeeVO.setDepartmentName(department.getName());
+                employeeVO.setDepartmentName(department.getDepartmentName());
             }
             return employeeVO;
         }).collect(Collectors.toList());
@@ -407,8 +407,14 @@ public class EmployeeService {
      * 重置密码
      */
     public ResponseDTO<String> resetPassword(Long employeeId) {
+        EmployeeEntity employeeEntity = employeeDao.selectById(employeeId);
+        if (employeeEntity == null) {
+            return ResponseDTO.error(UserErrorCode.DATA_NOT_EXIST);
+        }
+
         String password = securityPasswordService.randomPassword();
-        employeeDao.updatePassword(employeeId, SecurityPasswordService.getEncryptPwd(password));
+        String saltPassword = this.generateSaltPassword(password, employeeEntity.getEmployeeUid());
+        employeeDao.updatePassword(employeeId, SecurityPasswordService.getEncryptPwd(saltPassword));
         return ResponseDTO.ok(password);
     }
 
@@ -428,4 +434,14 @@ public class EmployeeService {
         return employeeDao.getByLoginName(loginName, false);
     }
 
+    /**
+     * 生成加盐密码
+     * 格式为：[password]_[uid大写]_[uid小写]
+     */
+    public String generateSaltPassword(String password, String employeeUid) {
+        return password + StringConst.UNDERLINE +
+                employeeUid.toUpperCase() +
+                StringConst.UNDERLINE +
+                employeeUid.toLowerCase();
+    }
 }

smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/controller/LoginController.java

@@ -57,7 +57,7 @@ public class LoginController {
         return ResponseDTO.ok(loginResult);
     }
 
-    @Operation(summary = "退出登陆  @author 卓大")
+    @Operation(summary = "退出登录  @author 卓大")
     @GetMapping("/login/logout")
     public ResponseDTO<String> logout() {
         return loginService.logout(SmartRequestUtil.getRequestUser());

smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/domain/RequestEmployee.java

@@ -7,6 +7,8 @@ import net.lab1024.sa.base.common.enumeration.GenderEnum;
 import net.lab1024.sa.base.common.enumeration.UserTypeEnum;
 import net.lab1024.sa.base.common.swagger.SchemaEnum;
 
+import java.io.Serializable;
+
 /**
  * 请求员工登录信息
  *
@@ -17,7 +19,7 @@ import net.lab1024.sa.base.common.swagger.SchemaEnum;
  * @Copyright  <a href="https://1024lab.net">1024创新实验室</a>
  */
 @Data
-public class RequestEmployee implements RequestUser {
+public class RequestEmployee implements RequestUser, Serializable {
 
     @Schema(description = "员工id")
     private Long employeeId;

smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/manager/LoginManager.java

@@ -0,0 +1,173 @@
+package net.lab1024.sa.admin.module.system.login.manager;
+
+import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import net.lab1024.sa.admin.constant.AdminCacheConst;
+import net.lab1024.sa.admin.module.system.department.domain.vo.DepartmentVO;
+import net.lab1024.sa.admin.module.system.department.service.DepartmentService;
+import net.lab1024.sa.admin.module.system.employee.domain.entity.EmployeeEntity;
+import net.lab1024.sa.admin.module.system.employee.service.EmployeeService;
+import net.lab1024.sa.admin.module.system.login.domain.RequestEmployee;
+import net.lab1024.sa.admin.module.system.menu.domain.vo.MenuVO;
+import net.lab1024.sa.admin.module.system.role.domain.vo.RoleVO;
+import net.lab1024.sa.admin.module.system.role.service.RoleEmployeeService;
+import net.lab1024.sa.admin.module.system.role.service.RoleMenuService;
+import net.lab1024.sa.base.common.constant.StringConst;
+import net.lab1024.sa.base.common.domain.ResponseDTO;
+import net.lab1024.sa.base.common.domain.UserPermission;
+import net.lab1024.sa.base.common.enumeration.UserTypeEnum;
+import net.lab1024.sa.base.common.util.SmartBeanUtil;
+import net.lab1024.sa.base.module.support.file.service.IFileStorageService;
+import org.apache.commons.lang3.BooleanUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.CachePut;
+import org.springframework.cache.annotation.Cacheable;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 登录Manager
+ *
+ * @Author 1024创新实验室: 卓大
+ * @Date 2025-05-03 22:56:34
+ * @Wechat zhuoda1024
+ * @Email lab1024@163.com
+ * @Copyright <a href="https://1024lab.net">1024创新实验室</a>
+ */
+@Slf4j
+@Service
+public class LoginManager {
+
+    @Resource
+    private DepartmentService departmentService;
+
+    @Resource
+    private IFileStorageService fileStorageService;
+
+    @Resource
+    private EmployeeService employeeService;
+
+    @Resource
+    private RoleEmployeeService roleEmployeeService;
+
+    @Resource
+    private RoleMenuService roleMenuService;
+
+
+    /**
+     * 获取请求用户信息
+     */
+    @Cacheable(AdminCacheConst.Login.REQUEST_EMPLOYEE)
+    public RequestEmployee getRequestEmployee(Long requestEmployeeId ) {
+        if (requestEmployeeId == null) {
+            return null;
+        }
+        // 员工基本信息
+        EmployeeEntity employeeEntity = employeeService.getById(requestEmployeeId);
+        if (employeeEntity == null) {
+            return null;
+        }
+
+        return this.loadLoginInfo(employeeEntity);
+    }
+
+    /**
+     * 获取登录的用户信息
+     */
+    @CachePut(value = AdminCacheConst.Login.REQUEST_EMPLOYEE, key = "#employeeEntity.employeeId")
+    public RequestEmployee loadLoginInfo(EmployeeEntity employeeEntity) {
+        // 基础信息
+        RequestEmployee requestEmployee = SmartBeanUtil.copy(employeeEntity, RequestEmployee.class);
+        requestEmployee.setUserType(UserTypeEnum.ADMIN_EMPLOYEE);
+
+        // 部门信息
+        DepartmentVO department = departmentService.getDepartmentById(employeeEntity.getDepartmentId());
+        requestEmployee.setDepartmentName(null == department ? StringConst.EMPTY : department.getDepartmentName());
+
+        // 头像信息
+        String avatar = employeeEntity.getAvatar();
+        if (StringUtils.isNotBlank(avatar)) {
+            ResponseDTO<String> getFileUrl = fileStorageService.getFileUrl(avatar);
+            if (BooleanUtils.isTrue(getFileUrl.getOk())) {
+                requestEmployee.setAvatar(getFileUrl.getData());
+            }
+        }
+        return requestEmployee;
+    }
+
+
+    /**
+     * 获取用户的权限（包含 角色列表、权限列表）
+     */
+    @Cacheable(AdminCacheConst.Login.USER_PERMISSION)
+    public UserPermission getUserPermission(Long employeeId) {
+        if(null == employeeId){
+            return null;
+        }
+
+        return this.loadUserPermission(employeeId);
+    }
+
+    /**
+     * 获取用户的权限（包含 角色列表、权限列表）
+     */
+    @CachePut(AdminCacheConst.Login.USER_PERMISSION)
+    public UserPermission loadUserPermission(Long employeeId) {
+        UserPermission userPermission = new UserPermission();
+        userPermission.setPermissionList(new ArrayList<>());
+        userPermission.setRoleList(new ArrayList<>());
+
+        // 角色列表
+        List<RoleVO> roleList = roleEmployeeService.getRoleIdList(employeeId);
+        userPermission.getRoleList().addAll(roleList.stream().map(RoleVO::getRoleCode).collect(Collectors.toSet()));
+
+        // 前端菜单和功能点清单
+        EmployeeEntity employeeEntity = employeeService.getById(employeeId);
+
+        List<MenuVO> menuAndPointsList = roleMenuService.getMenuList(roleList.stream().map(RoleVO::getRoleId).collect(Collectors.toList()), employeeEntity.getAdministratorFlag());
+
+        // 权限列表
+        HashSet<String> permissionSet = new HashSet<>();
+        for (MenuVO menu : menuAndPointsList) {
+            if (menu.getPermsType() == null) {
+                continue;
+            }
+
+            String perms = menu.getApiPerms();
+            if (StringUtils.isEmpty(perms)) {
+                continue;
+            }
+            //接口权限
+            String[] split = perms.split(",");
+            permissionSet.addAll(Arrays.asList(split));
+        }
+        userPermission.getPermissionList().addAll(permissionSet);
+
+        return userPermission;
+    }
+
+
+    /**
+     * 清除用户权限
+     */
+    @CacheEvict(value = AdminCacheConst.Login.USER_PERMISSION)
+    public void clearUserPermission(Long employeeId) {
+
+    }
+
+    /**
+     * 清除用户登录信息
+     */
+    @CacheEvict(value = AdminCacheConst.Login.REQUEST_EMPLOYEE)
+    public void clearUserLoginInfo(Long employeeId) {
+
+    }
+
+
+}

smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/service/LoginService.java

@@ -6,17 +6,15 @@ import cn.hutool.core.lang.UUID;
 import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.RandomUtil;
 import cn.hutool.extra.servlet.JakartaServletUtil;
-import com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap;
 import jakarta.annotation.Resource;
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.extern.slf4j.Slf4j;
-import net.lab1024.sa.admin.module.system.department.domain.vo.DepartmentVO;
-import net.lab1024.sa.admin.module.system.department.service.DepartmentService;
 import net.lab1024.sa.admin.module.system.employee.domain.entity.EmployeeEntity;
 import net.lab1024.sa.admin.module.system.employee.service.EmployeeService;
 import net.lab1024.sa.admin.module.system.login.domain.LoginForm;
 import net.lab1024.sa.admin.module.system.login.domain.LoginResultVO;
 import net.lab1024.sa.admin.module.system.login.domain.RequestEmployee;
+import net.lab1024.sa.admin.module.system.login.manager.LoginManager;
 import net.lab1024.sa.admin.module.system.menu.domain.vo.MenuVO;
 import net.lab1024.sa.admin.module.system.role.domain.vo.RoleVO;
 import net.lab1024.sa.admin.module.system.role.service.RoleEmployeeService;
@@ -39,7 +37,6 @@ import net.lab1024.sa.base.module.support.captcha.CaptchaService;
 import net.lab1024.sa.base.module.support.captcha.domain.CaptchaVO;
 import net.lab1024.sa.base.module.support.config.ConfigKeyEnum;
 import net.lab1024.sa.base.module.support.config.ConfigService;
-import net.lab1024.sa.base.module.support.file.service.IFileStorageService;
 import net.lab1024.sa.base.module.support.loginlog.LoginLogResultEnum;
 import net.lab1024.sa.base.module.support.loginlog.LoginLogService;
 import net.lab1024.sa.base.module.support.loginlog.domain.LoginLogEntity;
@@ -48,21 +45,22 @@ import net.lab1024.sa.base.module.support.mail.MailService;
 import net.lab1024.sa.base.module.support.mail.constant.MailTemplateCodeEnum;
 import net.lab1024.sa.base.module.support.redis.RedisService;
 import net.lab1024.sa.base.module.support.securityprotect.domain.LoginFailEntity;
-import net.lab1024.sa.base.module.support.securityprotect.service.*;
-import org.apache.commons.lang3.BooleanUtils;
-import org.apache.commons.lang3.StringUtils;
+import net.lab1024.sa.base.module.support.securityprotect.service.Level3ProtectConfigService;
+import net.lab1024.sa.base.module.support.securityprotect.service.SecurityLoginService;
+import net.lab1024.sa.base.module.support.securityprotect.service.SecurityPasswordService;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
-import java.util.*;
-import java.util.concurrent.ConcurrentMap;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
 import java.util.stream.Collectors;
 
 /**
  * 登录
  *
- * @Author 1024创新实验室: 开云
- * @Date 2021-12-01 22:56:34
+ * @Author 1024创新实验室: 卓大
+ * @Date 2025-05-03 22:56:34
  * @Wechat zhuoda1024
  * @Email lab1024@163.com
  * @Copyright <a href="https://1024lab.net">1024创新实验室</a>
@@ -76,28 +74,9 @@ public class LoginService implements StpInterface {
      */
     private static final String SUPER_PASSWORD_LOGIN_ID_PREFIX = "S";
 
-    /**
-     * 最大在线缓存人数
-     */
-    private static final long CACHE_MAX_ONLINE_PERSON_COUNT = 1000L;
-
-    /**
-     * 登录信息二级缓存
-     */
-    private final ConcurrentMap<Long, RequestEmployee> loginEmployeeCache = new ConcurrentLinkedHashMap.Builder<Long, RequestEmployee>().maximumWeightedCapacity(CACHE_MAX_ONLINE_PERSON_COUNT).build();
-
-
-    /**
-     * 权限 缓存
-     */
-    private final ConcurrentMap<Long, UserPermission> permissionCache = new ConcurrentLinkedHashMap.Builder<Long, UserPermission>().maximumWeightedCapacity(CACHE_MAX_ONLINE_PERSON_COUNT).build();
-
     @Resource
     private EmployeeService employeeService;
 
-    @Resource
-    private DepartmentService departmentService;
-
     @Resource
     private CaptchaService captchaService;
 
@@ -119,9 +98,6 @@ public class LoginService implements StpInterface {
     @Resource
     private SecurityPasswordService protectPasswordService;
 
-    @Resource
-    private IFileStorageService fileStorageService;
-
     @Resource
     private ApiEncryptService apiEncryptService;
 
@@ -134,6 +110,9 @@ public class LoginService implements StpInterface {
     @Resource
     private RedisService redisService;
 
+    @Resource
+    private LoginManager loginManager;
+
     /**
      * 获取验证码
      */
@@ -142,7 +121,7 @@ public class LoginService implements StpInterface {
     }
 
     /**
-     * 员工登陆
+     * 员工登录
      *
      * @return 返回用户登录信息
      */
@@ -206,7 +185,7 @@ public class LoginService implements StpInterface {
             }
 
             // 密码错误
-            if (!SecurityPasswordService.matchesPwd(requestPassword, employeeEntity.getLoginPwd())) {
+            if (!SecurityPasswordService.matchesPwd(employeeService.generateSaltPassword(requestPassword, employeeEntity.getEmployeeUid()), employeeEntity.getLoginPwd())) {
                 // 记录登录失败
                 saveLoginLog(employeeEntity, ip, userAgent, "密码错误", LoginLogResultEnum.LOGIN_FAIL, loginDeviceEnum);
                 // 记录等级保护次数
@@ -224,10 +203,7 @@ public class LoginService implements StpInterface {
         }
 
         // 获取员工信息
-        RequestEmployee requestEmployee = loadLoginInfo(employeeEntity);
-
-        // 放入缓存
-        loginEmployeeCache.put(employeeEntity.getEmployeeId(), requestEmployee);
+        RequestEmployee requestEmployee = loginManager.loadLoginInfo(employeeEntity);
 
         // 移除登录失败
         securityLoginService.removeLoginFail(employeeEntity.getEmployeeId(), UserTypeEnum.ADMIN_EMPLOYEE);
@@ -242,8 +218,8 @@ public class LoginService implements StpInterface {
         // 设置 token
         loginResultVO.setToken(token);
 
-        // 清除权限缓存
-        permissionCache.remove(employeeEntity.getEmployeeId());
+        // 更新用户权限
+        loginManager.loadUserPermission(employeeEntity.getEmployeeId());
 
         return ResponseDTO.ok(loginResultVO);
     }
@@ -262,10 +238,6 @@ public class LoginService implements StpInterface {
         List<MenuVO> menuAndPointsList = roleMenuService.getMenuList(roleList.stream().map(RoleVO::getRoleId).collect(Collectors.toList()), requestEmployee.getAdministratorFlag());
         loginResultVO.setMenuList(menuAndPointsList);
 
-        // 更新下后端权限缓存
-        UserPermission userPermission = getUserPermission(requestEmployee.getUserId());
-        permissionCache.put(requestEmployee.getUserId(), userPermission);
-
         // 上次登录信息
         LoginLogVO loginLogVO = loginLogService.queryLastByUserId(requestEmployee.getEmployeeId(), UserTypeEnum.ADMIN_EMPLOYEE, LoginLogResultEnum.LOGIN_SUCCESS);
         if (loginLogVO != null) {
@@ -290,33 +262,7 @@ public class LoginService implements StpInterface {
 
 
     /**
-     * 获取登录的用户信息
-     */
-    private RequestEmployee loadLoginInfo(EmployeeEntity employeeEntity) {
-
-        // 基础信息
-        RequestEmployee requestEmployee = SmartBeanUtil.copy(employeeEntity, RequestEmployee.class);
-        requestEmployee.setUserType(UserTypeEnum.ADMIN_EMPLOYEE);
-
-        // 部门信息
-        DepartmentVO department = departmentService.getDepartmentById(employeeEntity.getDepartmentId());
-        requestEmployee.setDepartmentName(null == department ? StringConst.EMPTY : department.getName());
-
-        // 头像信息
-        String avatar = employeeEntity.getAvatar();
-        if (StringUtils.isNotBlank(avatar)) {
-            ResponseDTO<String> getFileUrl = fileStorageService.getFileUrl(avatar);
-            if (BooleanUtils.isTrue(getFileUrl.getOk())) {
-                requestEmployee.setAvatar(getFileUrl.getData());
-            }
-        }
-
-        return requestEmployee;
-    }
-
-
-    /**
-     * 根据登陆token 获取员请求工信息
+     * 根据登录token 获取员请求工信息
      */
     public RequestEmployee getLoginEmployee(String loginId, HttpServletRequest request) {
         if (loginId == null) {
@@ -328,17 +274,7 @@ public class LoginService implements StpInterface {
             return null;
         }
 
-        RequestEmployee requestEmployee = loginEmployeeCache.get(requestEmployeeId);
-        if (requestEmployee == null) {
-            // 员工基本信息
-            EmployeeEntity employeeEntity = employeeService.getById(requestEmployeeId);
-            if (employeeEntity == null) {
-                return null;
-            }
-
-            requestEmployee = this.loadLoginInfo(employeeEntity);
-            loginEmployeeCache.put(requestEmployeeId, requestEmployee);
-        }
+        RequestEmployee requestEmployee = loginManager.getRequestEmployee(requestEmployeeId);
 
         // 更新请求ip和user agent
         requestEmployee.setUserAgent(JakartaServletUtil.getHeaderIgnoreCase(request, RequestHeaderConst.USER_AGENT));
@@ -381,8 +317,8 @@ public class LoginService implements StpInterface {
         // sa token 登出
         StpUtil.logout();
 
-        // 清空登录信息缓存
-        loginEmployeeCache.remove(requestUser.getUserId());
+        // 清除用户登录信息缓存和权限信息
+        this.clearLoginEmployeeCache(requestUser.getUserId());
 
         //保存登出日志
         LoginLogEntity loginEntity = LoginLogEntity.builder()
@@ -400,14 +336,6 @@ public class LoginService implements StpInterface {
         return ResponseDTO.ok();
     }
 
-    /**
-     * 清除员工登录缓存
-     */
-    public void clearLoginEmployeeCache(Long employeeId) {
-        // 清空登录信息缓存
-        loginEmployeeCache.remove(employeeId);
-    }
-
     /**
      * 保存登录日志
      */
@@ -435,12 +363,7 @@ public class LoginService implements StpInterface {
             return Collections.emptyList();
         }
 
-        UserPermission userPermission = permissionCache.get(employeeId);
-        if (userPermission == null) {
-            userPermission = getUserPermission(employeeId);
-            permissionCache.put(employeeId, userPermission);
-        }
-
+        UserPermission userPermission = loginManager.getUserPermission(employeeId);
         return userPermission.getPermissionList();
     }
 
@@ -451,51 +374,10 @@ public class LoginService implements StpInterface {
             return Collections.emptyList();
         }
 
-        UserPermission userPermission = permissionCache.get(employeeId);
-        if (userPermission == null) {
-            userPermission = getUserPermission(employeeId);
-            permissionCache.put(employeeId, userPermission);
-        }
+        UserPermission userPermission = loginManager.getUserPermission(employeeId);
         return userPermission.getRoleList();
     }
 
-    /**
-     * 获取用户的权限（包含 角色列表、权限列表）
-     */
-    private UserPermission getUserPermission(Long employeeId) {
-
-        UserPermission userPermission = new UserPermission();
-        userPermission.setPermissionList(new ArrayList<>());
-        userPermission.setRoleList(new ArrayList<>());
-
-        // 角色列表
-        List<RoleVO> roleList = roleEmployeeService.getRoleIdList(employeeId);
-        userPermission.getRoleList().addAll(roleList.stream().map(RoleVO::getRoleCode).collect(Collectors.toSet()));
-
-        // 前端菜单和功能点清单
-        EmployeeEntity employeeEntity = employeeService.getById(employeeId);
-
-        List<MenuVO> menuAndPointsList = roleMenuService.getMenuList(roleList.stream().map(RoleVO::getRoleId).collect(Collectors.toList()), employeeEntity.getAdministratorFlag());
-
-        // 权限列表
-        HashSet<String> permissionSet = new HashSet<>();
-        for (MenuVO menu : menuAndPointsList) {
-            if (menu.getPermsType() == null) {
-                continue;
-            }
-
-            String perms = menu.getApiPerms();
-            if (StringUtils.isEmpty(perms)) {
-                continue;
-            }
-            //接口权限
-            String[] split = perms.split(",");
-            permissionSet.addAll(Arrays.asList(split));
-        }
-        userPermission.getPermissionList().addAll(permissionSet);
-
-        return userPermission;
-    }
 
     /**
      * 发送 邮箱 验证码
@@ -590,4 +472,9 @@ public class LoginService implements StpInterface {
         String redisVerificationCodeKey = redisService.generateRedisKey(RedisKeyConst.Support.LOGIN_VERIFICATION_CODE, UserTypeEnum.ADMIN_EMPLOYEE.getValue() + RedisKeyConst.SEPARATOR + employeeId);
         redisService.delete(redisVerificationCodeKey);
     }
+
+    public void clearLoginEmployeeCache(Long employeeId) {
+        loginManager.clearUserPermission(employeeId);
+        loginManager.clearUserLoginInfo(employeeId);
+    }
 }

smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/service/MenuService.java

@@ -15,6 +15,7 @@ import net.lab1024.sa.base.common.code.SystemErrorCode;
 import net.lab1024.sa.base.common.domain.RequestUrlVO;
 import net.lab1024.sa.base.common.domain.ResponseDTO;
 import net.lab1024.sa.base.common.util.SmartBeanUtil;
+import net.lab1024.sa.base.common.util.SmartStringUtil;
 import org.apache.commons.lang3.math.NumberUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
@@ -134,6 +135,10 @@ public class MenuService {
      * @return true 重复 false 未重复
      */
     public <T extends MenuBaseForm> Boolean validateWebPerms(T menuDTO) {
+        if(SmartStringUtil.isEmpty(menuDTO.getWebPerms())){
+            return false;
+        }
+
         MenuEntity menu = menuDao.getByWebPerms(menuDTO.getWebPerms(), Boolean.FALSE);
         if (menuDTO instanceof MenuAddForm) {
             return menu != null;

smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/position/domain/entity/PositionEntity.java

@@ -34,7 +34,7 @@ public class PositionEntity {
     /**
      * 职级
      */
-    private String level;
+    private String positionLevel;
 
     /**
      * 排序

smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/position/domain/form/PositionAddForm.java

@@ -21,7 +21,7 @@ public class PositionAddForm {
     private String positionName;
 
     @Schema(description = "职级")
-    private String level;
+    private String positionLevel;
 
     @Schema(description = "排序")
     @NotNull(message = "排序不能为空")

smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/position/domain/vo/PositionVO.java

@@ -23,7 +23,7 @@ public class PositionVO {
     private String positionName;
 
     @Schema(description = "职级")
-    private String level;
+    private String positionLevel;
 
     @Schema(description = "排序")
     private Integer sort;

smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/domain/form/RoleEmployeeUpdateForm.java

@@ -5,7 +5,6 @@ import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 
-import java.util.List;
 import java.util.Set;
 
 /**

smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/manager/RoleEmployeeManager.java

@@ -3,11 +3,7 @@ package net.lab1024.sa.admin.module.system.role.manager;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import net.lab1024.sa.admin.module.system.role.dao.RoleEmployeeDao;
 import net.lab1024.sa.admin.module.system.role.domain.entity.RoleEmployeeEntity;
-import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
 
 /**
  * 角色员工 manager

smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/service/RoleEmployeeService.java

@@ -22,7 +22,6 @@ import net.lab1024.sa.base.common.util.SmartBeanUtil;
 import net.lab1024.sa.base.common.util.SmartPageUtil;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 import java.util.Map;
@@ -73,7 +72,7 @@ public class RoleEmployeeService {
         List<Long> departmentIdList = employeeList.stream().filter(e -> e != null && e.getDepartmentId() != null).map(EmployeeVO::getDepartmentId).collect(Collectors.toList());
         if (CollectionUtils.isNotEmpty(departmentIdList)) {
             List<DepartmentEntity> departmentEntities = departmentDao.selectBatchIds(departmentIdList);
-            Map<Long, String> departmentIdNameMap = departmentEntities.stream().collect(Collectors.toMap(DepartmentEntity::getDepartmentId, DepartmentEntity::getName));
+            Map<Long, String> departmentIdNameMap = departmentEntities.stream().collect(Collectors.toMap(DepartmentEntity::getDepartmentId, DepartmentEntity::getDepartmentName));
             employeeList.forEach(e -> {
                 e.setDepartmentName(departmentIdNameMap.getOrDefault(e.getDepartmentId(), StringConst.EMPTY));
             });

smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminProtectController.java

@@ -22,7 +22,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
- *
  * 网络安全
  *
  * @Author 1024创新实验室-主任:卓大

smart-admin-api-java17-springboot3/sa-admin/src/main/resources/dev/log4j2-spring.xml

@@ -5,12 +5,13 @@
 -->
 <Configuration status="INFO" monitorInterval="30">
     <Properties>
-        <Property name="log-directory" value="${sys:project.log-directory}"/>
+        <Property name="log-directory" value="${spring:project.log-directory}"/>
     </Properties>
     <Appenders>
         <Console name="Console" target="SYSTEM_OUT">
             <ThresholdFilter level="info" onMatch="ACCEPT" onMismatch="DENY"/>
-            <PatternLayout pattern="[%d][%-5p][%t] %m (%F:%L)%n"/>
+            <PatternLayout pattern="[%blue{%d}][%highlight{%-5p}][%t][%cyan{%c{1.}:%L}] %m %n"
+                           disableAnsi="false" noConsoleNoAnsi="false"/>
         </Console>
         <RollingFile name="debug" fileName="${log-directory}/debug/debug.log"
                      filePattern="${log-directory}/debug/debug-%d{yyyy-MM-dd}-%i.log">
@@ -18,7 +19,7 @@
                 <ThresholdFilter level="info" onMatch="DENY" onMismatch="NEUTRAL"/>
                 <ThresholdFilter level="debug" onMatch="ACCEPT" onMismatch="DENY"/>
             </Filters>
-            <PatternLayout pattern="[%d][%-5p][%t] %m (%F:%L)%n"/>
+            <PatternLayout pattern="[%d][%-5p][%t][%c{1.}:%L] %m %n"/>
             <Policies>
                 <TimeBasedTriggeringPolicy interval="1" modulate="true"/>
                 <SizeBasedTriggeringPolicy size="50 MB"/>
@@ -36,7 +37,7 @@
                 <ThresholdFilter level="warn" onMatch="DENY" onMismatch="NEUTRAL"/>
                 <ThresholdFilter level="info" onMatch="ACCEPT" onMismatch="DENY"/>
             </Filters>
-            <PatternLayout pattern="[%d][%-5p][%t] %m (%F:%L)%n"/>
+            <PatternLayout pattern="[%d][%-5p][%t][%c{1.}:%L] %m %n"/>
             <Policies>
                 <TimeBasedTriggeringPolicy interval="1" modulate="true"/>
                 <SizeBasedTriggeringPolicy size="50 MB"/>
@@ -54,7 +55,7 @@
                 <ThresholdFilter level="error" onMatch="DENY" onMismatch="NEUTRAL"/>
                 <ThresholdFilter level="warn" onMatch="ACCEPT" onMismatch="DENY"/>
             </Filters>
-            <PatternLayout pattern="[%d][%-5p][%t] %m (%F:%L)%n"/>
+            <PatternLayout pattern="[%d][%-5p][%t][%c{1.}:%L] %m %n"/>
             <Policies>
                 <TimeBasedTriggeringPolicy interval="1" modulate="true"/>
                 <SizeBasedTriggeringPolicy size="50 MB"/>
@@ -72,7 +73,7 @@
                 <ThresholdFilter level="fatal" onMatch="DENY" onMismatch="NEUTRAL"/>
                 <ThresholdFilter level="error" onMatch="ACCEPT" onMismatch="DENY"/>
             </Filters>
-            <PatternLayout pattern="[%d][%-5p][%t] %m (%F:%L)%n"/>
+            <PatternLayout pattern="[%d][%-5p][%t][%c{1.}:%L] %m %n"/>
             <Policies>
                 <TimeBasedTriggeringPolicy interval="1" modulate="true"/>
                 <SizeBasedTriggeringPolicy size="10 MB"/>
@@ -86,7 +87,7 @@
         </RollingFile>
         <RollingFile name="druidSlowSqlLog" fileName="${log-directory}/slow-sql/slow-sql.log"
                      filePattern="${log-directory}/slow-sql/slow-sql-%d{yyyy-MM-dd}-%i.log">
-            <PatternLayout pattern="[%d][%-5p][%t] %m (%F:%L)%n"/>
+            <PatternLayout pattern="[%d][%-5p][%t][%c{1.}:%L] %m %n"/>
             <Policies>
                 <TimeBasedTriggeringPolicy interval="1" modulate="true"/>
                 <SizeBasedTriggeringPolicy size="50 MB"/>
@@ -101,11 +102,9 @@
     </Appenders>
 
     <Loggers>
-
         <logger name="com.alibaba.druid.filter.stat.StatFilter" level="ERROR" additivity="false">
             <AppenderRef ref="druidSlowSqlLog"/>
         </logger>
-
         <Root level="debug">
             <AppenderRef ref="Console"/>
             <AppenderRef ref="debug"/>

smart-admin-api-java17-springboot3/sa-admin/src/main/resources/mapper/business/oa/bank/BankMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="net.lab1024.sa.admin.module.business.oa.bank.BankDao">
+<mapper namespace="net.lab1024.sa.admin.module.business.oa.bank.dao.BankDao">
     <update id="deleteBank">
         UPDATE t_oa_bank
         SET deleted_flag = #{deletedFlag}

smart-admin-api-java17-springboot3/sa-admin/src/main/resources/mapper/business/oa/enterprise/EnterpriseEmployeeMapper.xml

@@ -70,7 +70,7 @@
     <select id="queryPageEmployeeList"
             resultType="net.lab1024.sa.admin.module.business.oa.enterprise.domain.vo.EnterpriseEmployeeVO">
         select
-        t_oa_enterprise_employee.*,
+        t_oa_enterprise_employee.enterprise_id,
         t_oa_enterprise.enterprise_name,
         t_employee.*,
         t_employee.actual_name as employeeName

smart-admin-api-java17-springboot3/sa-admin/src/main/resources/mapper/business/oa/invoice/InvoiceMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="net.lab1024.sa.admin.module.business.oa.invoice.InvoiceDao">
+<mapper namespace="net.lab1024.sa.admin.module.business.oa.invoice.dao.InvoiceDao">
     <update id="deleteInvoice">
         UPDATE t_oa_invoice
         SET deleted_flag = #{deletedFlag}

smart-admin-api-java17-springboot3/sa-admin/src/main/resources/mapper/business/oa/notice/NoticeMapper.xml

@@ -219,7 +219,7 @@
     <select id="queryNoticeViewRecordList" resultType="net.lab1024.sa.admin.module.business.oa.notice.domain.vo.NoticeViewRecordVO">
         select t_notice_view_record.*,
         t_employee.actual_name as employeeName,
-        t_department.name as departmentName
+        t_department.department_name
         from t_notice_view_record
         left join t_employee on t_employee.employee_id = t_notice_view_record.employee_id
         left join t_department on t_department.department_id = t_employee.department_id

smart-admin-api-java17-springboot3/sa-admin/src/main/resources/mapper/system/department/DepartmentMapper.xml

@@ -6,7 +6,7 @@
     <select id="listAll" resultType="net.lab1024.sa.admin.module.system.department.domain.vo.DepartmentVO">
         SELECT t_department.*,
                t_employee.actual_name   as managerName,
-               parent_department.`name` as parentName
+               parent_department.department_name   as parentName
         FROM t_department
                  left join t_employee on t_department.manager_id = t_employee.employee_id
                  left join t_department parent_department on t_department.parent_id = parent_department.department_id
@@ -19,5 +19,16 @@
         WHERE parent_id = #{departmentId}
     </select>
 
+    <select id="selectDepartmentVO"
+            resultType="net.lab1024.sa.admin.module.system.department.domain.vo.DepartmentVO">
+        SELECT t_department.*,
+               t_employee.actual_name   as managerName,
+               parent_department.department_name   as parentName
+        FROM t_department
+                 left join t_employee on t_department.manager_id = t_employee.employee_id
+                 left join t_department parent_department on t_department.parent_id = parent_department.department_id
+        where t_department.department_id = #{departmentId}
+    </select>
+
 
 </mapper>

smart-admin-api-java17-springboot3/sa-admin/src/main/resources/mapper/system/employee/EmployeeMapper.xml

@@ -5,7 +5,7 @@
     <select id="queryEmployee" resultType="net.lab1024.sa.admin.module.system.employee.domain.vo.EmployeeVO">
         SELECT
         t_employee.*,
-        t_department.name AS departmentName
+        t_department.department_name
         FROM t_employee
         LEFT JOIN t_department ON t_department.department_id = t_employee.department_id
         <where>
@@ -169,7 +169,7 @@
 
     <select id="getEmployeeById" resultType="net.lab1024.sa.admin.module.system.employee.domain.vo.EmployeeVO">
         SELECT t_employee.*,
-               t_department.name AS departmentName
+               t_department.department_name
         FROM t_employee
                  LEFT JOIN t_department ON t_department.department_id = t_employee.department_id
         where t_employee.employee_id = #{employeeId}
@@ -178,7 +178,7 @@
     <select id="selectEmployeeByDisabledAndDeleted" resultType="net.lab1024.sa.admin.module.system.employee.domain.vo.EmployeeVO">
         SELECT
         t_employee.*,
-        t_department.name AS departmentName
+        t_department.department_name
         FROM t_employee
         LEFT JOIN t_department ON t_department.department_id = t_employee.department_id
         <where>

smart-admin-api-java17-springboot3/sa-admin/src/main/resources/pre/log4j2-spring.xml

@@ -5,12 +5,12 @@
 -->
 <Configuration status="INFO" monitorInterval="30">
     <Properties>
-        <Property name="log-directory" value="${sys:project.log-directory}"/>
+        <Property name="log-directory" value="${spring:project.log-directory}"/>
     </Properties>
     <Appenders>
         <Console name="Console" target="SYSTEM_OUT">
             <ThresholdFilter level="info" onMatch="ACCEPT" onMismatch="DENY"/>
-            <PatternLayout pattern="[%d][%-5p][%t] %m (%F:%L)%n"/>
+            <PatternLayout pattern="[%d][%-5p][%t][%c{1.}:%L] %m %n"/>
         </Console>
         <RollingFile name="debug" fileName="${log-directory}/debug/debug.log"
                      filePattern="${log-directory}/debug/debug-%d{yyyy-MM-dd}-%i.log">
@@ -18,7 +18,7 @@
                 <ThresholdFilter level="info" onMatch="DENY" onMismatch="NEUTRAL"/>
                 <ThresholdFilter level="debug" onMatch="ACCEPT" onMismatch="DENY"/>
             </Filters>
-            <PatternLayout pattern="[%d][%-5p][%t] %m (%F:%L)%n"/>
+            <PatternLayout pattern="[%d][%-5p][%t][%c{1.}:%L] %m %n"/>
             <Policies>
                 <TimeBasedTriggeringPolicy interval="1" modulate="true"/>
                 <SizeBasedTriggeringPolicy size="50 MB"/>
@@ -36,7 +36,7 @@
                 <ThresholdFilter level="warn" onMatch="DENY" onMismatch="NEUTRAL"/>
                 <ThresholdFilter level="info" onMatch="ACCEPT" onMismatch="DENY"/>
             </Filters>
-            <PatternLayout pattern="[%d][%-5p][%t] %m (%F:%L)%n"/>
+            <PatternLayout pattern="[%d][%-5p][%t][%c{1.}:%L] %m %n"/>
             <Policies>
                 <TimeBasedTriggeringPolicy interval="1" modulate="true"/>
                 <SizeBasedTriggeringPolicy size="50 MB"/>
@@ -54,7 +54,7 @@
                 <ThresholdFilter level="error" onMatch="DENY" onMismatch="NEUTRAL"/>
                 <ThresholdFilter level="warn" onMatch="ACCEPT" onMismatch="DENY"/>
             </Filters>
-            <PatternLayout pattern="[%d][%-5p][%t] %m (%F:%L)%n"/>
+            <PatternLayout pattern="[%d][%-5p][%t][%c{1.}:%L] %m %n"/>
             <Policies>
                 <TimeBasedTriggeringPolicy interval="1" modulate="true"/>
                 <SizeBasedTriggeringPolicy size="50 MB"/>
@@ -72,7 +72,7 @@
                 <ThresholdFilter level="fatal" onMatch="DENY" onMismatch="NEUTRAL"/>
                 <ThresholdFilter level="error" onMatch="ACCEPT" onMismatch="DENY"/>
             </Filters>
-            <PatternLayout pattern="[%d][%-5p][%t] %m (%F:%L)%n"/>
+            <PatternLayout pattern="[%d][%-5p][%t][%c{1.}:%L] %m %n"/>
             <Policies>
                 <TimeBasedTriggeringPolicy interval="1" modulate="true"/>
                 <SizeBasedTriggeringPolicy size="10 MB"/>
@@ -86,7 +86,7 @@
         </RollingFile>
         <RollingFile name="druidSlowSqlLog" fileName="${log-directory}/slow-sql/slow-sql.log"
                      filePattern="${log-directory}/slow-sql/slow-sql-%d{yyyy-MM-dd}-%i.log">
-            <PatternLayout pattern="[%d][%-5p][%t] %m (%F:%L)%n"/>
+            <PatternLayout pattern="[%d][%-5p][%t][%c{1.}:%L] %m %n"/>
             <Policies>
                 <TimeBasedTriggeringPolicy interval="1" modulate="true"/>
                 <SizeBasedTriggeringPolicy size="50 MB"/>

smart-admin-api-java17-springboot3/sa-admin/src/main/resources/prod/log4j2-spring.xml

@@ -5,12 +5,12 @@
 -->
 <Configuration status="INFO" monitorInterval="30">
     <Properties>
-        <Property name="log-directory" value="${sys:project.log-directory}"/>
+        <Property name="log-directory" value="${spring:project.log-directory}"/>
     </Properties>
     <Appenders>
         <Console name="Console" target="SYSTEM_OUT">
             <ThresholdFilter level="info" onMatch="ACCEPT" onMismatch="DENY"/>
-            <PatternLayout pattern="[%d][%-5p][%t] %m (%F:%L)%n"/>
+            <PatternLayout pattern="[%d][%-5p][%t][%c{1.}:%L] %m %n"/>
         </Console>
         <RollingFile name="debug" fileName="${log-directory}/debug/debug.log"
                      filePattern="${log-directory}/debug/debug-%d{yyyy-MM-dd}-%i.log">
@@ -18,7 +18,7 @@
                 <ThresholdFilter level="info" onMatch="DENY" onMismatch="NEUTRAL"/>
                 <ThresholdFilter level="debug" onMatch="ACCEPT" onMismatch="DENY"/>
             </Filters>
-            <PatternLayout pattern="[%d][%-5p][%t] %m (%F:%L)%n"/>
+            <PatternLayout pattern="[%d][%-5p][%t][%c{1.}:%L] %m %n"/>
             <Policies>
                 <TimeBasedTriggeringPolicy interval="1" modulate="true"/>
                 <SizeBasedTriggeringPolicy size="50 MB"/>
@@ -36,7 +36,7 @@
                 <ThresholdFilter level="warn" onMatch="DENY" onMismatch="NEUTRAL"/>
                 <ThresholdFilter level="info" onMatch="ACCEPT" onMismatch="DENY"/>
             </Filters>
-            <PatternLayout pattern="[%d][%-5p][%t] %m (%F:%L)%n"/>
+            <PatternLayout pattern="[%d][%-5p][%t][%c{1.}:%L] %m %n"/>
             <Policies>
                 <TimeBasedTriggeringPolicy interval="1" modulate="true"/>
                 <SizeBasedTriggeringPolicy size="50 MB"/>
@@ -54,7 +54,7 @@
                 <ThresholdFilter level="error" onMatch="DENY" onMismatch="NEUTRAL"/>
                 <ThresholdFilter level="warn" onMatch="ACCEPT" onMismatch="DENY"/>
             </Filters>
-            <PatternLayout pattern="[%d][%-5p][%t] %m (%F:%L)%n"/>
+            <PatternLayout pattern="[%d][%-5p][%t][%c{1.}:%L] %m %n"/>
             <Policies>
                 <TimeBasedTriggeringPolicy interval="1" modulate="true"/>
                 <SizeBasedTriggeringPolicy size="50 MB"/>
@@ -72,7 +72,7 @@
                 <ThresholdFilter level="fatal" onMatch="DENY" onMismatch="NEUTRAL"/>
                 <ThresholdFilter level="error" onMatch="ACCEPT" onMismatch="DENY"/>
             </Filters>
-            <PatternLayout pattern="[%d][%-5p][%t] %m (%F:%L)%n"/>
+            <PatternLayout pattern="[%d][%-5p][%t][%c{1.}:%L] %m %n"/>
             <Policies>
                 <TimeBasedTriggeringPolicy interval="1" modulate="true"/>
                 <SizeBasedTriggeringPolicy size="10 MB"/>
@@ -86,7 +86,7 @@
         </RollingFile>
         <RollingFile name="druidSlowSqlLog" fileName="${log-directory}/slow-sql/slow-sql.log"
                      filePattern="${log-directory}/slow-sql/slow-sql-%d{yyyy-MM-dd}-%i.log">
-            <PatternLayout pattern="[%d][%-5p][%t] %m (%F:%L)%n"/>
+            <PatternLayout pattern="[%d][%-5p][%t][%c{1.}:%L] %m %n"/>
             <Policies>
                 <TimeBasedTriggeringPolicy interval="1" modulate="true"/>
                 <SizeBasedTriggeringPolicy size="50 MB"/>

smart-admin-api-java17-springboot3/sa-admin/src/main/resources/test/log4j2-spring.xml

@@ -5,12 +5,12 @@
 -->
 <Configuration status="INFO" monitorInterval="30">
     <Properties>
-        <Property name="log-directory" value="${sys:project.log-directory}"/>
+        <Property name="log-directory" value="${spring:project.log-directory}"/>
     </Properties>
     <Appenders>
         <Console name="Console" target="SYSTEM_OUT">
             <ThresholdFilter level="info" onMatch="ACCEPT" onMismatch="DENY"/>
-            <PatternLayout pattern="[%d][%-5p][%t] %m (%F:%L)%n"/>
+            <PatternLayout pattern="[%d][%-5p][%t][%c{1.}:%L] %m %n"/>
         </Console>
         <RollingFile name="debug" fileName="${log-directory}/debug/debug.log"
                      filePattern="${log-directory}/debug/debug-%d{yyyy-MM-dd}-%i.log">
@@ -18,7 +18,7 @@
                 <ThresholdFilter level="info" onMatch="DENY" onMismatch="NEUTRAL"/>
                 <ThresholdFilter level="debug" onMatch="ACCEPT" onMismatch="DENY"/>
             </Filters>
-            <PatternLayout pattern="[%d][%-5p][%t] %m (%F:%L)%n"/>
+            <PatternLayout pattern="[%d][%-5p][%t][%c{1.}:%L] %m %n"/>
             <Policies>
                 <TimeBasedTriggeringPolicy interval="1" modulate="true"/>
                 <SizeBasedTriggeringPolicy size="50 MB"/>
@@ -36,7 +36,7 @@
                 <ThresholdFilter level="warn" onMatch="DENY" onMismatch="NEUTRAL"/>
                 <ThresholdFilter level="info" onMatch="ACCEPT" onMismatch="DENY"/>
             </Filters>
-            <PatternLayout pattern="[%d][%-5p][%t] %m (%F:%L)%n"/>
+            <PatternLayout pattern="[%d][%-5p][%t][%c{1.}:%L] %m %n"/>
             <Policies>
                 <TimeBasedTriggeringPolicy interval="1" modulate="true"/>
                 <SizeBasedTriggeringPolicy size="50 MB"/>
@@ -54,7 +54,7 @@
                 <ThresholdFilter level="error" onMatch="DENY" onMismatch="NEUTRAL"/>
                 <ThresholdFilter level="warn" onMatch="ACCEPT" onMismatch="DENY"/>
             </Filters>
-            <PatternLayout pattern="[%d][%-5p][%t] %m (%F:%L)%n"/>
+            <PatternLayout pattern="[%d][%-5p][%t][%c{1.}:%L] %m %n"/>
             <Policies>
                 <TimeBasedTriggeringPolicy interval="1" modulate="true"/>
                 <SizeBasedTriggeringPolicy size="50 MB"/>
@@ -72,7 +72,7 @@
                 <ThresholdFilter level="fatal" onMatch="DENY" onMismatch="NEUTRAL"/>
                 <ThresholdFilter level="error" onMatch="ACCEPT" onMismatch="DENY"/>
             </Filters>
-            <PatternLayout pattern="[%d][%-5p][%t] %m (%F:%L)%n"/>
+            <PatternLayout pattern="[%d][%-5p][%t][%c{1.}:%L] %m %n"/>
             <Policies>
                 <TimeBasedTriggeringPolicy interval="1" modulate="true"/>
                 <SizeBasedTriggeringPolicy size="10 MB"/>
@@ -86,7 +86,7 @@
         </RollingFile>
         <RollingFile name="druidSlowSqlLog" fileName="${log-directory}/slow-sql/slow-sql.log"
                      filePattern="${log-directory}/slow-sql/slow-sql-%d{yyyy-MM-dd}-%i.log">
-            <PatternLayout pattern="[%d][%-5p][%t] %m (%F:%L)%n"/>
+            <PatternLayout pattern="[%d][%-5p][%t][%c{1.}:%L] %m %n"/>
             <Policies>
                 <TimeBasedTriggeringPolicy interval="1" modulate="true"/>
                 <SizeBasedTriggeringPolicy size="50 MB"/>

smart-admin-api-java17-springboot3/sa-base/pom.xml

@@ -64,7 +64,6 @@
             <groupId>cn.dev33</groupId>
             <artifactId>sa-token-redis-jackson</artifactId>
         </dependency>
-
         <!-- sa-token end -->
 
         <dependency>
@@ -118,19 +117,25 @@
             <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-jsqlparser</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>p6spy</groupId>
             <artifactId>p6spy</artifactId>
         </dependency>
 
+        <!-- knife4j & SpringDoc -->
         <dependency>
-            <groupId>com.github.xiaoymin</groupId>
+            <groupId>com.github.xingfudeshi</groupId>
             <artifactId>knife4j-openapi3-jakarta-spring-boot-starter</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.squareup.okhttp3</groupId>
-            <artifactId>okhttp</artifactId>
+            <groupId>org.apache.httpcomponents.client5</groupId>
+            <artifactId>httpclient5</artifactId>
         </dependency>
 
         <dependency>
@@ -159,10 +164,11 @@
         </dependency>
 
         <dependency>
-            <groupId>com.amazonaws</groupId>
-            <artifactId>aws-java-sdk-s3</artifactId>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>s3</artifactId>
         </dependency>
 
+
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
@@ -187,16 +193,6 @@
             <artifactId>hutool-all</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>io.jsonwebtoken</groupId>
-            <artifactId>jjwt</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.auth0</groupId>
-            <artifactId>jwks-rsa</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.apache.velocity</groupId>
             <artifactId>velocity-engine-core</artifactId>
@@ -220,12 +216,6 @@
         <dependency>
             <groupId>cn.idev.excel</groupId>
             <artifactId>fastexcel</artifactId>
-            <exclusions>
-                <exclusion>
-                    <artifactId>logback-classic</artifactId>
-                    <groupId>ch.qos.logback</groupId>
-                </exclusion>
-            </exclusions>
         </dependency>
 
         <dependency>
@@ -233,11 +223,6 @@
             <artifactId>poi</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.poi</groupId>
-            <artifactId>poi-ooxml</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi-scratchpad</artifactId>
@@ -245,12 +230,7 @@
 
         <dependency>
             <groupId>org.apache.poi</groupId>
-            <artifactId>ooxml-schemas</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.fasterxml.jackson.datatype</groupId>
-            <artifactId>jackson-datatype-jsr310</artifactId>
+            <artifactId>poi-ooxml-full</artifactId>
         </dependency>
 
         <dependency>

smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/common/controller/SupportBaseController.java

@@ -3,6 +3,7 @@ package net.lab1024.sa.base.common.controller;
 import net.lab1024.sa.base.constant.SwaggerTagConst;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+
 /**
  * 支撑类业务路由基类
  *

smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/common/domain/UserPermission.java

@@ -2,6 +2,7 @@ package net.lab1024.sa.base.common.domain;
 
 import lombok.Data;
 
+import java.io.Serializable;
 import java.util.List;
 
 /**
@@ -15,7 +16,7 @@ import java.util.List;
  */
 
 @Data
-public class UserPermission {
+public class UserPermission implements Serializable {
 
     /**
      * 权限列表

smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/common/json/serializer/LongJsonSerializer.java

@@ -20,17 +20,25 @@ public class LongJsonSerializer extends JsonSerializer<Long> {
 
     public static final LongJsonSerializer INSTANCE = new LongJsonSerializer();
 
+    /**
+     * JS 安全整数范围
+     * 根据 JS Number.MIN_SAFE_INTEGER 与 Number.MAX_SAFE_INTEGER 得来
+     */
+    private static final long JS_MIN_SAFE_INTEGER = -9007199254740991L;
+    private static final long JS_MAX_SAFE_INTEGER = 9007199254740991L;
+
+
     @Override
     public void serialize(Long value, JsonGenerator gen, SerializerProvider serializerProvider) throws IOException, JsonProcessingException {
         if (null == value) {
             gen.writeNull();
             return;
         }
-        // js中最大安全整数16位 Number.MAX_SAFE_INTEGER
-        String longStr = String.valueOf(value);
-        if (longStr.length() > 16) {
-            gen.writeString(longStr);
+        // 如果超出了 JavaScript 安全整数范围，则序列化为字符串
+        if (value < JS_MIN_SAFE_INTEGER || value > JS_MAX_SAFE_INTEGER) {
+            gen.writeString(Long.toString(value));
         } else {
+            // 否则，序列化为数字
             gen.writeNumber(value);
         }
     }

smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/common/util/SmartPageUtil.java

@@ -52,11 +52,7 @@ public class SmartPageUtil {
                 log.error("《存在SQL注入：》 : {}", sortItem.getColumn());
                 throw new BusinessException("存在SQL注入风险，请联系技术工作人员！");
             }
-
-            OrderItem orderItem = new OrderItem();
-            orderItem.setColumn(sortItem.getColumn());
-            orderItem.setAsc(sortItem.getIsAsc());
-            orderItemList.add(orderItem);
+            orderItemList.add(sortItem.getIsAsc() ? OrderItem.asc(sortItem.getColumn()) : OrderItem.desc(sortItem.getColumn()));
         }
         page.setOrders(orderItemList);
         return page;

smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/common/util/SmartRequestUtil.java

@@ -18,6 +18,9 @@ public class SmartRequestUtil {
     private static final ThreadLocal<RequestUser> REQUEST_THREAD_LOCAL = new ThreadLocal<>();
 
     public static void setRequestUser(RequestUser requestUser) {
+        if(requestUser == null){
+            return;
+        }
         REQUEST_THREAD_LOCAL.set(requestUser);
     }
 

smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/config/CacheConfig.java

@@ -1,17 +1,23 @@
 package net.lab1024.sa.base.config;
 
+import com.alibaba.fastjson.support.spring.GenericFastJsonRedisSerializer;
+import jakarta.annotation.Resource;
 import net.lab1024.sa.base.module.support.cache.CacheService;
 import net.lab1024.sa.base.module.support.cache.CaffeineCacheServiceImpl;
 import net.lab1024.sa.base.module.support.cache.RedisCacheServiceImpl;
+import net.lab1024.sa.base.module.support.redis.CustomRedisCacheManager;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.cache.CacheManager;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.cache.RedisCacheConfiguration;
+import org.springframework.data.redis.cache.RedisCacheWriter;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.serializer.RedisSerializationContext;
 
 /**
  * 缓存配置
  *
- * @author zhoumingfa
- * @date 2025/03/28
  */
 @Configuration
 public class CacheConfig {
@@ -20,16 +26,45 @@ public class CacheConfig {
     private static final String CAFFEINE_CACHE = "caffeine";
 
 
+    @Resource
+    private RedisConnectionFactory redisConnectionFactory;
+
+    /**
+     * 创建自定义Redis缓存管理器Bean 整合spring-cache
+     * Redis连接工厂，用于建立与Redis服务器的连接
+     *
+     * @return CacheManager Redis缓存管理器实例
+     */
     @Bean
     @ConditionalOnProperty(prefix = "spring.cache", name = {"type"}, havingValue = REDIS_CACHE)
-    public CacheService redisCacheService() {
-        return new RedisCacheServiceImpl();
+    public CacheManager cacheManager() {
+        // 使用非阻塞模式的缓存写入器，适用于大多数高并发场景
+        RedisCacheWriter redisCacheWriter = RedisCacheWriter.nonLockingRedisCacheWriter(redisConnectionFactory);
+
+        // 构建默认缓存配置
+        RedisCacheConfiguration defaultCacheConfig = RedisCacheConfiguration.defaultCacheConfig()
+                // 禁止缓存 null 值，避免缓存穿透
+                .disableCachingNullValues()
+                .computePrefixWith(name -> "cache:" + name + ":")
+                // 使用 FastJSON 序列化缓存值，支持复杂对象
+                .serializeValuesWith(RedisSerializationContext.SerializationPair
+                        .fromSerializer(new GenericFastJsonRedisSerializer()));
+
+        // 返回自定义缓存管理器，支持 cacheName#ttl 格式与永久缓存（#-1）
+        return new CustomRedisCacheManager(redisCacheWriter, defaultCacheConfig);
     }
 
-    @Bean
-    @ConditionalOnProperty(prefix = "spring.cache", name = {"type"}, havingValue = CAFFEINE_CACHE)
-    public CacheService caffeineCacheService() {
-        return new CaffeineCacheServiceImpl();
-    }
+
+@Bean
+@ConditionalOnProperty(prefix = "spring.cache", name = {"type"}, havingValue = REDIS_CACHE)
+public CacheService redisCacheService() {
+    return new RedisCacheServiceImpl();
+}
+
+@Bean
+@ConditionalOnProperty(prefix = "spring.cache", name = {"type"}, havingValue = CAFFEINE_CACHE)
+public CacheService caffeineCacheService() {
+    return new CaffeineCacheServiceImpl();
+}
 
 }

smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/config/FileConfig.java

@@ -1,12 +1,5 @@
 package net.lab1024.sa.base.config;
 
-import com.amazonaws.ClientConfiguration;
-import com.amazonaws.Protocol;
-import com.amazonaws.auth.AWSStaticCredentialsProvider;
-import com.amazonaws.auth.BasicAWSCredentials;
-import com.amazonaws.client.builder.AwsClientBuilder;
-import com.amazonaws.services.s3.AmazonS3;
-import com.amazonaws.services.s3.AmazonS3ClientBuilder;
 import lombok.Data;
 import net.lab1024.sa.base.module.support.file.service.FileStorageCloudServiceImpl;
 import net.lab1024.sa.base.module.support.file.service.FileStorageLocalServiceImpl;
@@ -17,6 +10,13 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
+import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
+import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.services.s3.S3Client;
+import software.amazon.awssdk.services.s3.S3Configuration;
+
+import java.net.URI;
 
 /**
  * 文件上传 配置
@@ -31,6 +31,10 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 @Configuration
 public class FileConfig implements WebMvcConfigurer {
 
+    private static final String HTTPS = "https://";
+
+    private static final String HTTP = "http://";
+
     private static final String MODE_CLOUD = "cloud";
 
     private static final String MODE_LOCAL = "local";
@@ -69,15 +73,17 @@ public class FileConfig implements WebMvcConfigurer {
      */
     @Bean
     @ConditionalOnProperty(prefix = "file.storage", name = {"mode"}, havingValue = MODE_CLOUD)
-    public AmazonS3 initAmazonS3() {
-        ClientConfiguration clientConfig = new ClientConfiguration();
-        clientConfig.setProtocol(Protocol.HTTPS);
-        return AmazonS3ClientBuilder.standard()
-                .withCredentials(new AWSStaticCredentialsProvider(new BasicAWSCredentials(accessKey, secretKey)))
-                .withClientConfiguration(clientConfig)
-                .withEndpointConfiguration(new AwsClientBuilder.EndpointConfiguration(endpoint, region))
-                .withPathStyleAccessEnabled(false)
-                .withChunkedEncodingDisabled(true)
+    public S3Client initAmazonS3() {
+        return S3Client.builder()
+                .region(Region.AWS_GLOBAL)
+                .endpointOverride(URI.create((urlPrefix.startsWith(HTTPS) ? HTTPS : HTTP) + endpoint))
+                .credentialsProvider(
+                        StaticCredentialsProvider.create(
+                                AwsBasicCredentials.create(accessKey, secretKey)))
+                .serviceConfiguration(S3Configuration.builder()
+                        .pathStyleAccessEnabled(true)
+                        .chunkedEncodingEnabled(false)
+                        .build())
                 .build();
     }
 

smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/config/JsonConfig.java

@@ -2,6 +2,7 @@ package net.lab1024.sa.base.config;
 
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.LocalDateTimeUtil;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer;
 import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
 import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer;
@@ -13,6 +14,8 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.convert.converter.Converter;
 
+import java.math.BigDecimal;
+import java.math.BigInteger;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeParseException;
@@ -37,6 +40,9 @@ public class JsonConfig {
             builder.serializers(new LocalDateSerializer(DatePattern.NORM_DATE_FORMAT.getDateTimeFormatter()));
             builder.serializers(new LocalDateTimeSerializer(DatePattern.NORM_DATETIME_FORMAT.getDateTimeFormatter()));
             builder.serializerByType(Long.class, LongJsonSerializer.INSTANCE);
+            builder.serializerByType(Long.TYPE, LongJsonSerializer.INSTANCE);
+            builder.serializerByType(BigInteger.class, ToStringSerializer.instance);
+            builder.serializerByType(BigDecimal.class, ToStringSerializer.instance);
         };
     }
 

smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/config/RepeatSubmitConfig.java

@@ -1,13 +1,14 @@
 package net.lab1024.sa.base.config;
 
 import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletRequest;
 import net.lab1024.sa.base.common.constant.StringConst;
 import net.lab1024.sa.base.common.util.SmartRequestUtil;
 import net.lab1024.sa.base.module.support.repeatsubmit.RepeatSubmitAspect;
 import net.lab1024.sa.base.module.support.repeatsubmit.ticket.RepeatSubmitRedisTicket;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.data.redis.core.ValueOperations;
+import org.springframework.data.redis.core.RedisTemplate;
 
 /**
  * 重复提交配置
@@ -22,22 +23,22 @@ import org.springframework.data.redis.core.ValueOperations;
 public class RepeatSubmitConfig {
 
     @Resource
-    private ValueOperations<String, String> valueOperations;
+    private RedisTemplate<String, Object> redisTemplate;
 
     @Bean
     public RepeatSubmitAspect repeatSubmitAspect() {
-        RepeatSubmitRedisTicket caffeineTicket = new RepeatSubmitRedisTicket(valueOperations, this::ticket);
-        return new RepeatSubmitAspect(caffeineTicket);
+        RepeatSubmitRedisTicket ticket = new RepeatSubmitRedisTicket(redisTemplate, this::ticket);
+        return new RepeatSubmitAspect(ticket);
     }
 
     /**
      * 获取指明某个用户的凭证
      */
-    private String ticket(String servletPath) {
+    private String ticket(HttpServletRequest request) {
         Long userId = SmartRequestUtil.getRequestUserId();
         if (null == userId) {
             return StringConst.EMPTY;
         }
-        return servletPath + "_" + userId;
+        return request.getServletPath() + "_" + userId;
     }
 }

smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/config/RestClientConfig.java

@@ -0,0 +1,92 @@
+package net.lab1024.sa.base.config;
+
+import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter;
+import org.apache.hc.client5.http.classic.HttpClient;
+import org.apache.hc.client5.http.config.TlsConfig;
+import org.apache.hc.client5.http.impl.classic.HttpClients;
+import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManager;
+import org.apache.hc.core5.util.TimeValue;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.MediaType;
+import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
+import org.springframework.http.converter.HttpMessageConverter;
+import org.springframework.http.converter.StringHttpMessageConverter;
+import org.springframework.web.client.RestClient;
+
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * http请求配置
+ *
+ * @Author 1024创新实验室: 卓大
+ * @Date 2025-07-26 21:22:12
+ * @Wechat zhuoda1024
+ * @Email lab1024@163.com
+ * @Copyright <a href="https://1024lab.net">1024创新实验室</a>
+ */
+@Configuration
+public class RestClientConfig {
+
+    @Value("${http.pool.max-total}")
+    private Integer maxTotal;
+
+    @Value("${http.pool.connect-timeout}")
+    private Integer connectTimeout;
+
+    @Value("${http.pool.read-timeout}")
+    private Integer readTimeout;
+
+    @Value("${http.pool.write-timeout}")
+    private Integer writeTimeout;
+
+    @Value("${http.pool.keep-alive}")
+    private Integer keepAlive;
+
+    @Bean
+    public RestClient restClient() {
+
+        HttpComponentsClientHttpRequestFactory factory =
+                new HttpComponentsClientHttpRequestFactory();
+        factory.setConnectTimeout(connectTimeout);
+        factory.setConnectionRequestTimeout(connectTimeout);
+        factory.setReadTimeout(readTimeout);
+
+        PoolingHttpClientConnectionManager cm =
+                new PoolingHttpClientConnectionManager();
+
+        cm.setMaxTotal(this.maxTotal);
+        cm.setDefaultTlsConfig(TlsConfig.DEFAULT);
+
+        HttpClient httpClient = HttpClients.custom()
+                .setConnectionManager(cm)
+                .setKeepAliveStrategy((response, context) -> TimeValue.of(this.keepAlive, TimeUnit.MICROSECONDS))
+                .build();
+
+        factory.setHttpClient(httpClient);
+
+        return RestClient.builder()
+                .requestFactory(factory)
+                .messageConverters(converters())
+                .build();
+    }
+
+    public List<HttpMessageConverter<?>> converters() {
+        List<HttpMessageConverter<?>> converters = new ArrayList<>();
+        HttpMessageConverter<?> converter = new StringHttpMessageConverter(StandardCharsets.UTF_8);
+        FastJsonHttpMessageConverter fastConverter = new FastJsonHttpMessageConverter();
+        List<MediaType> fastMediaTypes = new ArrayList<>();
+        fastMediaTypes.add(MediaType.APPLICATION_FORM_URLENCODED);
+        fastMediaTypes.add(MediaType.APPLICATION_JSON);
+        fastConverter.setSupportedMediaTypes(fastMediaTypes);
+        converters.add(converter);
+        converters.add(fastConverter);
+        return converters;
+    }
+
+
+}

smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/config/RestTemplateConfig.java

@@ -1,130 +0,0 @@
-package net.lab1024.sa.base.config;
-
-import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter;
-import okhttp3.ConnectionPool;
-import okhttp3.OkHttpClient;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.http.MediaType;
-import org.springframework.http.client.OkHttp3ClientHttpRequestFactory;
-import org.springframework.http.converter.HttpMessageConverter;
-import org.springframework.http.converter.StringHttpMessageConverter;
-import org.springframework.web.client.RestTemplate;
-
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLSocketFactory;
-import javax.net.ssl.TrustManager;
-import javax.net.ssl.X509TrustManager;
-import java.nio.charset.StandardCharsets;
-import java.security.KeyManagementException;
-import java.security.NoSuchAlgorithmException;
-import java.security.SecureRandom;
-import java.security.cert.CertificateException;
-import java.security.cert.X509Certificate;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
-/**
- * http请求配置
- *
- * @Author 1024创新实验室: 罗伊
- * @Date 2022-05-30 21:22:12
- * @Wechat zhuoda1024
- * @Email lab1024@163.com
- * @Copyright  <a href="https://1024lab.net">1024创新实验室</a>
- */
-@Configuration
-public class RestTemplateConfig {
-
-    @Value("${http.pool.max-total}")
-    private Integer maxTotal;
-
-    @Value("${http.pool.connect-timeout}")
-    private Integer connectTimeout;
-
-    @Value("${http.pool.read-timeout}")
-    private Integer readTimeout;
-
-    @Value("${http.pool.write-timeout}")
-    private Integer writeTimeout;
-
-    @Value("${http.pool.keep-alive}")
-    private Integer keepAlive;
-
-    @Bean
-    public RestTemplate restTemplate() {
-        RestTemplate restTemplate = new RestTemplate();
-        restTemplate.setRequestFactory(this.clientHttpRequestFactory());
-        List<HttpMessageConverter<?>> messageConverterList = restTemplate.getMessageConverters();
-        messageConverterList.add(0, new StringHttpMessageConverter(StandardCharsets.UTF_8));
-        messageConverterList.addAll(this.converters());
-        return restTemplate;
-    }
-
-    public List<HttpMessageConverter<?>> converters() {
-        List<HttpMessageConverter<?>> converters = new ArrayList<>();
-        HttpMessageConverter<?> converter = new StringHttpMessageConverter(StandardCharsets.UTF_8);
-        FastJsonHttpMessageConverter fastConverter = new FastJsonHttpMessageConverter();
-        List<MediaType> fastMediaTypes = new ArrayList<>();
-        fastMediaTypes.add(MediaType.APPLICATION_FORM_URLENCODED);
-        fastMediaTypes.add(MediaType.APPLICATION_JSON);
-        fastConverter.setSupportedMediaTypes(fastMediaTypes);
-        converters.add(converter);
-        converters.add(fastConverter);
-        return converters;
-    }
-
-
-    public OkHttp3ClientHttpRequestFactory clientHttpRequestFactory() {
-        return new OkHttp3ClientHttpRequestFactory(httpClientBuilder());
-    }
-
-    public OkHttpClient httpClientBuilder() {
-        return new OkHttpClient.Builder()
-                .retryOnConnectionFailure(true)
-                .connectionPool(this.pool())
-                .connectTimeout(connectTimeout, TimeUnit.MILLISECONDS)
-                .readTimeout(readTimeout, TimeUnit.MILLISECONDS)
-                .writeTimeout(writeTimeout, TimeUnit.MILLISECONDS)
-                .build();
-    }
-
-    public ConnectionPool pool() {
-        return new ConnectionPool(maxTotal, keepAlive, TimeUnit.MILLISECONDS);
-    }
-
-
-    @Bean
-    public X509TrustManager x509TrustManager() {
-        return new X509TrustManager() {
-            @Override
-            public void checkClientTrusted(X509Certificate[] x509Certificates, String s) throws CertificateException {
-            }
-
-            @Override
-            public void checkServerTrusted(X509Certificate[] x509Certificates, String s) throws CertificateException {
-            }
-
-            @Override
-            public X509Certificate[] getAcceptedIssuers() {
-                return new X509Certificate[0];
-            }
-        };
-    }
-
-    @Bean
-    public SSLSocketFactory sslSocketFactory() {
-        try {
-            //信任任何链接
-            SSLContext sslContext = SSLContext.getInstance("TLS");
-            sslContext.init(null, new TrustManager[]{x509TrustManager()}, new SecureRandom());
-            return sslContext.getSocketFactory();
-        } catch (NoSuchAlgorithmException | KeyManagementException e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-
-}

smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/config/SwaggerConfig.java

@@ -12,6 +12,7 @@ import net.lab1024.sa.base.common.constant.RequestHeaderConst;
 import net.lab1024.sa.base.common.swagger.SmartOperationCustomizer;
 import net.lab1024.sa.base.constant.SwaggerTagConst;
 import org.apache.commons.lang3.StringUtils;
+import org.springdoc.core.customizers.GlobalOpenApiCustomizer;
 import org.springdoc.core.customizers.OpenApiBuilderCustomizer;
 import org.springdoc.core.customizers.ServerBaseUrlCustomizer;
 import org.springdoc.core.models.GroupedOpenApi;
@@ -24,6 +25,8 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpRequest;
 
 import java.util.List;
 import java.util.Optional;
@@ -80,6 +83,21 @@ public class SwaggerConfig {
                 .addSecuritySchemes(RequestHeaderConst.TOKEN, new SecurityScheme().scheme("Bearer").description("请输入token,格式为[Bearer xxxxxxxx]").type(SecurityScheme.Type.APIKEY).in(SecurityScheme.In.HEADER).name(RequestHeaderConst.TOKEN));
     }
 
+    @Bean
+    public GlobalOpenApiCustomizer orderGlobalOpenApiCustomizer() {
+        return openApi -> {
+            // 全局添加鉴权参数
+            if(openApi.getPaths()!=null){
+                openApi.getPaths().forEach((s, pathItem) -> {
+                    // 为所有接口添加鉴权
+                    pathItem.readOperations().forEach(operation -> {
+                        operation.addSecurityItem(new SecurityRequirement().addList(HttpHeaders.AUTHORIZATION));
+                    });
+                });
+            }
+        };
+    }
+
     @Bean
     public GroupedOpenApi businessApi() {
         return GroupedOpenApi.builder()
@@ -122,11 +140,11 @@ public class SwaggerConfig {
                                          Optional<JavadocProvider> javadocProvider) {
         List<ServerBaseUrlCustomizer> list = Lists.newArrayList(new ServerBaseUrlCustomizer() {
             @Override
-            public String customize(String baseUrl) {
+            public String customize(String serverBaseUrl, HttpRequest request) {
                 if (StringUtils.isNotBlank(serverBaseUrl)) {
                     return serverBaseUrl;
                 }
-                return baseUrl;
+                return serverBaseUrl;
             }
         });
         return new OpenAPIService(openAPI, securityParser, springDocConfigProperties,

smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/cache/CacheService.java

@@ -1,17 +1,8 @@
 package net.lab1024.sa.base.module.support.cache;
 
-import com.google.common.collect.Lists;
-import jakarta.annotation.Resource;
-import net.lab1024.sa.base.constant.ReloadConst;
-import net.lab1024.sa.base.module.support.reload.core.annoation.SmartReload;
-import org.springframework.cache.caffeine.CaffeineCache;
-import org.springframework.cache.caffeine.CaffeineCacheManager;
 import org.springframework.stereotype.Service;
 
-import java.util.Collection;
 import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
 
 /**
  * 缓存服务

smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/captcha/CaptchaService.java

@@ -3,10 +3,10 @@ package net.lab1024.sa.base.module.support.captcha;
 import cn.hutool.captcha.CaptchaUtil;
 import cn.hutool.captcha.LineCaptcha;
 import cn.hutool.core.img.ImgUtil;
+import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.RandomUtil;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
-import net.lab1024.sa.base.common.constant.StringConst;
 import net.lab1024.sa.base.common.domain.ResponseDTO;
 import net.lab1024.sa.base.common.domain.SystemEnvironment;
 import net.lab1024.sa.base.constant.RedisKeyConst;
@@ -18,7 +18,6 @@ import org.springframework.stereotype.Service;
 
 import java.awt.*;
 import java.util.Objects;
-import java.util.UUID;
 
 /**
  * 图形验证码 服务
@@ -70,7 +69,7 @@ public class CaptchaService {
          * 图片 base64格式
          */
         // uuid 唯一标识
-        String uuid = UUID.randomUUID().toString().replace("-", StringConst.EMPTY);
+        String uuid = IdUtil.fastSimpleUUID();
 
         CaptchaVO captchaVO = new CaptchaVO();
         captchaVO.setCaptchaUuid(uuid);

smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/changelog/domain/entity/ChangeLogEntity.java

@@ -28,7 +28,7 @@ public class ChangeLogEntity {
     /**
      * 版本
      */
-    private String version;
+    private String updateVersion;
 
     /**
      * 更新类型:[1:特大版本功能更新;2:功能更新;3:bug修复]

smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/changelog/domain/form/ChangeLogAddForm.java

@@ -23,7 +23,7 @@ public class ChangeLogAddForm {
 
     @Schema(description = "版本", required = true)
     @NotBlank(message = "版本 不能为空")
-    private String version;
+    private String updateVersion;
 
     @SchemaEnum(value = ChangeLogTypeEnum.class, desc = "更新类型:[1:特大版本功能更新;2:功能更新;3:bug修复]")
     @CheckEnum(value = ChangeLogTypeEnum.class, message = "更新类型:[1:特大版本功能更新;2:功能更新;3:bug修复] 错误", required = true)

smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/changelog/domain/form/ChangeLogUpdateForm.java

@@ -27,7 +27,7 @@ public class ChangeLogUpdateForm {
 
     @Schema(description = "版本", required = true)
     @NotBlank(message = "版本 不能为空")
-    private String version;
+    private String updateVersion;
 
     @SchemaEnum(value = ChangeLogTypeEnum.class, desc = "更新类型:[1:特大版本功能更新;2:功能更新;3:bug修复]")
     @CheckEnum(value = ChangeLogTypeEnum.class, message = "更新类型:[1:特大版本功能更新;2:功能更新;3:bug修复] 错误", required = true)

smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/changelog/domain/vo/ChangeLogVO.java

@@ -23,7 +23,7 @@ public class ChangeLogVO {
     private Long changeLogId;
 
     @Schema(description = "版本")
-    private String version;
+    private String updateVersion;
 
     @SchemaEnum(value = ChangeLogTypeEnum.class, desc = "更新类型:[1:特大版本功能更新;2:功能更新;3:bug修复]")
     private Integer type;

smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/changelog/service/ChangeLogService.java

@@ -44,7 +44,7 @@ public class ChangeLogService {
      * 添加
      */
     public synchronized ResponseDTO<String> add(ChangeLogAddForm addForm) {
-        ChangeLogEntity existVersion = changeLogDao.selectByVersion(addForm.getVersion());
+        ChangeLogEntity existVersion = changeLogDao.selectByVersion(addForm.getUpdateVersion());
         if (existVersion != null) {
             return ResponseDTO.userErrorParam("此版本已经存在");
         }
@@ -58,7 +58,7 @@ public class ChangeLogService {
      * 更新
      */
     public synchronized ResponseDTO<String> update(ChangeLogUpdateForm updateForm) {
-        ChangeLogEntity existVersion = changeLogDao.selectByVersion(updateForm.getVersion());
+        ChangeLogEntity existVersion = changeLogDao.selectByVersion(updateForm.getUpdateVersion());
         if (existVersion != null && !updateForm.getChangeLogId().equals(existVersion.getChangeLogId())) {
             return ResponseDTO.userErrorParam("此版本已经存在");
         }

smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/constant/CodeGeneratorConstant.java

@@ -11,16 +11,6 @@ package net.lab1024.sa.base.module.support.codegenerator.constant;
  */
 public class CodeGeneratorConstant {
 
-    /**
-     * 主键
-     */
-    public final static String PRIMARY_KEY = "PRI";
-
-    /**
-     * 自增
-     */
-    public final static String AUTO_INCREMENT = "auto_increment";
-
     /**
      * 默认逻辑删除字段名称
      */

smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/vo/TableColumnVO.java

@@ -23,20 +23,26 @@ public class TableColumnVO {
     @Schema(description = "列描述")
     private String columnComment;
 
-    @Schema(description = "columnKey")
-    private String columnKey;
-
-    @Schema(description = "extra")
-    private String extra;
-
-    @Schema(description = "是否为空")
-    private String isNullable;
-
     @Schema(description = "数据类型varchar")
     private String dataType;
 
-    @Schema(description = "列类型varchar(50)")
-    private String columnType;
+    @Schema(description = "是否为空")
+    private Boolean nullableFlag;
 
+    @Schema(description = "是否为主键")
+    private Boolean primaryKeyFlag;
 
+    @Schema(description = "是否递增")
+    private Boolean autoIncreaseFlag;
+
+    // --------------- 临时字段 -------------------
+
+    @Schema(hidden = true)
+    private String columnKey;
+
+    @Schema(hidden = true)
+    private String extra;
+
+    @Schema(hidden = true)
+    private String isNullable;
 }

smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/vo/TableVO.java

@@ -25,12 +25,6 @@ public class TableVO {
     @Schema(description = "表备注")
     private String tableComment;
 
-    @Schema(description = "创建时间")
-    private LocalDateTime createTime;
-
-    @Schema(description = "更新时间")
-    private LocalDateTime updateTime;
-
     @Schema(description = "配置时间")
     private LocalDateTime configTime;
 

smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/CodeGeneratorService.java

@@ -40,6 +40,12 @@ import java.util.Optional;
 @Service
 public class CodeGeneratorService {
 
+    private static final String COLUMN_NO_NULLABLE_IDENTIFY = "NO";
+
+    private static final String COLUMN_PRIMARY_KEY = "PRI";
+
+    private static final String COLUMN_AUTO_INCREASE = "auto_increment";
+
     @Resource
     private CodeGeneratorDao codeGeneratorDao;
 
@@ -57,7 +63,13 @@ public class CodeGeneratorService {
      * @return
      */
     public List<TableColumnVO> getTableColumns(String tableName) {
-        return codeGeneratorDao.selectTableColumn(tableName);
+        List<TableColumnVO> tableColumns = codeGeneratorDao.selectTableColumn(tableName);
+        for (TableColumnVO tableColumn : tableColumns) {
+            tableColumn.setNullableFlag(!COLUMN_NO_NULLABLE_IDENTIFY.equalsIgnoreCase(tableColumn.getIsNullable()));
+            tableColumn.setPrimaryKeyFlag(COLUMN_PRIMARY_KEY.equalsIgnoreCase(tableColumn.getColumnKey()));
+            tableColumn.setAutoIncreaseFlag(SmartStringUtil.isNotEmpty(tableColumn.getExtra()) && COLUMN_AUTO_INCREASE.equalsIgnoreCase(tableColumn.getExtra()));
+        }
+        return tableColumns;
     }
 
 
@@ -150,7 +162,7 @@ public class CodeGeneratorService {
         }
 
         // 校验表必须有主键
-        if(!tableColumns.stream().filter( e -> "PRI".equalsIgnoreCase(e.getColumnKey())).findAny().isPresent()){
+        if (tableColumns.stream().noneMatch(e -> COLUMN_PRIMARY_KEY.equalsIgnoreCase(e.getColumnKey()))) {
             return ResponseDTO.userErrorParam("表必须有主键，请联系后端查看下数据库表结构");
         }
 
@@ -199,6 +211,7 @@ public class CodeGeneratorService {
 
     /**
      * 下载代码
+     *
      * @param tableName
      * @return
      */

smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/CodeGeneratorTemplateService.java

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.io.IORuntimeException;
+import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.ZipUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
@@ -33,9 +34,11 @@ import org.springframework.stereotype.Service;
 import java.io.File;
 import java.io.OutputStream;
 import java.io.StringWriter;
-import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
-import java.util.*;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 /**
@@ -75,10 +78,15 @@ public class CodeGeneratorTemplateService {
         map.put("js/const.js", new ConstVariableService());
         map.put("js/list.vue", new ListVariableService());
         map.put("js/form.vue", new FormVariableService());
+        // ts前端
+        map.put("ts/api.ts", new ApiVariableService());
+        map.put("ts/const.ts", new ConstVariableService());
+        map.put("ts/list.vue", new ListVariableService());
+        map.put("ts/form.vue", new FormVariableService());
     }
 
     public void zipGeneratedFiles(OutputStream outputStream, String tableName, CodeGeneratorConfigEntity codeGeneratorConfigEntity) {
-        String uuid = UUID.randomUUID().toString();
+        String uuid = IdUtil.fastSimpleUUID();
         File dir = new File(uuid);
 
         // 1、生产文件

smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/AddFormVariableService.java

@@ -103,9 +103,9 @@ public class AddFormVariableService extends CodeGenerateBaseVariableService {
 
             //字典
             if (SmartStringUtil.isNotEmpty(codeField.getDict())) {
-                finalFieldMap.put("dict", "\n    @JsonDeserialize(using = DictValueVoDeserializer.class)");
+                finalFieldMap.put("dict", "\n    @JsonDeserialize(using = DictDataDeserializer.class)");
                 packageList.add("import com.fasterxml.jackson.databind.annotation.JsonDeserialize;");
-                packageList.add("import net.lab1024.sa.base.common.json.deserializer.DictValueVoDeserializer;");
+                packageList.add("import net.lab1024.sa.base.common.json.deserializer.DictDataDeserializer;");
             }
 
             //文件上传

smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/MapperVariableService.java

@@ -3,10 +3,8 @@ package net.lab1024.sa.base.module.support.codegenerator.service.variable.backen
 import cn.hutool.core.bean.BeanUtil;
 import net.lab1024.sa.base.module.support.codegenerator.constant.CodeQueryFieldQueryTypeEnum;
 import net.lab1024.sa.base.module.support.codegenerator.domain.form.CodeGeneratorConfigForm;
-import net.lab1024.sa.base.module.support.codegenerator.domain.model.CodeInsertAndUpdateField;
 import net.lab1024.sa.base.module.support.codegenerator.domain.model.CodeQueryField;
 import net.lab1024.sa.base.module.support.codegenerator.service.variable.CodeGenerateBaseVariableService;
-import org.apache.commons.collections4.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.HashMap;

smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/QueryFormVariableService.java

@@ -106,9 +106,9 @@ public class QueryFormVariableService extends CodeGenerateBaseVariableService {
                 case DICT:
                     codeField = getCodeFieldByColumnName(field.getColumnNameList().get(0), form);
                     if (SmartStringUtil.isNotEmpty(codeField.getDict())) {
-                        finalFieldMap.put("dict", "\n    @JsonDeserialize(using = DictValueVoDeserializer.class)");
+                        finalFieldMap.put("dict", "\n    @JsonDeserialize(using = DictDataDeserializer.class)");
                         packageList.add("import com.fasterxml.jackson.databind.annotation.JsonDeserialize;");
-                        packageList.add("import net.lab1024.sa.base.common.json.deserializer.DictValueVoDeserializer;");
+                        packageList.add("import net.lab1024.sa.base.common.json.deserializer.DictDataDeserializer;");
                     }
                     finalFieldMap.put("javaType", "String");
                 default:

smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/UpdateFormVariableService.java

@@ -118,9 +118,9 @@ public class UpdateFormVariableService extends CodeGenerateBaseVariableService {
 
             //字典
             if (SmartStringUtil.isNotEmpty(codeField.getDict())) {
-                finalFieldMap.put("dict", "\n    @JsonDeserialize(using = DictValueVoDeserializer.class)");
+                finalFieldMap.put("dict", "\n    @JsonDeserialize(using = DictDataDeserializer.class)");
                 packageList.add("import com.fasterxml.jackson.databind.annotation.JsonDeserialize;");
-                packageList.add("import net.lab1024.sa.base.common.json.deserializer.DictValueVoDeserializer;");
+                packageList.add("import net.lab1024.sa.base.common.json.deserializer.DictDataDeserializer;");
             }
 
             //文件上传

smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/front/ListVariableService.java

@@ -46,8 +46,9 @@ public class ListVariableService extends CodeGenerateBaseVariableService {
 
             CodeField codeField = getCodeFieldByColumnName(queryField.getColumnNameList().get(0), form);
 
-            if (CodeQueryFieldQueryTypeEnum.ENUM.equalsValue(queryField.getQueryTypeEnum())) {
-                objectMap.put("frontEnumName", codeField.getEnumName());
+            if (CodeQueryFieldQueryTypeEnum.ENUM.equalsValue(queryField.getQueryTypeEnum()) && SmartStringUtil.isNotBlank(codeField.getEnumName())) {
+                String upperUnderscoreEnum = CaseFormat.UPPER_CAMEL.to(CaseFormat.UPPER_UNDERSCORE, codeField.getEnumName());
+                objectMap.put("frontEnumName", upperUnderscoreEnum);
                 frontImportSet.add("import SmartEnumSelect from '/@/components/framework/smart-enum-select/index.vue';");
             }
 
@@ -76,6 +77,12 @@ public class ListVariableService extends CodeGenerateBaseVariableService {
                 continue;
             }
 
+            // 是否存在枚举
+            if (SmartStringUtil.isNotBlank(codeField.getEnumName())) {
+                String upperUnderscoreEnum = CaseFormat.UPPER_CAMEL.to(CaseFormat.UPPER_UNDERSCORE, codeField.getEnumName());
+                objectMap.put("frontEnumPlugin", "$smartEnumPlugin.getDescByValue('" + upperUnderscoreEnum + "', text)");
+            }
+
             // 是否存在字典
             if (SmartStringUtil.isNotBlank(codeField.getDict())) {
                 objectMap.put("dict", codeField.getDict());

smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/service/DataTracerChangeContentService.java

@@ -160,6 +160,16 @@ public class DataTracerChangeContentService {
         return "【原数据】:<br/>" + oldContent + "<br/>" + "【新数据】:<br/>" + newContent;
     }
 
+    /**
+     * 解析批量bean的内容
+     *
+     * @param objectList 对象列表
+     * @return 单个内容
+     */
+    public  <T> String  getChangeContent(List<T> objectList) {
+        return this.getObjectListContent(objectList);
+    }
+
     /**
      * 获取一个对象的内容信息
      *

smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/domain/vo/DictDataVO.java

@@ -3,6 +3,7 @@ package net.lab1024.sa.base.module.support.dict.domain.vo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.time.LocalDateTime;
 
 /**
@@ -14,7 +15,7 @@ import java.time.LocalDateTime;
  */
 
 @Data
-public class DictDataVO {
+public class DictDataVO implements Serializable {
 
     @Schema(description = "字典数据id")
     private Long dictDataId;
@@ -25,6 +26,12 @@ public class DictDataVO {
     @Schema(description = "字典编码")
     private String dictCode;
 
+    @Schema(description = "字典名字")
+    private String dictName;
+
+    @Schema(description = "字典禁用状态")
+    private Boolean dictDisabledFlag;
+
     @Schema(description = "字典项值")
     private String dataValue;
 

smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/domain/vo/DictVO.java

@@ -30,7 +30,7 @@ public class DictVO {
     private String remark;
 
     @Schema(description = "禁用状态")
-    private Integer disabledFlag;
+    private Boolean disabledFlag;
 
     @Schema(description = "创建时间")
     private LocalDateTime createTime;

smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/file/service/FileService.java

@@ -55,9 +55,6 @@ public class FileService {
     @Resource
     private FileDao fileDao;
 
-    @Resource
-    private RedisService redisService;
-
     @Resource
     private SecurityFileService securityFileService;
 

smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/file/service/FileStorageCloudServiceImpl.java

@@ -2,10 +2,7 @@ package net.lab1024.sa.base.module.support.file.service;
 
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.LocalDateTimeUtil;
-import com.amazonaws.services.s3.AmazonS3;
-import com.amazonaws.services.s3.model.CannedAccessControlList;
-import com.amazonaws.services.s3.model.ObjectMetadata;
-import com.amazonaws.services.s3.model.S3Object;
+import cn.hutool.core.util.IdUtil;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import net.lab1024.sa.base.common.code.SystemErrorCode;
@@ -22,21 +19,27 @@ import net.lab1024.sa.base.module.support.file.domain.vo.FileVO;
 import net.lab1024.sa.base.module.support.redis.RedisService;
 import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.io.FilenameUtils;
+import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.util.FileCopyUtils;
 import org.springframework.web.multipart.MultipartFile;
+import software.amazon.awssdk.core.ResponseBytes;
+import software.amazon.awssdk.core.sync.RequestBody;
+import software.amazon.awssdk.core.sync.ResponseTransformer;
+import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.services.s3.S3Client;
+import software.amazon.awssdk.services.s3.model.*;
+import software.amazon.awssdk.services.s3.presigner.S3Presigner;
+import software.amazon.awssdk.services.s3.presigner.model.GetObjectPresignRequest;
+import software.amazon.awssdk.services.s3.presigner.model.PresignedGetObjectRequest;
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-import java.net.URL;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
+import java.time.Duration;
 import java.time.LocalDateTime;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.UUID;
 
 /**
  * 云计算 实现
@@ -45,7 +48,7 @@ import java.util.UUID;
  * @Date 2019年10月11日 15:34:47
  * @Wechat zhuoda1024
  * @Email lab1024@163.com
- * @Copyright  <a href="https://1024lab.net">1024创新实验室</a>
+ * @Copyright <a href="https://1024lab.net">1024创新实验室</a>
  */
 @Slf4j
 public class FileStorageCloudServiceImpl implements IFileStorageService {
@@ -66,7 +69,7 @@ public class FileStorageCloudServiceImpl implements IFileStorageService {
     private static final String USER_METADATA_FILE_SIZE = "file-size";
 
     @Resource
-    private AmazonS3 amazonS3;
+    private S3Client s3Client;
 
     @Resource
     private FileConfig cloudConfig;
@@ -86,44 +89,47 @@ public class FileStorageCloudServiceImpl implements IFileStorageService {
         }
 
         String fileType = FilenameUtils.getExtension(originalFileName);
-        String uuid = UUID.randomUUID().toString().replaceAll("-", "");
+        String uuid = IdUtil.fastSimpleUUID();
         String time = LocalDateTimeUtil.format(LocalDateTime.now(), DatePattern.PURE_DATETIME_FORMATTER);
-        String fileKey = path + uuid + "_" + time+ "." + fileType;
+        String fileKey = path + uuid + "_" + time + "." + fileType;
 
         // 文件名称 URL 编码
         String urlEncoderFilename;
-        try {
-            urlEncoderFilename = URLEncoder.encode(originalFileName, StandardCharsets.UTF_8.name());
-        } catch (UnsupportedEncodingException e) {
-            log.error("文件上传服务URL ENCODE-发生异常：", e);
-            return ResponseDTO.error(SystemErrorCode.SYSTEM_ERROR, "上传失败");
-        }
-        ObjectMetadata meta = new ObjectMetadata();
-        meta.setContentEncoding(StandardCharsets.UTF_8.name());
-        meta.setContentDisposition("attachment;filename=" + urlEncoderFilename);
+        urlEncoderFilename = URLEncoder.encode(originalFileName, StandardCharsets.UTF_8);
         Map<String, String> userMetadata = new HashMap<>(10);
         userMetadata.put(USER_METADATA_FILE_NAME, urlEncoderFilename);
         userMetadata.put(USER_METADATA_FILE_FORMAT, fileType);
         userMetadata.put(USER_METADATA_FILE_SIZE, String.valueOf(file.getSize()));
-        meta.setUserMetadata(userMetadata);
-        meta.setContentLength(file.getSize());
-        meta.setContentType(this.getContentType(fileType));
+
+        // 根据文件路径获取并设置访问权限
+        ObjectCannedACL acl = this.getACL(path);
+        PutObjectRequest putObjectRequest = PutObjectRequest.builder()
+                .bucket(cloudConfig.getBucketName())
+                .key(fileKey)
+                .metadata(userMetadata)
+                .contentLength(file.getSize())
+                .contentType(this.getContentType(fileType))
+                .contentEncoding(StandardCharsets.UTF_8.name())
+                .contentDisposition("attachment;filename=" + urlEncoderFilename)
+                .acl(acl)
+                .build();
+        InputStream inputStream = null;
         try {
-            amazonS3.putObject(cloudConfig.getBucketName(), fileKey, file.getInputStream(), meta);
+            inputStream = file.getInputStream();
+            s3Client.putObject(putObjectRequest, RequestBody.fromInputStream(inputStream, file.getSize()));
         } catch (IOException e) {
             log.error("文件上传-发生异常：", e);
             return ResponseDTO.error(SystemErrorCode.SYSTEM_ERROR, "上传失败");
+        } finally {
+            IOUtils.closeQuietly(inputStream);
         }
-        // 根据文件路径获取并设置访问权限
-        CannedAccessControlList acl = this.getACL(path);
-        amazonS3.setObjectAcl(cloudConfig.getBucketName(), fileKey, acl);
         // 返回上传结果
         FileUploadVO uploadVO = new FileUploadVO();
         uploadVO.setFileName(originalFileName);
         uploadVO.setFileType(fileType);
         // 根据 访问权限 返回不同的 URL
         String url = cloudConfig.getUrlPrefix() + fileKey;
-        if (CannedAccessControlList.Private.equals(acl)) {
+        if (ObjectCannedACL.PRIVATE.equals(acl)) {
             // 获取临时访问的URL
             url = this.getFileUrl(fileKey).getData();
         }
@@ -136,8 +142,8 @@ public class FileStorageCloudServiceImpl implements IFileStorageService {
     /**
      * 获取文件url
      *
-     * @param fileKey
-     * @return
+     * @param fileKey 文件key
+     * @return url
      */
     @Override
     public ResponseDTO<String> getFileUrl(String fileKey) {
@@ -159,10 +165,14 @@ public class FileStorageCloudServiceImpl implements IFileStorageService {
             if (fileVO == null) {
                 return ResponseDTO.userErrorParam("文件不存在");
             }
+            GetObjectRequest getUrlRequest = GetObjectRequest.builder().bucket(cloudConfig.getBucketName()).key(fileKey).build();
+            GetObjectPresignRequest getObjectPresignRequest = GetObjectPresignRequest.builder().signatureDuration(Duration.ofSeconds(cloudConfig.getPrivateUrlExpireSeconds())).getObjectRequest(getUrlRequest).build();
 
-            Date expiration = new Date(System.currentTimeMillis() + cloudConfig.getPrivateUrlExpireSeconds() * 1000L);
-            URL url = amazonS3.generatePresignedUrl(cloudConfig.getBucketName(), fileKey, expiration);
-            fileVO.setFileUrl(url.toString());
+            S3Presigner presigner = S3Presigner.builder().region(Region.of(cloudConfig.getRegion())).build();
+
+            PresignedGetObjectRequest presignedGetObjectRequest = presigner.presignGetObject(getObjectPresignRequest);
+            String url = presignedGetObjectRequest.url().toString();
+            fileVO.setFileUrl(url);
             redisService.set(fileRedisKey, fileVO, cloudConfig.getPrivateUrlExpireSeconds() - 5);
         }
 
@@ -175,11 +185,11 @@ public class FileStorageCloudServiceImpl implements IFileStorageService {
      */
     @Override
     public ResponseDTO<FileDownloadVO> download(String key) {
-        //获取oss对象
-        S3Object s3Object = amazonS3.getObject(cloudConfig.getBucketName(), key);
+
         // 获取文件 meta
-        ObjectMetadata metadata = s3Object.getObjectMetadata();
-        Map<String, String> userMetadata = metadata.getUserMetadata();
+        HeadObjectRequest objectRequest = HeadObjectRequest.builder().bucket(this.cloudConfig.getBucketName()).key(key).build();
+        HeadObjectResponse headObjectResponse = s3Client.headObject(objectRequest);
+        Map<String, String> userMetadata = headObjectResponse.metadata();
         FileMetadataVO metadataDTO = null;
         if (MapUtils.isNotEmpty(userMetadata)) {
             metadataDTO = new FileMetadataVO();
@@ -190,43 +200,31 @@ public class FileStorageCloudServiceImpl implements IFileStorageService {
             metadataDTO.setFileSize(fileSize);
         }
 
-        // 获得输入流
-        InputStream objectContent = s3Object.getObjectContent();
-        try {
-            // 输入流转换为字节流
-            byte[] buffer = FileCopyUtils.copyToByteArray(objectContent);
+        //获取oss对象
+        GetObjectRequest getObjectRequest = GetObjectRequest.builder().bucket(cloudConfig.getBucketName()).key(key).build();
+        ResponseBytes<GetObjectResponse> s3ClientObject = s3Client.getObject(getObjectRequest, ResponseTransformer.toBytes());
 
-            FileDownloadVO fileDownloadVO = new FileDownloadVO();
-            fileDownloadVO.setData(buffer);
-            fileDownloadVO.setMetadata(metadataDTO);
-            return ResponseDTO.ok(fileDownloadVO);
-        } catch (IOException e) {
-            log.error("文件下载-发生异常：", e);
-            return ResponseDTO.error(SystemErrorCode.SYSTEM_ERROR, "下载失败");
-        } finally {
-            try {
-                // 关闭输入流
-                objectContent.close();
-                s3Object.close();
-            } catch (IOException e) {
-                log.error("文件下载-发生异常：", e);
-            }
-        }
+        // 输入流转换为字节流
+        byte[] buffer = s3ClientObject.asByteArray();
+        FileDownloadVO fileDownloadVO = new FileDownloadVO();
+        fileDownloadVO.setData(buffer);
+        fileDownloadVO.setMetadata(metadataDTO);
+        return ResponseDTO.ok(fileDownloadVO);
     }
 
     /**
      * 根据文件夹路径 返回对应的访问权限
      *
-     * @param fileKey
-     * @return
+     * @param fileKey 文件key
+     * @return 权限
      */
-    private CannedAccessControlList getACL(String fileKey) {
+    private ObjectCannedACL getACL(String fileKey) {
         // 公用读
         if (fileKey.contains(FileFolderTypeEnum.FOLDER_PUBLIC)) {
-            return CannedAccessControlList.PublicRead;
+            return ObjectCannedACL.PUBLIC_READ;
         }
         // 其他默认私有读写
-        return CannedAccessControlList.Private;
+        return ObjectCannedACL.PRIVATE;
     }
 
     /**
@@ -235,11 +233,11 @@ public class FileStorageCloudServiceImpl implements IFileStorageService {
      * ps：不能删除fileKey不为空的文件夹
      *
      * @param fileKey 文件or文件夹
-     * @return
      */
     @Override
     public ResponseDTO<String> delete(String fileKey) {
-        amazonS3.deleteObject(cloudConfig.getBucketName(), fileKey);
+        DeleteObjectRequest deleteObjectRequest = DeleteObjectRequest.builder().bucket(cloudConfig.getBucketName()).key(fileKey).build();
+        s3Client.deleteObject(deleteObjectRequest);
         return ResponseDTO.ok();
     }
 

smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/entity/HelpDocCatalogEntity.java

@@ -43,7 +43,6 @@ public class HelpDocCatalogEntity {
     /**
      * 排序
      */
-    @TableField("`sort`")
     private Integer sort;
 
 

smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/entity/HelpDocEntity.java

@@ -53,7 +53,6 @@ public class HelpDocEntity {
     /**
      * 排序
      */
-    @TableField("`sort`")
     private Integer sort;
 
     /**

smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/api/domain/SmartJobUpdateForm.java

@@ -1,13 +1,8 @@
 package net.lab1024.sa.base.module.support.job.api.domain;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
-import net.lab1024.sa.base.common.swagger.SchemaEnum;
-import net.lab1024.sa.base.common.validator.enumeration.CheckEnum;
-import net.lab1024.sa.base.module.support.job.constant.SmartJobTriggerTypeEnum;
-import org.hibernate.validator.constraints.Length;
 
 /**
  * 定时任务 更新

smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/mail/MailService.java

@@ -1,7 +1,7 @@
 package net.lab1024.sa.base.module.support.mail;
 
 
-import cn.hutool.core.lang.UUID;
+import cn.hutool.core.util.IdUtil;
 import freemarker.cache.StringTemplateLoader;
 import freemarker.template.Configuration;
 import freemarker.template.Template;
@@ -19,7 +19,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.text.StringSubstitutor;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.mail.javamail.JavaMailSender;
 import org.springframework.mail.javamail.MimeMessageHelper;
@@ -33,7 +32,7 @@ import java.util.Map;
 
 /**
  *
- * 发生邮件：<br/>
+ * 发送邮件：<br/>
  * 1、支持直接发送 <br/>
  * 2、支持使用邮件模板发送
  *
@@ -47,7 +46,7 @@ import java.util.Map;
 @Component
 public class MailService {
 
-    @Autowired
+    @Resource
     private JavaMailSender javaMailSender;
 
     @Resource
@@ -163,7 +162,7 @@ public class MailService {
     private String freemarkerResolverContent(String htmlTemplate, Map<String, Object> templateParamsMap) {
         Configuration configuration = new Configuration(Configuration.VERSION_2_3_23);
         StringTemplateLoader stringLoader = new StringTemplateLoader();
-        String templateName = UUID.fastUUID().toString(true);
+        String templateName = IdUtil.fastSimpleUUID();
         stringLoader.putTemplate(templateName, htmlTemplate);
         configuration.setTemplateLoader(stringLoader);
         try {

smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/message/domain/MessageTemplateSendForm.java

@@ -1,10 +1,13 @@
 package net.lab1024.sa.base.module.support.message.domain;
 
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import net.lab1024.sa.base.common.enumeration.UserTypeEnum;
 import net.lab1024.sa.base.module.support.message.constant.MessageTemplateEnum;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -25,6 +28,10 @@ public class MessageTemplateSendForm {
     @NotNull(message = "接收者id不能为空")
     private Long receiverUserId;
 
+    @Schema(description = "接收者id")
+    @NotEmpty(message = "接收者id不能为空")
+    private List<Long> receiverUserIdList;
+
     /**
      * 相关业务id | 可选
      * 用于跳转具体业务

smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/operatelog/core/OperateLogAspect.java

@@ -11,6 +11,7 @@ import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
 import net.lab1024.sa.base.common.constant.StringConst;
 import net.lab1024.sa.base.common.domain.RequestUser;
+import net.lab1024.sa.base.common.domain.ResponseDTO;
 import net.lab1024.sa.base.common.util.SmartIpUtil;
 import net.lab1024.sa.base.common.util.SmartRequestUtil;
 import net.lab1024.sa.base.module.support.operatelog.OperateLogDao;
@@ -46,7 +47,7 @@ import java.util.concurrent.ThreadPoolExecutor;
  * @Date 2021-12-08 20:48:52
  * @Wechat zhuoda1024
  * @Email lab1024@163.com
- * @Copyright  <a href="https://1024lab.net">1024创新实验室</a>
+ * @Copyright <a href="https://1024lab.net">1024创新实验室</a>
  */
 @Slf4j
 @Aspect
@@ -71,14 +72,14 @@ public abstract class OperateLogAspect {
     public void logPointCut() {
     }
 
-    @AfterReturning(pointcut = "logPointCut()")
-    public void doAfterReturning(JoinPoint joinPoint) {
-        handleLog(joinPoint, null);
+    @AfterReturning(pointcut = "logPointCut()", returning = "responseDTO")
+    public void doAfterReturning(JoinPoint joinPoint, Object responseDTO) {
+        handleLog(joinPoint, null, responseDTO);
     }
 
     @AfterThrowing(value = "logPointCut()", throwing = "e")
     public void doAfterThrowing(JoinPoint joinPoint, Exception e) {
-        handleLog(joinPoint, e);
+        handleLog(joinPoint, e, null);
     }
 
     /**
@@ -109,16 +110,15 @@ public abstract class OperateLogAspect {
         taskExecutor.setWaitForTasksToCompleteOnShutdown(true);
     }
 
-    protected void handleLog(final JoinPoint joinPoint, final Exception e) {
+    protected void handleLog(final JoinPoint joinPoint, final Exception e, Object responseDTO) {
         try {
             OperateLog operateLog = this.getAnnotationLog(joinPoint);
             if (operateLog == null) {
                 return;
             }
-            this.submitLog(joinPoint, e);
+            this.submitLog(joinPoint, e, responseDTO);
         } catch (Exception exp) {
             log.error("保存操作日志异常:{}", exp.getMessage());
-            exp.printStackTrace();
         }
     }
 
@@ -173,11 +173,8 @@ public abstract class OperateLogAspect {
     /**
      * 提交存储操作日志
      *
-     * @param joinPoint
-     * @param e
-     * @throws Exception
      */
-    private void submitLog(final JoinPoint joinPoint, final Throwable e) throws Exception {
+    private void submitLog(final JoinPoint joinPoint, final Throwable e, Object responseDTO) {
         HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
         //设置用户信息
         RequestUser user = SmartRequestUtil.getRequestUser();
@@ -191,7 +188,7 @@ public abstract class OperateLogAspect {
         String methodName = joinPoint.getSignature().getName();
         String operateMethod = className + "." + methodName;
         String failReason = null;
-        Boolean successFlag = true;
+        boolean successFlag = true;
         if (e != null) {
             successFlag = false;
             failReason = getExceptionString(e);
@@ -210,15 +207,32 @@ public abstract class OperateLogAspect {
                         .userAgent(user.getUserAgent())
                         .failReason(failReason)
                         .successFlag(successFlag).build();
+
         Operation apiOperation = this.getApiOperation(joinPoint);
         if (apiOperation != null) {
             operateLogEntity.setContent(apiOperation.summary());
         }
+
         Tag api = this.getApi(joinPoint);
         if (api != null) {
             String name = api.name();
             operateLogEntity.setModule(StrUtil.join(",", name));
         }
+
+        // 处理返回值 ResponseDTO
+        if(responseDTO instanceof ResponseDTO) {
+            ResponseDTO response = (ResponseDTO) responseDTO;
+            ResponseDTO logResponseDTO = new ResponseDTO(
+                    response.getCode(),
+                    response.getLevel(),
+                    response.getOk(),
+                    response.getMsg(),
+                    null
+            );
+            logResponseDTO.setDataType(response.getDataType());
+            operateLogEntity.setResponse(JSON.toJSONString(logResponseDTO));
+        }
+
         taskExecutor.execute(() -> {
             this.saveLog(operateLogEntity);
         });

smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/operatelog/domain/OperateLogEntity.java

@@ -71,6 +71,11 @@ public class OperateLogEntity {
      */
     private String param;
 
+    /**
+     * 返回值
+     */
+    private String response;
+
     /**
      * 客户ip
      */

smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/operatelog/domain/OperateLogVO.java

@@ -47,6 +47,9 @@ public class OperateLogVO {
     @Schema(description = "请求参数")
     private String param;
 
+    @Schema(description = "返回值")
+    private String response;
+
     @Schema(description = "客户ip")
     private String ip;
 

smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/redis/CustomRedisCacheManager.java

@@ -0,0 +1,145 @@
+package net.lab1024.sa.base.module.support.redis;
+
+import cn.hutool.core.util.StrUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.convert.DurationStyle;
+import org.springframework.data.redis.cache.*;
+
+import java.time.Duration;
+
+import static net.lab1024.sa.base.common.constant.StringConst.COLON;
+
+/**
+ * 自定义 RedisCacheManager，支持在 cacheName 中通过 '#' 指定 TTL（过期时间）。
+ *
+ * @Author CoderKK
+ * @Date 2025-08-15 13:01:01
+ * <p>
+ * 支持格式：{@code cacheName#ttl}，其中 ttl 支持 Spring 的 Duration 格式。
+ * 特殊值：{@code -1} 表示永久缓存（永不过期）。
+ * </p>
+ *
+ * <h3>使用示例：</h3>
+ * <pre>
+ * // 10 秒后过期
+ * &#64;Cacheable(value = "user#10s", key = "#id")
+ * // 2 小时后过期
+ * &#64;Cacheable(value = "report#2h", key = "#date")
+ * // 30 分钟后过期
+ * &#64;Cacheable(value = "session#30m", key = "#token")
+ * // 永不过期（永久缓存），适用于极少变化的配置数据
+ * &#64;Cacheable(value = "appConfig#-1", key = "'globalSettings'")
+ * // 无 TTL，使用全局默认过期时间（如 7 天）
+ * &#64;Cacheable(value = "product", key = "#productId")
+ * </pre>
+ *
+ * <h3>生成的 Redis Key 格式：</h3>
+ * <pre>
+ * cache:cacheName:key
+ * 例如：cache:user:123
+ *      cache:appConfig:globalSettings
+ * </pre>
+ *
+ * <h3>支持的 TTL 单位：</h3>
+ * <ul>
+ *   <li>{@code ms} / {@code millis} / {@code milliseconds} - 毫秒</li>
+ *   <li>{@code s} / {@code secs} / {@code seconds} - 秒</li>
+ *   <li>{@code m} / {@code mins} / {@code minutes} - 分钟</li>
+ *   <li>{@code h} / {@code hrs} / {@code hours} - 小时</li>
+ *   <li>{@code d} / {@code days} - 天</li>
+ * </ul>
+ *
+ * <h3>注意事项：</h3>
+ * <ul>
+ *   <li>不写单位默认为毫秒</li>
+ *   <li>永久缓存（#-1）不会自动过期，请配合 &#64;CacheEvict 手动清理。</li>
+ *   <li>避免对频繁更新的数据使用永久缓存，防止数据陈旧。</li>
+ *   <li>cacheName 中的 '#' 只解析第一个，后续字符将作为 TTL 处理。</li>
+ * </ul>
+ */
+@Slf4j
+public class CustomRedisCacheManager extends RedisCacheManager {
+
+    /**
+     * 缓存全局前缀
+     */
+    private static final String CACHE_PREFIX = "cache";
+
+    /**
+     * 自定义 TTL 分隔符，用于在 cacheName 后附加过期时间
+     */
+    private static final String CUSTOM_TTL_SEPARATOR = "#";
+
+    /**
+     * 默认缓存过期时间：7 天
+     */
+    private static final Duration DEFAULT_TTL = Duration.ofDays(7);
+
+    public CustomRedisCacheManager(RedisCacheWriter cacheWriter, RedisCacheConfiguration defaultCacheConfiguration) {
+        super(cacheWriter, defaultCacheConfiguration);
+    }
+
+    /**
+     * 创建 RedisCache 实例，支持从 cacheName 解析 TTL
+     *
+     * @param name        缓存名称（支持 name#ttl 格式）
+     * @param cacheConfig 默认缓存配置
+     * @return RedisCache
+     */
+    @Override
+    protected RedisCache createRedisCache(String name, RedisCacheConfiguration cacheConfig) {
+        Duration ttl = parseTtlFromCacheName(name);
+        if (ttl == null) {
+            ttl = DEFAULT_TTL;
+        }
+
+        CacheKeyPrefix keyPrefix = cacheName -> {
+            if (StrUtil.isBlank(cacheName)) {
+                return CACHE_PREFIX + COLON;
+            }
+            String[] parts = cacheName.split(CUSTOM_TTL_SEPARATOR, 2);
+            String cleanName = StrUtil.trim(parts[0]);
+            return CACHE_PREFIX + COLON + cleanName + COLON;
+        };
+
+        // 构建最终缓存配置：设置 key 前缀 + TTL
+        RedisCacheConfiguration config = cacheConfig.computePrefixWith(keyPrefix).entryTtl(ttl);
+
+        return super.createRedisCache(name, config);
+    }
+
+    /**
+     * 从 cacheName 中解析 TTL
+     *
+     * @param name 缓存名称，格式如：users#10m, products#2h, config#-1（永久）
+     * @return 解析出的 Duration若无效则返回 null；若为 -1，则返回 Duration.ofMillis(-1) 表示永久缓存
+     */
+    private Duration parseTtlFromCacheName(String name) {
+        if (StrUtil.isBlank(name)) {
+            return null;
+        }
+
+        String[] parts = name.split(CUSTOM_TTL_SEPARATOR, 2);
+        if (parts.length < 2) {
+            return null; // 无 TTL 部分
+        }
+
+        String ttlStr = StrUtil.trim(parts[1]);
+        if (StrUtil.isBlank(ttlStr)) {
+            return null;
+        }
+
+        // 特殊处理：-1 表示永久缓存
+        if ("-1".equals(ttlStr)) {
+            return Duration.ofMillis(-1); // Spring Redis 中负数 Duration 表示永不过期
+        }
+
+        try {
+            Duration ttl = DurationStyle.detectAndParse(ttlStr);
+            return ttl.getSeconds() > 0 ? ttl : null;
+        } catch (IllegalArgumentException e) {
+            log.error("解析缓存 TTL 失败，cacheName='{}', ttl='{}', 错误: {}", name, ttlStr, e);
+            return null;
+        }
+    }
+}

smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/reload/core/SmartReloadManager.java

@@ -11,9 +11,6 @@ import net.lab1024.sa.base.module.support.reload.core.thread.SmartReloadRunnable
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.beans.factory.config.BeanPostProcessor;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationListener;
-import org.springframework.context.event.ContextRefreshedEvent;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ReflectionUtils;
 

smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/reload/core/thread/SmartReloadRunnable.java

@@ -2,7 +2,6 @@ package net.lab1024.sa.base.module.support.reload.core.thread;
 
 import lombok.extern.slf4j.Slf4j;
 import net.lab1024.sa.base.module.support.reload.core.AbstractSmartReloadCommand;
-import net.lab1024.sa.base.module.support.reload.core.SmartReloadManager;
 import net.lab1024.sa.base.module.support.reload.core.domain.SmartReloadItem;
 import net.lab1024.sa.base.module.support.reload.core.domain.SmartReloadObject;
 import net.lab1024.sa.base.module.support.reload.core.domain.SmartReloadResult;

smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/repeatsubmit/RepeatSubmitAspect.java

@@ -1,5 +1,6 @@
 package net.lab1024.sa.base.module.support.repeatsubmit;
 
+import jakarta.servlet.http.HttpServletRequest;
 import lombok.extern.slf4j.Slf4j;
 import net.lab1024.sa.base.common.code.UserErrorCode;
 import net.lab1024.sa.base.common.domain.ResponseDTO;
@@ -16,10 +17,19 @@ import org.springframework.web.context.request.ServletRequestAttributes;
 import java.lang.reflect.Method;
 
 /**
- * 重复提交 aop切口
+ * 重复提交 aop切口 <br>
+ * -------------------------<br>
+ * 着重说明：<br>
+ * 注解属性 intervalMilliSecond 是指 一段时间内只允许有一次请求；<br>
+ * intervalMilliSecond = 0: 表示只有上个请求执行完以后才可以执行<br>
+ * intervalMilliSecond > 0: 表示指定时间内只才能执行，特别提醒<br>
+ * ------------------------<br>
+ * 特殊说明 intervalMilliSecond > 0 <br>
+ * 若假设 方法执行时间为 100ms，若 intervalMilliSecond = 50，则 同一时间内可能会有2个请求同时在执行！<br>
+ * 若假设 方法执行时间为 100ms，若 intervalMilliSecond = 200，则 同一时间内只能有1请求执行，且执行完后100ms，才会执行下一次请求<br>
  *
- * @Author 1024创新实验室: 胡克
- * @Date 2020-11-25 20:56:58
+ * @Author 1024创新实验室-主任: 卓大
+ * @Date 2025-07-26 23:56:58
  * @Wechat zhuoda1024
  * @Email lab1024@163.com
  * @Copyright <a href="https://1024lab.net">1024创新实验室</a>
@@ -43,36 +53,46 @@ public class RepeatSubmitAspect {
     @Around("@annotation(net.lab1024.sa.base.module.support.repeatsubmit.annoation.RepeatSubmit)")
     public Object around(ProceedingJoinPoint point) throws Throwable {
 
+
         ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
-        String ticketToken = attributes.getRequest().getServletPath();
-        String ticket = this.repeatSubmitTicket.getTicket(ticketToken);
+        if (attributes == null) {
+            return point.proceed();
+        }
+
+        /**
+         * 第一步：生成防重复提交的 ticket凭证
+         * ticket 是根据 Request对象 自定义 生成的，可以加入请求user相关属性作为生成要素
+         */
+
+        HttpServletRequest request = attributes.getRequest();
+        String ticket = this.repeatSubmitTicket.generateTicket(request);
         if (StringUtils.isEmpty(ticket)) {
             return point.proceed();
         }
 
         Method method = ((MethodSignature) point.getSignature()).getMethod();
         RepeatSubmit annotation = method.getAnnotation(RepeatSubmit.class);
-        int limit = annotation.value();
+        Long intervalMilliSecond = (long) annotation.intervalMilliSecond();
 
-        // 获取上一次请求时间
-        Long lastRequestTime = this.repeatSubmitTicket.getTicketTimestamp(ticket);
-        // 校验是否限制时间内重复提交
-        if (lastRequestTime != null && System.currentTimeMillis() < lastRequestTime + limit) {
+        /**
+         * 第二步：根据 ticket 凭证进行 加锁
+         * 能加锁，则可以执行
+         * 若不能加锁，则证明还是时间间隔interval中
+         */
+
+        boolean lockSuccessFlag = this.repeatSubmitTicket.tryLock(ticket, System.currentTimeMillis(), intervalMilliSecond);
+        if (!lockSuccessFlag) {
             return ResponseDTO.error(UserErrorCode.REPEAT_SUBMIT);
         }
 
-        // 执行
-        Object obj = null;
         try {
-            // 给 ticket 设置在执行中
-            this.repeatSubmitTicket.putTicket(ticket);
-            // 执行
-            obj = point.proceed();
+            return point.proceed();
         } catch (Throwable throwable) {
-            log.error("", throwable);
+            log.error(throwable.getMessage(), throwable);
             throw throwable;
+        } finally {
+            this.repeatSubmitTicket.unLock(ticket, intervalMilliSecond);
         }
-        return obj;
     }
 
 }

smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/repeatsubmit/annoation/RepeatSubmit.java

@@ -7,21 +7,30 @@ import java.lang.annotation.Target;
 
 /**
  * 标记 需要防止重复提交 的注解<br>
- * 单位：毫秒
+ * 单位：毫秒<br>
+ * -------------------------<br>
+ * 着重说明：<br>
+ * 注解属性 intervalMilliSecond 是指 一段时间内只允许有一次请求；<br>
+ * intervalMilliSecond = 0: 表示只有上个请求执行完以后才可以执行<br>
+ * intervalMilliSecond > 0: 表示指定时间内只才能执行，特别提醒<br>
+ * ------------------------<br>
+ * 特殊说明 intervalMilliSecond > 0 <br>
+ * 若假设 方法执行时间为 100ms，若 intervalMilliSecond = 50，则 同一时间内可能会有2个请求同时在执行！<br>
+ * 若假设 方法执行时间为 100ms，若 intervalMilliSecond = 200，则 同一时间内只能有1请求执行，且执行完后100ms，才会执行下一次请求<br>
  *
- * @Author 1024创新实验室: 胡克
- * @Date 2020-11-25 20:56:58
+ * @Author 1024创新实验室-主任: 卓大
+ * @Date 2025-07-26 20:56:58
  * @Wechat zhuoda1024
  * @Email lab1024@163.com
- * @Copyright  <a href="https://1024lab.net">1024创新实验室</a>
+ * @Copyright <a href="https://1024lab.net">1024创新实验室</a>
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
 public @interface RepeatSubmit {
 
     /**
-     * 重复提交间隔时间/毫秒
+     * 间隔时间/毫秒
      */
-    int value() default 300;
+    int intervalMilliSecond() default 0;
 
 }

smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/repeatsubmit/ticket/AbstractRepeatSubmitTicket.java

@@ -1,42 +1,43 @@
 package net.lab1024.sa.base.module.support.repeatsubmit.ticket;
 
+import jakarta.servlet.http.HttpServletRequest;
+
 import java.util.function.Function;
 
 /**
  * 凭证（用于校验重复提交的东西）
  *
- * @Author 1024创新实验室: 罗伊
- * @Date 2020-11-25 20:56:58
+ * @Author 1024创新实验室-主任: 卓大
+ * @Date 2025-07-26 23:56:58
  * @Wechat zhuoda1024
  * @Email lab1024@163.com
  * @Copyright <a href="https://1024lab.net">1024创新实验室</a>
  */
 public abstract class AbstractRepeatSubmitTicket {
 
-    private final Function<String, String> ticketFunction;
+    private final Function<HttpServletRequest, String> generateTicketFunction;
 
 
-    public AbstractRepeatSubmitTicket(Function<String, String> ticketFunction) {
-        this.ticketFunction = ticketFunction;
+    public AbstractRepeatSubmitTicket(Function<HttpServletRequest, String> generateTicketFunction) {
+        this.generateTicketFunction = generateTicketFunction;
     }
 
 
     /**
-     * 获取凭证
+     * 生成 加锁的 凭证
      */
-    public String getTicket(String ticketToken) {
-        return this.ticketFunction.apply(ticketToken);
+    public String generateTicket(HttpServletRequest request) {
+        return this.generateTicketFunction.apply(request);
     }
 
     /**
-     * 获取凭证 时间戳
+     * 加锁
      */
-    public abstract Long getTicketTimestamp(String ticket);
-
+    public abstract boolean tryLock(String ticket, Long currentTimestamp, Long intervalMilliSecond);
 
     /**
-     * 设置本次请求时间
+     * 移除锁
      */
-    public abstract void putTicket(String ticket);
+    public abstract void unLock(String ticket, Long intervalMilliSecond);
 
 }

smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/repeatsubmit/ticket/RepeatSubmitCaffeineTicket.java

@@ -1,45 +0,0 @@
-package net.lab1024.sa.base.module.support.repeatsubmit.ticket;
-
-import com.github.benmanes.caffeine.cache.Cache;
-import com.github.benmanes.caffeine.cache.Caffeine;
-import net.lab1024.sa.base.module.support.repeatsubmit.annoation.RepeatSubmit;
-
-import java.util.concurrent.TimeUnit;
-import java.util.function.Function;
-
-/**
- * 凭证（内存实现）
- *
- * @Author 1024创新实验室: 罗伊
- * @Date 2020-11-25 20:56:58
- * @Wechat zhuoda1024
- * @Email lab1024@163.com
- * @Copyright <a href="https://1024lab.net">1024创新实验室</a>
- */
-public class RepeatSubmitCaffeineTicket extends AbstractRepeatSubmitTicket {
-
-    /**
-     * 限制缓存最大数量 超过后先放入的会自动移除
-     * 默认缓存时间
-     * 初始大小为：100万
-     */
-    private static final Cache<String, Long> cache = Caffeine.newBuilder()
-            .maximumSize(100 * 10000)
-            .expireAfterWrite(300 * 1000L, TimeUnit.MILLISECONDS).build();
-
-
-    public RepeatSubmitCaffeineTicket(Function<String, String> ticketFunction) {
-        super(ticketFunction);
-    }
-
-    @Override
-    public Long getTicketTimestamp(String ticket) {
-        return cache.getIfPresent(ticket);
-    }
-
-
-    @Override
-    public void putTicket(String ticket) {
-        cache.put(ticket, System.currentTimeMillis());
-    }
-}

smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/repeatsubmit/ticket/RepeatSubmitMemoryTicket.java

@@ -0,0 +1,60 @@
+package net.lab1024.sa.base.module.support.repeatsubmit.ticket;
+
+import com.google.common.collect.Interner;
+import com.google.common.collect.Interners;
+import com.google.common.collect.Maps;
+import jakarta.servlet.http.HttpServletRequest;
+
+import java.util.concurrent.ConcurrentMap;
+import java.util.function.Function;
+
+/**
+ * 凭证（内存实现）
+ *
+ * @Author 1024创新实验室-主任: 卓大
+ * @Date 2025-07-26 23:56:58
+ * @Wechat zhuoda1024
+ * @Email lab1024@163.com
+ * @Copyright <a href="https://1024lab.net">1024创新实验室</a>
+ */
+public class RepeatSubmitMemoryTicket extends AbstractRepeatSubmitTicket {
+
+    private Interner<String> pool = Interners.newStrongInterner();
+
+    private ConcurrentMap<String, Long> ticketMap = Maps.newConcurrentMap();
+
+    public RepeatSubmitMemoryTicket(Function<HttpServletRequest, String> ticketFunction) {
+        super(ticketFunction);
+    }
+
+    @Override
+    public boolean tryLock(String ticket, Long currentTimestamp, Long intervalMilliSecond) {
+        synchronized (pool.intern(ticket)) {
+            Long lastTime = ticketMap.putIfAbsent(ticket, currentTimestamp);
+            if (lastTime == null) {
+                return true;
+            }
+
+            if (intervalMilliSecond <= 0) {
+                return false;
+            }
+
+            if (currentTimestamp - lastTime < intervalMilliSecond) {
+                return false;
+
+            }
+            ticketMap.put(ticket, currentTimestamp);
+            return true;
+        }
+    }
+
+    @Override
+    public void unLock(String ticket, Long intervalMilliSecond) {
+        if (intervalMilliSecond > 0) {
+            return;
+        }
+        ticketMap.remove(ticket);
+    }
+
+
+}

smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/repeatsubmit/ticket/RepeatSubmitRedisTicket.java

@@ -1,7 +1,7 @@
 package net.lab1024.sa.base.module.support.repeatsubmit.ticket;
 
-import net.lab1024.sa.base.module.support.repeatsubmit.annoation.RepeatSubmit;
-import org.springframework.data.redis.core.ValueOperations;
+import jakarta.servlet.http.HttpServletRequest;
+import org.springframework.data.redis.core.RedisTemplate;
 
 import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
@@ -9,32 +9,39 @@ import java.util.function.Function;
 /**
  * 凭证（redis实现）
  *
- * @Author 1024创新实验室: 罗伊
- * @Date 2020-11-25 20:56:58
+ * @Author 1024创新实验室-主任: 卓大
+ * @Date 2025-07-26 23:56:58
  * @Wechat zhuoda1024
  * @Email lab1024@163.com
  * @Copyright <a href="https://1024lab.net">1024创新实验室</a>
  */
 public class RepeatSubmitRedisTicket extends AbstractRepeatSubmitTicket {
 
-    private final ValueOperations<String, String> redisValueOperations;
+    private final RedisTemplate<String, Object> redisTemplate;
 
-    public RepeatSubmitRedisTicket(ValueOperations<String, String> redisValueOperations,
-                                   Function<String, String> ticketFunction) {
+    public RepeatSubmitRedisTicket(RedisTemplate<String, Object> redisTemplate,
+                                   Function<HttpServletRequest, String> ticketFunction) {
         super(ticketFunction);
-        this.redisValueOperations = redisValueOperations;
+        this.redisTemplate = redisTemplate;
     }
 
     @Override
-    public Long getTicketTimestamp(String ticket) {
-        String ticketLastTime = redisValueOperations.get(ticket);
-        return ticketLastTime == null ? null : Long.valueOf(ticketLastTime);
+    public boolean tryLock(String ticket, Long currentTimestamp, Long intervalMilliSecond) {
+        if (intervalMilliSecond > 0) {
+            return Boolean.TRUE.equals(redisTemplate.opsForValue().setIfAbsent(ticket, String.valueOf(currentTimestamp), intervalMilliSecond, TimeUnit.MILLISECONDS));
+        } else {
+            return Boolean.TRUE.equals(redisTemplate.opsForValue().setIfAbsent(ticket, String.valueOf(currentTimestamp)));
+        }
     }
 
     @Override
-    public void putTicket(String ticket) {
-        redisValueOperations.getOperations().delete(ticket);
-        this.getTicketTimestamp(ticket);
+    public void unLock(String ticket, Long intervalMilliSecond) {
+        if (intervalMilliSecond > 0) {
+            return;
+        }
+
+        redisTemplate.delete(ticket);
     }
 
+
 }

smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/service/Level3ProtectConfigService.java

@@ -5,6 +5,7 @@ import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.Resource;
+import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import net.lab1024.sa.base.common.domain.ResponseDTO;
 import net.lab1024.sa.base.module.support.config.ConfigKeyEnum;
@@ -28,17 +29,29 @@ public class Level3ProtectConfigService {
 
     /**
      * 开启双因子登录，默认：开启
+     * -- GETTER --
+     *  开启双因子登录，默认：开启
+
      */
+    @Getter
     private boolean twoFactorLoginEnabled = false;
 
     /**
      * 连续登录失败次数则锁定，-1表示不受限制，可以一直尝试登录
+     * -- GETTER --
+     *  连续登录失败次数则锁定，-1表示不受限制，可以一直尝试登录
+
      */
+    @Getter
     private int loginFailMaxTimes = -1;
 
     /**
      * 连续登录失败锁定时间（单位：秒），-1表示不锁定，建议锁定30分钟
+     * -- GETTER --
+     *  连续登录失败锁定时间（单位：秒），-1表示不锁定，建议锁定30分钟
+
      */
+    @Getter
     private int loginFailLockSeconds = 1800;
 
     /**
@@ -48,61 +61,53 @@ public class Level3ProtectConfigService {
 
     /**
      * 密码复杂度 是否开启，默认：开启
+     * -- GETTER --
+     *  密码复杂度 是否开启，默认：开启
+
      */
+    @Getter
     private boolean passwordComplexityEnabled = true;
 
     /**
      * 定期修改密码时间间隔（默认：天），默认：建议90天更换密码
+     * -- GETTER --
+     *  定期修改密码时间间隔（默认：天），默认：建议90天更换密码
+
      */
+    @Getter
     private int regularChangePasswordDays = 90;
 
     /**
      * 定期修改密码不允许相同次数，默认：3次以内密码不能相同
+     * -- GETTER --
+     *  定期修改密码不允许相同次数，默认：3次以内密码不能相同
+
      */
+    @Getter
     private int regularChangePasswordNotAllowRepeatTimes = 3;
 
     /**
      * 文件大小限制，单位 mb ，(默认：50 mb)
+     * -- GETTER --
+     *  文件大小限制，单位 mb ，(默认：50 mb)
+
      */
+    @Getter
     private long maxUploadFileSizeMb = 50;
 
     /**
      * 文件检测，默认：不开启
+     * -- GETTER --
+     *  文件检测，默认：不开启
+
      */
+    @Getter
     private boolean fileDetectFlag = false;
 
 
     @Resource
     private ConfigService configService;
 
-    /**
-     * 文件检测，默认：不开启
-     */
-    public boolean isFileDetectFlag() {
-        return fileDetectFlag;
-    }
-
-    /**
-     * 文件大小限制，单位 mb ，(默认：50 mb)
-     */
-    public long getMaxUploadFileSizeMb() {
-        return maxUploadFileSizeMb;
-    }
-
-    /**
-     * 连续登录失败次数则锁定，-1表示不受限制，可以一直尝试登录
-     */
-    public int getLoginFailMaxTimes() {
-        return loginFailMaxTimes;
-    }
-
-    /**
-     * 连续登录失败锁定时间（单位：秒），-1表示不锁定，建议锁定30分钟
-     */
-    public int getLoginFailLockSeconds() {
-        return loginFailLockSeconds;
-    }
-
     /**
      * 最低活跃时间（单位：秒），超过此时间没有操作系统就会被冻结，默认-1 代表不限制，永不冻结; 默认 30分钟
      */
@@ -110,34 +115,6 @@ public class Level3ProtectConfigService {
         return loginActiveTimeoutSeconds > 0 ? loginActiveTimeoutSeconds : -1;
     }
 
-    /**
-     * 定期修改密码时间间隔（默认：天），默认：建议90天更换密码
-     */
-    public int getRegularChangePasswordDays() {
-        return regularChangePasswordDays;
-    }
-
-    /**
-     * 开启双因子登录，默认：开启
-     */
-    public boolean isTwoFactorLoginEnabled() {
-        return twoFactorLoginEnabled;
-    }
-
-    /**
-     * 密码复杂度 是否开启，默认：开启
-     */
-    public boolean isPasswordComplexityEnabled() {
-        return passwordComplexityEnabled;
-    }
-
-    /**
-     * 定期修改密码不允许相同次数，默认：3次以内密码不能相同
-     */
-    public int getRegularChangePasswordNotAllowRepeatTimes() {
-        return regularChangePasswordNotAllowRepeatTimes;
-    }
-
     @PostConstruct
     void init() {
         String configValue = configService.getConfigValue(ConfigKeyEnum.LEVEL3_PROTECT_CONFIG);