xinyin025/smart-admin
1
0
Fork 0
mirror of https://gitee.com/lab1024/smart-admin.git synced 2025-09-23 13:56:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Compare commits

base: xinyin025:master
Branches Tags
xinyin025:master
xinyin025:feature/1.x
xinyin025:v3.28.0
xinyin025:v3.27.0
xinyin025:v3.26.0
xinyin025:v3.25.0
xinyin025:v3.24.0
xinyin025:v3.23.0
xinyin025:v3.21
xinyin025:v3.19
xinyin025:v3.18
xinyin025:v3.15
xinyin025:v3.14
xinyin025:v3.13
xinyin025:v3.12
xinyin025:v3.11.0
xinyin025:v3.10.1
xinyin025:v3.10.0
xinyin025:v3.9.0
xinyin025:v3.7.0
xinyin025:v3.6.0
xinyin025:v3.5.0
xinyin025:v3.4.0
xinyin025:v3.3.0
xinyin025:v3.2.0
xinyin025:v3.1.0
xinyin025:v3.0.0
xinyin025:v3.0.1
xinyin025:v2.0.0
xinyin025:v1.12.0
xinyin025:v1.11.0
xinyin025:v1.10.0
xinyin025:v1.0.9
xinyin025:v1.0.8
..
compare: xinyin025:v3.21
Branches Tags
xinyin025:master
xinyin025:feature/1.x
xinyin025:v3.28.0
xinyin025:v3.27.0
xinyin025:v3.26.0
xinyin025:v3.25.0
xinyin025:v3.24.0
xinyin025:v3.23.0
xinyin025:v3.21
xinyin025:v3.19
xinyin025:v3.18
xinyin025:v3.15
xinyin025:v3.14
xinyin025:v3.13
xinyin025:v3.12
xinyin025:v3.11.0
xinyin025:v3.10.1
xinyin025:v3.10.0
xinyin025:v3.9.0
xinyin025:v3.7.0
xinyin025:v3.6.0
xinyin025:v3.5.0
xinyin025:v3.4.0
xinyin025:v3.3.0
xinyin025:v3.2.0
xinyin025:v3.1.0
xinyin025:v3.0.0
xinyin025:v3.0.1
xinyin025:v2.0.0
xinyin025:v1.12.0
xinyin025:v1.11.0
xinyin025:v1.10.0
xinyin025:v1.0.9
xinyin025:v1.0.8

No commits in common. "master" and "v3.21" have entirely different histories.
master ... v3.21

325 changed files with 2470 additions and 5060 deletions
Show Stats Expand all files Collapse all files

6
README.md
View File

@ -4,16 +4,14 @@
**<font color="#DC143C">国内首个满足《网络安全-三级等保》、《数据安全》</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">JavaScript和TypeScript双版本</font>**，后端提供 **<font color="#DC143C">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)

163
smart-admin-api-java17-springboot3/pom.xml
View File

@ -16,49 +16,55 @@
</modules>
<properties>
<java.version>17</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<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>
<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>
<p6spy.version>3.9.1</p6spy.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>
<knife4j.version>4.4.0</knife4j.version>
<fastjson.version>2.0.52</fastjson.version>
<druid.version>1.2.23</druid.version>
<google-linkedhashmap.version>1.4.2</google-linkedhashmap.version>
<google-guava.version>20.0</google-guava.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>
<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>
<velocity-tools.version>3.1</velocity-tools.version>
<sa-token.version>1.44.0</sa-token.version>
<sa-token.version>1.41.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.50.0</redisson.version>
<snakeyaml.version>2.4</snakeyaml.version>
<freemarker.version>2.3.34</freemarker.version>
<jsoup.version>1.21.1</jsoup.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>
<tika.version>3.1.0</tika.version>
<httpcomponents.version>5.5</httpcomponents.version>
</properties>
<dependencyManagement>
<dependencies>
<!--SpringBoot BOM begin-->
<!--BOM begin-->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
@ -66,16 +72,19 @@
<type>pom</type>
<scope>import</scope>
</dependency>
<!--SpringBoot BOM end-->
<!--mybatis-plus BOM begin-->
<!--BOM end-->
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-bom</artifactId>
<artifactId>mybatis-plus-spring-boot3-starter</artifactId>
<version>${mybatis-plus.version}</version>
<type>pom</type>
<scope>import</scope>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
<!--mybatis-plus BOM end-->
<dependency>
<groupId>org.springframework.security</groupId>
@ -83,12 +92,6 @@
<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>
@ -96,7 +99,7 @@
</dependency>
<dependency>
<groupId>com.github.xingfudeshi</groupId>
<groupId>com.github.xiaoymin</groupId>
<artifactId>knife4j-openapi3-jakarta-spring-boot-starter</artifactId>
<version>${knife4j.version}</version>
</dependency>
@ -107,6 +110,7 @@
<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>
@ -125,6 +129,12 @@
<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>
@ -168,9 +178,9 @@
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>s3</artifactId>
<version>${awssdk-s3.version}</version>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-s3</artifactId>
<version>${aws-java-sdk.version}</version>
<exclusions>
<exclusion>
<artifactId>commons-logging</artifactId>
@ -190,6 +200,19 @@
<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>
@ -216,7 +239,6 @@
<artifactId>sa-token-redis-jackson</artifactId>
<version>${sa-token.version}</version>
</dependency>
<!-- sa-token end -->
<!--ip 地址-->
@ -241,10 +263,6 @@
<artifactId>logback-classic</artifactId>
<groupId>ch.qos.logback</groupId>
</exclusion>
<exclusion>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
</exclusion>
</exclusions>
</dependency>
@ -254,6 +272,12 @@
<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>
@ -262,8 +286,20 @@
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml-full</artifactId>
<version>${poi.version}</version>
<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>
</dependency>
<dependency>
@ -277,25 +313,6 @@
<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>
@ -322,12 +339,6 @@
<version>${tika.version}</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents.client5</groupId>
<artifactId>httpclient5</artifactId>
<version>${httpcomponents.version}</version>
</dependency>
</dependencies>
</dependencyManagement>

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

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

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

@ -1,4 +1,4 @@
package net.lab1024.sa.admin.module.business.oa.enterprise.controller;
package net.lab1024.sa.admin.module.business.oa.enterprise;
import cn.dev33.satoken.annotation.SaCheckPermission;
import io.swagger.v3.oas.annotations.Operation;
@ -8,7 +8,6 @@ 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;

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

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

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

@ -1,4 +1,4 @@
package net.lab1024.sa.admin.module.business.oa.enterprise.service;
package net.lab1024.sa.admin.module.business.oa.enterprise;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.google.common.collect.Lists;
@ -13,7 +13,6 @@ 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;

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

@ -3,7 +3,7 @@ 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.service.EnterpriseService;
import net.lab1024.sa.admin.module.business.oa.enterprise.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.*;

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

@ -36,7 +36,7 @@ public class DepartmentEntity {
/**
* 负责人员工 id
*/
@TableField(updateStrategy = FieldStrategy.NEVER)
@TableField(updateStrategy = FieldStrategy.IGNORED)
private Long managerId;
/**

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

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

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

@ -138,20 +138,16 @@ 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 randomPassword = securityPasswordService.randomPassword();
String generateSaltPassword = this.generateSaltPassword(randomPassword, employeeUid);
entity.setLoginPwd(SecurityPasswordService.getEncryptPwd(generateSaltPassword));
// 设置密码 默认密码
String password = securityPasswordService.randomPassword();
entity.setLoginPwd(SecurityPasswordService.getEncryptPwd(password));
// 保存数据
entity.setDeletedFlag(Boolean.FALSE);
employeeManager.saveEmployee(entity, employeeAddForm.getRoleIdList());
return ResponseDTO.ok(randomPassword);
return ResponseDTO.ok(password);
}
/**
@ -245,6 +241,7 @@ public class EmployeeService {
/**
* 更新登录人头像
*
*/
public ResponseDTO<String> updateAvatar(EmployeeUpdateAvatarForm employeeUpdateAvatarForm) {
Long employeeId = employeeUpdateAvatarForm.getEmployeeId();
@ -346,12 +343,12 @@ public class EmployeeService {
}
// 校验原始密码
if (!SecurityPasswordService.matchesPwd(this.generateSaltPassword(updatePasswordForm.getOldPassword(), employeeEntity.getEmployeeUid()), employeeEntity.getLoginPwd())) {
if (!SecurityPasswordService.matchesPwd(updatePasswordForm.getOldPassword(),employeeEntity.getLoginPwd()) ) {
return ResponseDTO.userErrorParam("原密码有误，请重新输入");
}
// 新旧密码相同
if (Objects.equals(updatePasswordForm.getOldPassword(), updatePasswordForm.getNewPassword())) {
if (Objects.equals(updatePasswordForm.getOldPassword(), updatePasswordForm.getNewPassword()) ){
return ResponseDTO.userErrorParam("新密码与原始密码相同，请重新输入");
}
@ -362,13 +359,14 @@ public class EmployeeService {
}
// 根据三级等保规则，校验密码是否重复
ResponseDTO<String> passwordRepeatTimes = securityPasswordService.validatePasswordRepeatTimes(requestUser, this.generateSaltPassword(updatePasswordForm.getNewPassword(), employeeEntity.getEmployeeUid()));
ResponseDTO<String> passwordRepeatTimes = securityPasswordService.validatePasswordRepeatTimes(requestUser, updatePasswordForm.getNewPassword());
if (!passwordRepeatTimes.getOk()) {
return ResponseDTO.error(passwordRepeatTimes);
}
// 更新密码
String newEncryptPassword = SecurityPasswordService.getEncryptPwd(this.generateSaltPassword(updatePasswordForm.getNewPassword(), employeeEntity.getEmployeeUid()));
String newEncryptPassword = SecurityPasswordService.getEncryptPwd(updatePasswordForm.getNewPassword());
EmployeeEntity updateEntity = new EmployeeEntity();
updateEntity.setEmployeeId(employeeId);
updateEntity.setLoginPwd(newEncryptPassword);
@ -407,14 +405,8 @@ 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();
String saltPassword = this.generateSaltPassword(password, employeeEntity.getEmployeeUid());
employeeDao.updatePassword(employeeId, SecurityPasswordService.getEncryptPwd(saltPassword));
employeeDao.updatePassword(employeeId, SecurityPasswordService.getEncryptPwd(password));
return ResponseDTO.ok(password);
}
@ -434,14 +426,4 @@ 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();
}
}

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

@ -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());

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

@ -153,19 +153,8 @@ public class LoginManager {
}
/**
* 清除用户权限
*/
@CacheEvict(value = AdminCacheConst.Login.USER_PERMISSION)
public void clearUserPermission(Long employeeId) {
}
/**
* 清除用户登录信息
*/
@CacheEvict(value = AdminCacheConst.Login.REQUEST_EMPLOYEE)
public void clearUserLoginInfo(Long employeeId) {
@CacheEvict(value = {AdminCacheConst.Login.USER_PERMISSION, AdminCacheConst.Login.REQUEST_EMPLOYEE}, allEntries = true)
public void clear(){
}

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

@ -9,6 +9,7 @@ import cn.hutool.extra.servlet.JakartaServletUtil;
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletRequest;
import lombok.extern.slf4j.Slf4j;
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;
@ -37,6 +38,7 @@ 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;
@ -77,6 +79,9 @@ public class LoginService implements StpInterface {
@Resource
private EmployeeService employeeService;
@Resource
private DepartmentService departmentService;
@Resource
private CaptchaService captchaService;
@ -98,6 +103,9 @@ public class LoginService implements StpInterface {
@Resource
private SecurityPasswordService protectPasswordService;
@Resource
private IFileStorageService fileStorageService;
@Resource
private ApiEncryptService apiEncryptService;
@ -121,7 +129,7 @@ public class LoginService implements StpInterface {
}
/**
* 员工登录
* 员工登陆
*
* @return 返回用户登录信息
*/
@ -185,7 +193,7 @@ public class LoginService implements StpInterface {
}
// 密码错误
if (!SecurityPasswordService.matchesPwd(employeeService.generateSaltPassword(requestPassword, employeeEntity.getEmployeeUid()), employeeEntity.getLoginPwd())) {
if (!SecurityPasswordService.matchesPwd(requestPassword, employeeEntity.getLoginPwd())) {
// 记录登录失败
saveLoginLog(employeeEntity, ip, userAgent, "密码错误", LoginLogResultEnum.LOGIN_FAIL, loginDeviceEnum);
// 记录等级保护次数
@ -262,7 +270,7 @@ public class LoginService implements StpInterface {
/**
* 根据登录token 获取员请求工信息
* 根据登陆token 获取员请求工信息
*/
public RequestEmployee getLoginEmployee(String loginId, HttpServletRequest request) {
if (loginId == null) {
@ -317,8 +325,8 @@ public class LoginService implements StpInterface {
// sa token 登出
StpUtil.logout();
// 清除用户登录信息缓存和权限信息
this.clearLoginEmployeeCache(requestUser.getUserId());
// 清空登录信息缓存
loginManager.clear();
//保存登出日志
LoginLogEntity loginEntity = LoginLogEntity.builder()
@ -474,7 +482,6 @@ public class LoginService implements StpInterface {
}
public void clearLoginEmployeeCache(Long employeeId) {
loginManager.clearUserPermission(employeeId);
loginManager.clearUserLoginInfo(employeeId);
loginManager.clear();
}
}

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

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

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

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

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

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

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

@ -22,6 +22,7 @@ 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;

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

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

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

@ -5,12 +5,12 @@
-->
<Configuration status="INFO" monitorInterval="30">
<Properties>
<Property name="log-directory" value="${spring:project.log-directory}"/>
<Property name="log-directory" value="${sys:project.log-directory}"/>
</Properties>
<Appenders>
<Console name="Console" target="SYSTEM_OUT">
<ThresholdFilter level="info" onMatch="ACCEPT" onMismatch="DENY"/>
<PatternLayout pattern="[%d][%-5p][%t][%c{1.}:%L] %m %n"/>
<PatternLayout pattern="[%d][%-5p][%t] %m (%F:%L)%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][%c{1.}:%L] %m %n"/>
<PatternLayout pattern="[%d][%-5p][%t] %m (%F:%L)%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][%c{1.}:%L] %m %n"/>
<PatternLayout pattern="[%d][%-5p][%t] %m (%F:%L)%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][%c{1.}:%L] %m %n"/>
<PatternLayout pattern="[%d][%-5p][%t] %m (%F:%L)%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][%c{1.}:%L] %m %n"/>
<PatternLayout pattern="[%d][%-5p][%t] %m (%F:%L)%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][%c{1.}:%L] %m %n"/>
<PatternLayout pattern="[%d][%-5p][%t] %m (%F:%L)%n"/>
<Policies>
<TimeBasedTriggeringPolicy interval="1" modulate="true"/>
<SizeBasedTriggeringPolicy size="50 MB"/>

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

@ -5,12 +5,12 @@
-->
<Configuration status="INFO" monitorInterval="30">
<Properties>
<Property name="log-directory" value="${spring:project.log-directory}"/>
<Property name="log-directory" value="${sys:project.log-directory}"/>
</Properties>
<Appenders>
<Console name="Console" target="SYSTEM_OUT">
<ThresholdFilter level="info" onMatch="ACCEPT" onMismatch="DENY"/>
<PatternLayout pattern="[%d][%-5p][%t][%c{1.}:%L] %m %n"/>
<PatternLayout pattern="[%d][%-5p][%t] %m (%F:%L)%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][%c{1.}:%L] %m %n"/>
<PatternLayout pattern="[%d][%-5p][%t] %m (%F:%L)%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][%c{1.}:%L] %m %n"/>
<PatternLayout pattern="[%d][%-5p][%t] %m (%F:%L)%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][%c{1.}:%L] %m %n"/>
<PatternLayout pattern="[%d][%-5p][%t] %m (%F:%L)%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][%c{1.}:%L] %m %n"/>
<PatternLayout pattern="[%d][%-5p][%t] %m (%F:%L)%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][%c{1.}:%L] %m %n"/>
<PatternLayout pattern="[%d][%-5p][%t] %m (%F:%L)%n"/>
<Policies>
<TimeBasedTriggeringPolicy interval="1" modulate="true"/>
<SizeBasedTriggeringPolicy size="50 MB"/>

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

@ -5,12 +5,12 @@
-->
<Configuration status="INFO" monitorInterval="30">
<Properties>
<Property name="log-directory" value="${spring:project.log-directory}"/>
<Property name="log-directory" value="${sys:project.log-directory}"/>
</Properties>
<Appenders>
<Console name="Console" target="SYSTEM_OUT">
<ThresholdFilter level="info" onMatch="ACCEPT" onMismatch="DENY"/>
<PatternLayout pattern="[%d][%-5p][%t][%c{1.}:%L] %m %n"/>
<PatternLayout pattern="[%d][%-5p][%t] %m (%F:%L)%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][%c{1.}:%L] %m %n"/>
<PatternLayout pattern="[%d][%-5p][%t] %m (%F:%L)%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][%c{1.}:%L] %m %n"/>
<PatternLayout pattern="[%d][%-5p][%t] %m (%F:%L)%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][%c{1.}:%L] %m %n"/>
<PatternLayout pattern="[%d][%-5p][%t] %m (%F:%L)%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][%c{1.}:%L] %m %n"/>
<PatternLayout pattern="[%d][%-5p][%t] %m (%F:%L)%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][%c{1.}:%L] %m %n"/>
<PatternLayout pattern="[%d][%-5p][%t] %m (%F:%L)%n"/>
<Policies>
<TimeBasedTriggeringPolicy interval="1" modulate="true"/>
<SizeBasedTriggeringPolicy size="50 MB"/>

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

@ -64,6 +64,7 @@
<groupId>cn.dev33</groupId>
<artifactId>sa-token-redis-jackson</artifactId>
</dependency>
<!-- sa-token end -->
<dependency>
@ -117,25 +118,19 @@
<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.xingfudeshi</groupId>
<groupId>com.github.xiaoymin</groupId>
<artifactId>knife4j-openapi3-jakarta-spring-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents.client5</groupId>
<artifactId>httpclient5</artifactId>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
</dependency>
<dependency>
@ -164,11 +159,10 @@
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>s3</artifactId>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-s3</artifactId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
@ -193,6 +187,16 @@
<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>
@ -216,6 +220,12 @@
<dependency>
<groupId>cn.idev.excel</groupId>
<artifactId>fastexcel</artifactId>
<exclusions>
<exclusion>
<artifactId>logback-classic</artifactId>
<groupId>ch.qos.logback</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
@ -223,6 +233,11 @@
<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>
@ -230,7 +245,12 @@
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml-full</artifactId>
<artifactId>ooxml-schemas</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
</dependency>
<dependency>

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

@ -20,25 +20,17 @@ 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;
}
// 如果超出了 JavaScript 安全整数范围，则序列化为字符串
if (value < JS_MIN_SAFE_INTEGER || value > JS_MAX_SAFE_INTEGER) {
gen.writeString(Long.toString(value));
// js中最大安全整数16位 Number.MAX_SAFE_INTEGER
String longStr = String.valueOf(value);
if (longStr.length() > 16) {
gen.writeString(longStr);
} else {
// 否则，序列化为数字
gen.writeNumber(value);
}
}

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

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

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

@ -18,9 +18,6 @@ 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);
}

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

@ -1,23 +1,20 @@
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 {
@ -25,46 +22,26 @@ public class CacheConfig {
private static final String REDIS_CACHE = "redis";
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 CacheManager cacheManager() {
// 使用非阻塞模式的缓存写入器，适用于大多数高并发场景
RedisCacheWriter redisCacheWriter = RedisCacheWriter.nonLockingRedisCacheWriter(redisConnectionFactory);
// 构建默认缓存配置
RedisCacheConfiguration defaultCacheConfig = RedisCacheConfiguration.defaultCacheConfig()
// 禁止缓存 null 值，避免缓存穿透
public RedisCacheConfiguration redisCacheConfiguration() {
return RedisCacheConfiguration.defaultCacheConfig()
.disableCachingNullValues()
.computePrefixWith(name -> "cache:" + name + ":")
// 使用 FastJSON 序列化缓存值，支持复杂对象
.serializeValuesWith(RedisSerializationContext.SerializationPair
.fromSerializer(new GenericFastJsonRedisSerializer()));
// 返回自定义缓存管理器，支持 cacheName#ttl 格式与永久缓存（#-1）
return new CustomRedisCacheManager(redisCacheWriter, defaultCacheConfig);
// .serializeValuesWith(RedisSerializationContext.SerializationPair.fromSerializer(new GenericFastJsonRedisSerializer()));
;
}
@Bean
@ConditionalOnProperty(prefix = "spring.cache", name = {"type"}, havingValue = REDIS_CACHE)
public CacheService redisCacheService() {
return new RedisCacheServiceImpl();
}
@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();
}
@Bean
@ConditionalOnProperty(prefix = "spring.cache", name = {"type"}, havingValue = CAFFEINE_CACHE)
public CacheService caffeineCacheService() {
return new CaffeineCacheServiceImpl();
}
}

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

@ -1,5 +1,12 @@
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;
@ -10,13 +17,6 @@ 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,10 +31,6 @@ import java.net.URI;
@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";
@ -73,17 +69,15 @@ public class FileConfig implements WebMvcConfigurer {
*/
@Bean
@ConditionalOnProperty(prefix = "file.storage", name = {"mode"}, havingValue = MODE_CLOUD)
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())
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)
.build();
}

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

@ -2,7 +2,6 @@ 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;
@ -14,8 +13,6 @@ 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;
@ -40,9 +37,6 @@ 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);
};
}

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

@ -1,14 +1,13 @@
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.RedisTemplate;
import org.springframework.data.redis.core.ValueOperations;
/**
* 重复提交配置
@ -23,22 +22,22 @@ import org.springframework.data.redis.core.RedisTemplate;
public class RepeatSubmitConfig {
@Resource
private RedisTemplate<String, Object> redisTemplate;
private ValueOperations<String, String> valueOperations;
@Bean
public RepeatSubmitAspect repeatSubmitAspect() {
RepeatSubmitRedisTicket ticket = new RepeatSubmitRedisTicket(redisTemplate, this::ticket);
return new RepeatSubmitAspect(ticket);
RepeatSubmitRedisTicket caffeineTicket = new RepeatSubmitRedisTicket(valueOperations, this::ticket);
return new RepeatSubmitAspect(caffeineTicket);
}
/**
* 获取指明某个用户的凭证
*/
private String ticket(HttpServletRequest request) {
private String ticket(String servletPath) {
Long userId = SmartRequestUtil.getRequestUserId();
if (null == userId) {
return StringConst.EMPTY;
}
return request.getServletPath() + "_" + userId;
return servletPath + "_" + userId;
}
}

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

@ -1,92 +0,0 @@
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;
}
}

130
smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/config/RestTemplateConfig.java Normal file
View File

@ -0,0 +1,130 @@
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;
}
}

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

@ -12,7 +12,6 @@ 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;
@ -25,8 +24,6 @@ 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;
@ -83,21 +80,6 @@ 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()
@ -140,11 +122,11 @@ public class SwaggerConfig {
Optional<JavadocProvider> javadocProvider) {
List<ServerBaseUrlCustomizer> list = Lists.newArrayList(new ServerBaseUrlCustomizer() {
@Override
public String customize(String serverBaseUrl, HttpRequest request) {
public String customize(String baseUrl) {
if (StringUtils.isNotBlank(serverBaseUrl)) {
return serverBaseUrl;
}
return serverBaseUrl;
return baseUrl;
}
});
return new OpenAPIService(openAPI, securityParser, springDocConfigProperties,

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

@ -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,6 +18,7 @@ import org.springframework.stereotype.Service;
import java.awt.*;
import java.util.Objects;
import java.util.UUID;
/**
* 图形验证码 服务
@ -69,7 +70,7 @@ public class CaptchaService {
* 图片 base64格式
*/
// uuid 唯一标识
String uuid = IdUtil.fastSimpleUUID();
String uuid = UUID.randomUUID().toString().replace("-", StringConst.EMPTY);
CaptchaVO captchaVO = new CaptchaVO();
captchaVO.setCaptchaUuid(uuid);

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

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

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

@ -40,12 +40,6 @@ 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;
@ -63,13 +57,7 @@ public class CodeGeneratorService {
* @return
*/
public List<TableColumnVO> getTableColumns(String 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;
return codeGeneratorDao.selectTableColumn(tableName);
}
@ -162,7 +150,7 @@ public class CodeGeneratorService {
}
// 校验表必须有主键
if (tableColumns.stream().noneMatch(e -> COLUMN_PRIMARY_KEY.equalsIgnoreCase(e.getColumnKey()))) {
if(!tableColumns.stream().filter( e -> "PRI".equalsIgnoreCase(e.getColumnKey())).findAny().isPresent()){
return ResponseDTO.userErrorParam("表必须有主键，请联系后端查看下数据库表结构");
}
@ -211,7 +199,6 @@ public class CodeGeneratorService {
/**
* 下载代码
*
* @param tableName
* @return
*/

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

@ -4,7 +4,6 @@ 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;
@ -34,11 +33,9 @@ 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.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.*;
import java.util.stream.Collectors;
/**
@ -78,15 +75,10 @@ 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 = IdUtil.fastSimpleUUID();
String uuid = UUID.randomUUID().toString();
File dir = new File(uuid);
// 1、生产文件

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

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

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

@ -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 = DictDataDeserializer.class)");
finalFieldMap.put("dict", "\n @JsonDeserialize(using = DictValueVoDeserializer.class)");
packageList.add("import com.fasterxml.jackson.databind.annotation.JsonDeserialize;");
packageList.add("import net.lab1024.sa.base.common.json.deserializer.DictDataDeserializer;");
packageList.add("import net.lab1024.sa.base.common.json.deserializer.DictValueVoDeserializer;");
}
finalFieldMap.put("javaType", "String");
default:

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

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

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

@ -46,7 +46,7 @@ public class ListVariableService extends CodeGenerateBaseVariableService {
CodeField codeField = getCodeFieldByColumnName(queryField.getColumnNameList().get(0), form);
if (CodeQueryFieldQueryTypeEnum.ENUM.equalsValue(queryField.getQueryTypeEnum()) && SmartStringUtil.isNotBlank(codeField.getEnumName())) {
if (CodeQueryFieldQueryTypeEnum.ENUM.equalsValue(queryField.getQueryTypeEnum())) {
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';");

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

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

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

@ -3,7 +3,6 @@ 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;
/**
@ -15,7 +14,7 @@ import java.time.LocalDateTime;
*/
@Data
public class DictDataVO implements Serializable {
public class DictDataVO {
@Schema(description = "字典数据id")
private Long dictDataId;
@ -26,12 +25,6 @@ public class DictDataVO implements Serializable {
@Schema(description = "字典编码")
private String dictCode;
@Schema(description = "字典名字")
private String dictName;
@Schema(description = "字典禁用状态")
private Boolean dictDisabledFlag;
@Schema(description = "字典项值")
private String dataValue;

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

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

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

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

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

@ -2,7 +2,10 @@ package net.lab1024.sa.base.module.support.file.service;
import cn.hutool.core.date.DatePattern;
import cn.hutool.core.date.LocalDateTimeUtil;
import cn.hutool.core.util.IdUtil;
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 jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import net.lab1024.sa.base.common.code.SystemErrorCode;
@ -19,27 +22,21 @@ 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;
/**
* 云计算 实现
@ -48,7 +45,7 @@ import java.util.Map;
* @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 {
@ -69,7 +66,7 @@ public class FileStorageCloudServiceImpl implements IFileStorageService {
private static final String USER_METADATA_FILE_SIZE = "file-size";
@Resource
private S3Client s3Client;
private AmazonS3 amazonS3;
@Resource
private FileConfig cloudConfig;
@ -89,47 +86,44 @@ public class FileStorageCloudServiceImpl implements IFileStorageService {
}
String fileType = FilenameUtils.getExtension(originalFileName);
String uuid = IdUtil.fastSimpleUUID();
String uuid = UUID.randomUUID().toString().replaceAll("-", "");
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;
urlEncoderFilename = URLEncoder.encode(originalFileName, StandardCharsets.UTF_8);
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);
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()));
// 根据文件路径获取并设置访问权限
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;
meta.setUserMetadata(userMetadata);
meta.setContentLength(file.getSize());
meta.setContentType(this.getContentType(fileType));
try {
inputStream = file.getInputStream();
s3Client.putObject(putObjectRequest, RequestBody.fromInputStream(inputStream, file.getSize()));
amazonS3.putObject(cloudConfig.getBucketName(), fileKey, file.getInputStream(), meta);
} 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 (ObjectCannedACL.PRIVATE.equals(acl)) {
if (CannedAccessControlList.Private.equals(acl)) {
// 获取临时访问的URL
url = this.getFileUrl(fileKey).getData();
}
@ -142,8 +136,8 @@ public class FileStorageCloudServiceImpl implements IFileStorageService {
/**
* 获取文件url
*
* @param fileKey 文件key
* @return url
* @param fileKey
* @return
*/
@Override
public ResponseDTO<String> getFileUrl(String fileKey) {
@ -165,14 +159,10 @@ 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();
S3Presigner presigner = S3Presigner.builder().region(Region.of(cloudConfig.getRegion())).build();
PresignedGetObjectRequest presignedGetObjectRequest = presigner.presignGetObject(getObjectPresignRequest);
String url = presignedGetObjectRequest.url().toString();
fileVO.setFileUrl(url);
Date expiration = new Date(System.currentTimeMillis() + cloudConfig.getPrivateUrlExpireSeconds() * 1000L);
URL url = amazonS3.generatePresignedUrl(cloudConfig.getBucketName(), fileKey, expiration);
fileVO.setFileUrl(url.toString());
redisService.set(fileRedisKey, fileVO, cloudConfig.getPrivateUrlExpireSeconds() - 5);
}
@ -185,11 +175,11 @@ public class FileStorageCloudServiceImpl implements IFileStorageService {
*/
@Override
public ResponseDTO<FileDownloadVO> download(String key) {
//获取oss对象
S3Object s3Object = amazonS3.getObject(cloudConfig.getBucketName(), key);
// 获取文件 meta
HeadObjectRequest objectRequest = HeadObjectRequest.builder().bucket(this.cloudConfig.getBucketName()).key(key).build();
HeadObjectResponse headObjectResponse = s3Client.headObject(objectRequest);
Map<String, String> userMetadata = headObjectResponse.metadata();
ObjectMetadata metadata = s3Object.getObjectMetadata();
Map<String, String> userMetadata = metadata.getUserMetadata();
FileMetadataVO metadataDTO = null;
if (MapUtils.isNotEmpty(userMetadata)) {
metadataDTO = new FileMetadataVO();
@ -200,31 +190,43 @@ public class FileStorageCloudServiceImpl implements IFileStorageService {
metadataDTO.setFileSize(fileSize);
}
//获取oss对象
GetObjectRequest getObjectRequest = GetObjectRequest.builder().bucket(cloudConfig.getBucketName()).key(key).build();
ResponseBytes<GetObjectResponse> s3ClientObject = s3Client.getObject(getObjectRequest, ResponseTransformer.toBytes());
// 获得输入流
InputStream objectContent = s3Object.getObjectContent();
try {
// 输入流转换为字节流
byte[] buffer = FileCopyUtils.copyToByteArray(objectContent);
// 输入流转换为字节流
byte[] buffer = s3ClientObject.asByteArray();
FileDownloadVO fileDownloadVO = new FileDownloadVO();
fileDownloadVO.setData(buffer);
fileDownloadVO.setMetadata(metadataDTO);
return ResponseDTO.ok(fileDownloadVO);
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);
}
}
}
/**
* 根据文件夹路径 返回对应的访问权限
*
* @param fileKey 文件key
* @return 权限
* @param fileKey
* @return
*/
private ObjectCannedACL getACL(String fileKey) {
private CannedAccessControlList getACL(String fileKey) {
// 公用读
if (fileKey.contains(FileFolderTypeEnum.FOLDER_PUBLIC)) {
return ObjectCannedACL.PUBLIC_READ;
return CannedAccessControlList.PublicRead;
}
// 其他默认私有读写
return ObjectCannedACL.PRIVATE;
return CannedAccessControlList.Private;
}
/**
@ -233,11 +235,11 @@ public class FileStorageCloudServiceImpl implements IFileStorageService {
* ps：不能删除fileKey不为空的文件夹
*
* @param fileKey 文件or文件夹
* @return
*/
@Override
public ResponseDTO<String> delete(String fileKey) {
DeleteObjectRequest deleteObjectRequest = DeleteObjectRequest.builder().bucket(cloudConfig.getBucketName()).key(fileKey).build();
s3Client.deleteObject(deleteObjectRequest);
amazonS3.deleteObject(cloudConfig.getBucketName(), fileKey);
return ResponseDTO.ok();
}

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

@ -1,7 +1,7 @@
package net.lab1024.sa.base.module.support.mail;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.lang.UUID;
import freemarker.cache.StringTemplateLoader;
import freemarker.template.Configuration;
import freemarker.template.Template;
@ -19,6 +19,7 @@ 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;
@ -162,7 +163,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 = IdUtil.fastSimpleUUID();
String templateName = UUID.fastUUID().toString(true);
stringLoader.putTemplate(templateName, htmlTemplate);
configuration.setTemplateLoader(stringLoader);
try {

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

@ -11,7 +11,6 @@ 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;
@ -47,7 +46,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
@ -72,14 +71,14 @@ public abstract class OperateLogAspect {
public void logPointCut() {
}
@AfterReturning(pointcut = "logPointCut()", returning = "responseDTO")
public void doAfterReturning(JoinPoint joinPoint, Object responseDTO) {
handleLog(joinPoint, null, responseDTO);
@AfterReturning(pointcut = "logPointCut()")
public void doAfterReturning(JoinPoint joinPoint) {
handleLog(joinPoint, null);
}
@AfterThrowing(value = "logPointCut()", throwing = "e")
public void doAfterThrowing(JoinPoint joinPoint, Exception e) {
handleLog(joinPoint, e, null);
handleLog(joinPoint, e);
}
/**
@ -110,15 +109,16 @@ public abstract class OperateLogAspect {
taskExecutor.setWaitForTasksToCompleteOnShutdown(true);
}
protected void handleLog(final JoinPoint joinPoint, final Exception e, Object responseDTO) {
protected void handleLog(final JoinPoint joinPoint, final Exception e) {
try {
OperateLog operateLog = this.getAnnotationLog(joinPoint);
if (operateLog == null) {
return;
}
this.submitLog(joinPoint, e, responseDTO);
this.submitLog(joinPoint, e);
} catch (Exception exp) {
log.error("保存操作日志异常:{}", exp.getMessage());
exp.printStackTrace();
}
}
@ -173,8 +173,11 @@ public abstract class OperateLogAspect {
/**
* 提交存储操作日志
*
* @param joinPoint
* @param e
* @throws Exception
*/
private void submitLog(final JoinPoint joinPoint, final Throwable e, Object responseDTO) {
private void submitLog(final JoinPoint joinPoint, final Throwable e) throws Exception {
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
//设置用户信息
RequestUser user = SmartRequestUtil.getRequestUser();
@ -188,7 +191,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);
@ -207,32 +210,15 @@ 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);
});

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

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

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

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

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

@ -1,145 +0,0 @@
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;
}
}
}

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

@ -1,6 +1,5 @@
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;
@ -17,19 +16,10 @@ import org.springframework.web.context.request.ServletRequestAttributes;
import java.lang.reflect.Method;
/**
* 重复提交 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>
* 重复提交 aop切口
*
* @Author 1024创新实验室-主任: 卓大
* @Date 2025-07-26 23:56:58
* @Author 1024创新实验室: 胡克
* @Date 2020-11-25 20:56:58
* @Wechat zhuoda1024
* @Email lab1024@163.com
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
@ -53,46 +43,36 @@ 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();
if (attributes == null) {
return point.proceed();
}
/**
* 第一步：生成防重复提交的 ticket凭证
* ticket 是根据 Request对象 自定义 生成的，可以加入请求user相关属性作为生成要素
*/
HttpServletRequest request = attributes.getRequest();
String ticket = this.repeatSubmitTicket.generateTicket(request);
String ticketToken = attributes.getRequest().getServletPath();
String ticket = this.repeatSubmitTicket.getTicket(ticketToken);
if (StringUtils.isEmpty(ticket)) {
return point.proceed();
}
Method method = ((MethodSignature) point.getSignature()).getMethod();
RepeatSubmit annotation = method.getAnnotation(RepeatSubmit.class);
Long intervalMilliSecond = (long) annotation.intervalMilliSecond();
int limit = annotation.value();
/**
* 第二步：根据 ticket 凭证进行 加锁
* 能加锁，则可以执行
* 若不能加锁，则证明还是时间间隔interval中
*/
boolean lockSuccessFlag = this.repeatSubmitTicket.tryLock(ticket, System.currentTimeMillis(), intervalMilliSecond);
if (!lockSuccessFlag) {
// 获取上一次请求时间
Long lastRequestTime = this.repeatSubmitTicket.getTicketTimestamp(ticket);
// 校验是否限制时间内重复提交
if (lastRequestTime != null && System.currentTimeMillis() < lastRequestTime + limit) {
return ResponseDTO.error(UserErrorCode.REPEAT_SUBMIT);
}
// 执行
Object obj = null;
try {
return point.proceed();
// 给 ticket 设置在执行中
this.repeatSubmitTicket.putTicket(ticket);
// 执行
obj = point.proceed();
} catch (Throwable throwable) {
log.error(throwable.getMessage(), throwable);
log.error("", throwable);
throw throwable;
} finally {
this.repeatSubmitTicket.unLock(ticket, intervalMilliSecond);
}
return obj;
}
}

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

@ -7,19 +7,10 @@ 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 2025-07-26 20:56:58
* @Author 1024创新实验室: 胡克
* @Date 2020-11-25 20:56:58
* @Wechat zhuoda1024
* @Email lab1024@163.com
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
@ -29,8 +20,8 @@ import java.lang.annotation.Target;
public @interface RepeatSubmit {
/**
* 间隔时间/毫秒
* 重复提交间隔时间/毫秒
*/
int intervalMilliSecond() default 0;
int value() default 300;
}

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

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

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

@ -0,0 +1,44 @@
package net.lab1024.sa.base.module.support.repeatsubmit.ticket;
import com.github.benmanes.caffeine.cache.Cache;
import com.github.benmanes.caffeine.cache.Caffeine;
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());
}
}

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

@ -1,60 +0,0 @@
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);
}
}

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

@ -1,47 +1,38 @@
package net.lab1024.sa.base.module.support.repeatsubmit.ticket;
import jakarta.servlet.http.HttpServletRequest;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.data.redis.core.ValueOperations;
import java.util.concurrent.TimeUnit;
import java.util.function.Function;
/**
* 凭证（redis实现）
*
* @Author 1024创新实验室-主任: 卓大
* @Date 2025-07-26 23:56:58
* @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 RepeatSubmitRedisTicket extends AbstractRepeatSubmitTicket {
private final RedisTemplate<String, Object> redisTemplate;
private final ValueOperations<String, String> redisValueOperations;
public RepeatSubmitRedisTicket(RedisTemplate<String, Object> redisTemplate,
Function<HttpServletRequest, String> ticketFunction) {
public RepeatSubmitRedisTicket(ValueOperations<String, String> redisValueOperations,
Function<String, String> ticketFunction) {
super(ticketFunction);
this.redisTemplate = redisTemplate;
this.redisValueOperations = redisValueOperations;
}
@Override
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)));
}
public Long getTicketTimestamp(String ticket) {
String ticketLastTime = redisValueOperations.get(ticket);
return ticketLastTime == null ? null : Long.valueOf(ticketLastTime);
}
@Override
public void unLock(String ticket, Long intervalMilliSecond) {
if (intervalMilliSecond > 0) {
return;
}
redisTemplate.delete(ticket);
public void putTicket(String ticket) {
redisValueOperations.getOperations().delete(ticket);
this.getTicketTimestamp(ticket);
}
}

33
smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/service/SecurityFileService.java
View File

@ -3,7 +3,6 @@ package net.lab1024.sa.base.module.support.securityprotect.service;
import lombok.extern.slf4j.Slf4j;
import jakarta.annotation.Resource;
import net.lab1024.sa.base.common.domain.ResponseDTO;
import org.apache.commons.io.IOUtils;
import org.apache.tika.config.TikaConfig;
import org.apache.tika.exception.TikaException;
import org.apache.tika.io.TikaInputStream;
@ -15,7 +14,6 @@ import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
import java.io.InputStream;
import java.util.Arrays;
import java.util.List;
@ -37,9 +35,27 @@ public class SecurityFileService {
private Level3ProtectConfigService level3ProtectConfigService;
// 定义白名单MIME类型
private static final List<String> ALLOWED_MIME_TYPES = Arrays.asList("application/json", "application/zip", "application/x-7z-compressed", "application/pdf", "application/vnd.ms-excel", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", "application/vnd.ms-powerpoint", "application/vnd.openxmlformats-officedocument.presentationml.presentation", "application/msword", "application/vnd.openxmlformats-officedocument.wordprocessingml.document", "application/vnd.ms-works", "text/csv", "audio/*", "video/*",
private static final List<String> ALLOWED_MIME_TYPES = Arrays.asList(
"application/json",
"application/zip",
"application/x-7z-compressed",
"application/pdf",
"application/vnd.ms-excel",
"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
"application/vnd.ms-powerpoint",
"application/vnd.openxmlformats-officedocument.presentationml.presentation",
"application/msword",
"application/vnd.openxmlformats-officedocument.wordprocessingml.document",
"application/vnd.ms-works",
"text/csv",
"audio/*",
"video/*",
// 图片类型 svg有安全隐患，所以不使用"image/*"
"image/jpeg", "image/png", "image/gif", "image/bmp");
"image/jpeg",
"image/png",
"image/gif",
"image/bmp"
);
/**
* 检测文件安全类型
@ -57,7 +73,8 @@ public class SecurityFileService {
// 文件类型安全检测
if (level3ProtectConfigService.isFileDetectFlag()) {
String fileType = getFileMimeType(file);
if (ALLOWED_MIME_TYPES.stream().noneMatch(allowedType -> matchesMimeType(fileType, allowedType))) {
if (ALLOWED_MIME_TYPES.stream()
.noneMatch(allowedType -> matchesMimeType(fileType, allowedType))) {
return ResponseDTO.userErrorParam("禁止上传此文件类型");
}
}
@ -72,20 +89,16 @@ public class SecurityFileService {
* @return 文件的 MIME 类型
*/
public static String getFileMimeType(MultipartFile file) {
InputStream inputStream = null;
try {
inputStream = file.getInputStream();
TikaConfig tika = new TikaConfig();
Metadata metadata = new Metadata();
metadata.set(TikaCoreProperties.RESOURCE_NAME_KEY, file.getOriginalFilename());
TikaInputStream stream = TikaInputStream.get(inputStream);
TikaInputStream stream = TikaInputStream.get(file.getInputStream());
MediaType mimetype = tika.getDetector().detect(stream, metadata);
return mimetype.toString();
} catch (IOException | TikaException e) {
log.error(e.getMessage(), e);
return MimeTypes.OCTET_STREAM;
} finally {
IOUtils.closeQuietly(inputStream);
}
}

4
smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/service/SerialNumberBaseService.java
View File

@ -27,7 +27,7 @@ import java.util.concurrent.ConcurrentHashMap;
* @Date 2022-03-25 21:46:07
* @Wechat zhuoda1024
* @Email lab1024@163.com
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
*/
public abstract class SerialNumberBaseService implements SerialNumberService {
@ -37,7 +37,7 @@ public abstract class SerialNumberBaseService implements SerialNumberService {
@Resource
protected SerialNumberDao serialNumberDao;
protected ConcurrentHashMap<Integer, SerialNumberInfoBO> serialNumberMap = new ConcurrentHashMap<>();
private ConcurrentHashMap<Integer, SerialNumberInfoBO> serialNumberMap = new ConcurrentHashMap<>();
public abstract List<String> generateSerialNumberList(SerialNumberInfoBO serialNumber, int count);

157
smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/service/impl/SerialNumberRedisService.java
View File

@ -1,34 +1,23 @@
package net.lab1024.sa.base.module.support.serialnumber.service.impl;
import cn.hutool.core.util.RandomUtil;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import net.lab1024.sa.base.common.util.SmartDateFormatterEnum;
import net.lab1024.sa.base.common.util.SmartEnumUtil;
import net.lab1024.sa.base.common.util.SmartLocalDateUtil;
import net.lab1024.sa.base.common.util.SmartStringUtil;
import net.lab1024.sa.base.common.exception.BusinessException;
import net.lab1024.sa.base.constant.RedisKeyConst;
import net.lab1024.sa.base.module.support.redis.RedisService;
import net.lab1024.sa.base.module.support.serialnumber.constant.SerialNumberRuleTypeEnum;
import net.lab1024.sa.base.module.support.serialnumber.domain.SerialNumberEntity;
import net.lab1024.sa.base.module.support.serialnumber.domain.SerialNumberGenerateResultBO;
import net.lab1024.sa.base.module.support.serialnumber.domain.SerialNumberInfoBO;
import net.lab1024.sa.base.module.support.serialnumber.domain.SerialNumberLastGenerateBO;
import net.lab1024.sa.base.module.support.serialnumber.service.SerialNumberBaseService;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Service;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
/**
* 单据序列号 基于redis key-value increase 实现
* 单据序列号 基于redis锁实现
*
* @Author 1024创新实验室-主任: 卓大
* @Date 2025-08-03 22:46:07
* @Date 2022-03-25 21:46:07
* @Wechat zhuoda1024
* @Email lab1024@163.com
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
@ -36,11 +25,12 @@ import java.util.List;
@Slf4j
public class SerialNumberRedisService extends SerialNumberBaseService {
@Resource
private RedisService redisService;
private static final int MAX_GET_LOCK_COUNT = 5;
private static final long SLEEP_MILLISECONDS = 200L;
@Resource
private RedisTemplate redisTemplate;
private RedisService redisService;
@Override
public void initLastGenerateData(List<SerialNumberEntity> serialNumberEntityList) {
@ -48,116 +38,73 @@ public class SerialNumberRedisService extends SerialNumberBaseService {
return;
}
// 设置redis的上次值
//删除之前的
redisService.delete(RedisKeyConst.Support.SERIAL_NUMBER_LAST_INFO);
for (SerialNumberEntity serialNumberEntity : serialNumberEntityList) {
if (serialNumberEntity.getLastTime() == null) {
continue;
}
SerialNumberLastGenerateBO lastGenerateBO = SerialNumberLastGenerateBO
.builder()
.serialNumberId(serialNumberEntity.getSerialNumberId())
.lastNumber(serialNumberEntity.getLastNumber())
.lastTime(serialNumberEntity.getLastTime())
.build();
String redisKey = generateRedisKeyByDate(serialNumberEntity.getSerialNumberId(),
SmartEnumUtil.getEnumByName(serialNumberEntity.getRuleType().toUpperCase(), SerialNumberRuleTypeEnum.class),
serialNumberEntity.getLastTime().toLocalDate());
Object o = redisTemplate.opsForValue().get(redisKey);
if (o == null) {
redisTemplate.opsForValue().set(redisKey, serialNumberEntity.getLastNumber());
}
}
}
/**
* 每天凌晨一点进行检测；
* 检测单位数量为3; 3天前、3月前、3年前
*/
@Scheduled(cron = "0 0 1 * * ?")
public void tryDeleteUnusedRedisKey() {
for (SerialNumberInfoBO serialNumberInfoBO : serialNumberMap.values()) {
SerialNumberRuleTypeEnum typeEnum = serialNumberInfoBO.getSerialNumberRuleTypeEnum();
String dateStr = "";
switch (typeEnum) {
case DAY -> {
dateStr = SmartLocalDateUtil.format(LocalDate.now().minusDays(3), SmartDateFormatterEnum.YMD);
}
case MONTH -> {
dateStr = SmartLocalDateUtil.format(LocalDate.now().minusMonths(3), SmartDateFormatterEnum.YM);
}
case YEAR -> {
dateStr = String.valueOf(LocalDate.now().minusYears(3));
}
}
if (SmartStringUtil.isNotEmpty(dateStr)) {
String redisKey = RedisKeyConst.Support.SERIAL_NUMBER + serialNumberInfoBO.getSerialNumberId() + ":" + dateStr;
redisService.delete(redisKey);
}
redisService.mset(RedisKeyConst.Support.SERIAL_NUMBER_LAST_INFO,
String.valueOf(serialNumberEntity.getSerialNumberId()),
lastGenerateBO
);
}
}
@Override
public List<String> generateSerialNumberList(SerialNumberInfoBO serialNumberInfo, int count) {
// 根据步长，计算 redis 增加值
ArrayList<Integer> list = new ArrayList<>(count);
int redisIncrease = 0;
for (int i = 0; i < count; i++) {
int stepIncrease = 1;
Integer stepRandomRange = serialNumberInfo.getStepRandomRange();
if (stepRandomRange > 1) {
stepIncrease = RandomUtil.getSecureRandom().nextInt(1, serialNumberInfo.getStepRandomRange() + 1);
SerialNumberGenerateResultBO serialNumberGenerateResult = null;
String lockKey = RedisKeyConst.Support.SERIAL_NUMBER + serialNumberInfo.getSerialNumberId();
boolean lock = false;
for (int i = 0; i < MAX_GET_LOCK_COUNT; i++) {
try {
lock = redisService.getLock(lockKey, 60 * 1000L);
if (lock) {
break;
}
Thread.sleep(SLEEP_MILLISECONDS);
} catch (Throwable e) {
log.error(e.getMessage(), e);
}
redisIncrease += stepIncrease;
list.add(stepIncrease);
}
if (!lock) {
throw new BusinessException("SerialNumber 尝试5次，未能生成单号");
}
try {
String redisKey = generateRedisKeyByDate(serialNumberInfo.getSerialNumberId(), serialNumberInfo.getSerialNumberRuleTypeEnum(), LocalDate.now());
Long increaseResult = redisTemplate.opsForValue().increment(redisKey, redisIncrease);
ArrayList<Long> numberList = new ArrayList<>(count);
Long number = increaseResult;
for (Integer i : list) {
number = number - i;
numberList.add((number + 1));
}
Collections.reverse(numberList);
SerialNumberGenerateResultBO serialNumberGenerateResult = SerialNumberGenerateResultBO
.builder()
.serialNumberId(serialNumberInfo.getSerialNumberId())
.lastNumber(increaseResult)
.lastTime(LocalDateTime.now())
.numberList(numberList)
.isReset(false)
.build();
// 获取上次的生成结果
SerialNumberLastGenerateBO lastGenerateBO = (SerialNumberLastGenerateBO) redisService.mget(
RedisKeyConst.Support.SERIAL_NUMBER_LAST_INFO,
String.valueOf(serialNumberInfo.getSerialNumberId()));
// 生成
serialNumberGenerateResult = super.loopNumberList(lastGenerateBO, serialNumberInfo, count);
// 将生成信息保存的内存和数据库
lastGenerateBO.setLastNumber(serialNumberGenerateResult.getLastNumber());
lastGenerateBO.setLastTime(serialNumberGenerateResult.getLastTime());
serialNumberDao.updateLastNumberAndTime(serialNumberInfo.getSerialNumberId(),
serialNumberGenerateResult.getLastNumber(),
serialNumberGenerateResult.getLastTime());
redisService.mset(RedisKeyConst.Support.SERIAL_NUMBER_LAST_INFO,
String.valueOf(serialNumberInfo.getSerialNumberId()), lastGenerateBO);
// 把生成过程保存到数据库里
super.saveRecord(serialNumberGenerateResult);
return formatNumberList(serialNumberGenerateResult, serialNumberInfo);
} catch (Throwable e) {
log.error(e.getMessage(), e);
throw e;
} finally {
redisService.unLock(lockKey);
}
}
private String generateRedisKeyByDate(Integer serialNumberId, SerialNumberRuleTypeEnum serialNumberRuleTypeEnum, LocalDate localDate) {
return switch (serialNumberRuleTypeEnum) {
case DAY -> {
String dayStr = SmartLocalDateUtil.format(localDate, SmartDateFormatterEnum.YMD);
yield RedisKeyConst.Support.SERIAL_NUMBER + serialNumberId + ":" + dayStr;
}
case MONTH -> {
String monthStr = SmartLocalDateUtil.format(localDate, SmartDateFormatterEnum.YM);
yield RedisKeyConst.Support.SERIAL_NUMBER + serialNumberId + ":" + monthStr;
}
case YEAR -> {
String yearStr = String.valueOf(localDate.getYear());
yield RedisKeyConst.Support.SERIAL_NUMBER + serialNumberId + ":" + yearStr;
}
case NONE -> RedisKeyConst.Support.SERIAL_NUMBER + serialNumberId;
};
return formatNumberList(serialNumberGenerateResult, serialNumberInfo);
}
}

4
smart-admin-api-java17-springboot3/sa-base/src/main/resources/code-generator-template/js/form.vue.vm
View File

@ -48,7 +48,7 @@
#end
#if($field.frontComponent == "DictSelect")
<a-form-item label="$codeGeneratorTool.removeEnumDesc($!{field.label})" name="${field.fieldName}">
<DictSelect width="100%" v-model:value="form.${field.fieldName}" :dict-code="DICT_CODE_ENUM.$!{field.dict} || '$!{field.dict}'" placeholder="$!{field.label}"/>
<DictSelect width="100%" v-model:value="form.${field.fieldName}" dict-code="DICT_CODE_ENUM.$!{field.dict} || '$!{field.dict}'" placeholder="$!{field.label}"/>
</a-form-item>
#end
#if($field.frontComponent == "Date")
@ -106,7 +106,7 @@
#end
#if($field.frontComponent == "DictSelect")
<a-form-item label="$codeGeneratorTool.removeEnumDesc($!{field.label})" name="${field.fieldName}">
<DictSelect width="100%" v-model:value="form.${field.fieldName}" :dict-code="DICT_CODE_ENUM.$!{field.dict} || '$!{field.dict}'" placeholder="$!{field.label}"/>
<DictSelect width="100%" v-model:value="form.${field.fieldName}" dict-code="DICT_CODE_ENUM.$!{field.dict} || '$!{field.dict}'" placeholder="$!{field.label}"/>
</a-form-item>
#end
#if($field.frontComponent == "Date")

2
smart-admin-api-java17-springboot3/sa-base/src/main/resources/code-generator-template/js/list.vue.vm
View File

@ -22,7 +22,7 @@
#end
#if($field.queryTypeEnum == "Dict")
<a-form-item label="${field.label}" class="smart-query-form-item">
<DictSelect :dict-code="DICT_CODE_ENUM.$!{field.dict} || '$!{field.dict}'" placeholder="${field.label}" v-model:value="queryForm.${field.fieldName}" width="${field.width}" />
<DictSelect dict-code="DICT_CODE_ENUM.$!{field.dict} || '$!{field.dict}'" placeholder="${field.label}" v-model:value="queryForm.${field.fieldName}" width="${field.width}" />
</a-form-item>
#end
#if($field.queryTypeEnum == "Enum")

78
smart-admin-api-java17-springboot3/sa-base/src/main/resources/code-generator-template/ts/api.ts.vm
View File

@ -1,78 +0,0 @@
/**
* ${basic.description} api 封装
*
* @Author: ${basic.frontAuthor}
* @Date: ${basic.frontDate}
* @Copyright ${basic.copyright}
*/
import { postRequest, getRequest } from '/@/lib/axios';
export const ${name.lowerCamel}Api = {
/**
* 分页查询 @author ${basic.frontAuthor}
*/
queryPage : (param) => {
return postRequest('/${name.lowerCamel}/queryPage', param);
},
/**
* 增加 @author ${basic.frontAuthor}
*/
add: (param) => {
return postRequest('/${name.lowerCamel}/add', param);
},
/**
* 修改 @author ${basic.frontAuthor}
*/
update: (param) => {
return postRequest('/${name.lowerCamel}/update', param);
},
## ------------------ 详情 ------------------
#if($deleteInfo.isSupportDetail)
/**
* 获取详情 @author ${basic.frontAuthor}
*/
getDetail: (id) => {
return getRequest(`/${name.lowerCamel}/getDetail/\${id}`);
},
#end
## ------------------ 删除 ------------------
#if($deleteInfo.isSupportDelete)
#if($deleteInfo.deleteEnum == 'Single')
/**
* 删除 @author ${basic.frontAuthor}
*/
delete: (id) => {
return getRequest(`/${name.lowerCamel}/delete/${id}`);
},
#end
#if($deleteInfo.deleteEnum == 'Batch')
/**
* 批量删除 @author ${basic.frontAuthor}
*/
batchDelete: (idList) => {
return postRequest('/${name.lowerCamel}/batchDelete', idList);
},
#end
#if($deleteInfo.deleteEnum == 'SingleAndBatch')
/**
* 删除 @author ${basic.frontAuthor}
*/
delete: (id) => {
return getRequest(`/${name.lowerCamel}/delete/${id}`);
},
/**
* 批量删除 @author ${basic.frontAuthor}
*/
batchDelete: (idList) => {
return postRequest('/${name.lowerCamel}/batchDelete', idList);
},
#end
#end
};

23
smart-admin-api-java17-springboot3/sa-base/src/main/resources/code-generator-template/ts/const.ts.vm
View File

@ -1,23 +0,0 @@
/**
* ${basic.description} 枚举
*
* @Author: ${basic.frontAuthor}
* @Date: ${basic.frontDate}
* @Copyright ${basic.copyright}
*/
#foreach ($enum in $enumList)
/**
* $enum.columnComment
*/
export const $enum.upperUnderscoreEnum = {
}
#end
export default {
#foreach ($enum in $enumList)
$enum.upperUnderscoreEnum,
#end
};

239
smart-admin-api-java17-springboot3/sa-base/src/main/resources/code-generator-template/ts/form.vue.vm
View File

@ -1,239 +0,0 @@
<!--
* ${basic.description}
*
* @Author: ${basic.frontAuthor}
* @Date: ${basic.frontDate}
* @Copyright ${basic.copyright}
-->
<template>
<a-$!{insertAndUpdate.pageType}
:title="form.$!{primaryKeyFieldName} ? '编辑' : '添加'"
:width="$!{insertAndUpdate.width}"
:open="visibleFlag"
#if($!{insertAndUpdate.pageType} == 'drawer')
@close="onClose"
#else
@cancel="onClose"
#end
:maskClosable="false"
:destroyOnClose="true"
>
<a-form ref="formRef" :model="form" :rules="rules" :label-col="{ span: 5 }" >
#if($insertAndUpdate.countPerLine == 1)
#foreach ($field in $formFields)
#if($field.frontComponent == "Input")
<a-form-item label="$!{field.label}" name="${field.fieldName}">
<a-input style="width: 100%" v-model:value="form.${field.fieldName}" placeholder="$!{field.label}" />
</a-form-item>
#end
#if($field.frontComponent == "InputNumber")
<a-form-item label="$!{field.label}" name="${field.fieldName}">
<a-input-number style="width: 100%" v-model:value="form.${field.fieldName}" placeholder="$!{field.label}" />
</a-form-item>
#end
#if($field.frontComponent == "Textarea")
<a-form-item label="$!{field.label}" name="${field.fieldName}">
<a-textarea style="width: 100%" v-model:value="form.${field.fieldName}" placeholder="$!{field.label}" />
</a-form-item>
#end
#if($field.frontComponent == "BooleanSelect")
<a-form-item label="$!{field.label}" name="${field.fieldName}">
<BooleanSelect v-model:value="form.${field.fieldName}" style="width: 100%" />
</a-form-item>
#end
#if($field.frontComponent == "SmartEnumSelect")
<a-form-item label="$codeGeneratorTool.removeEnumDesc($!{field.label})" name="${field.fieldName}">
<SmartEnumSelect width="100%" v-model:value="form.${field.fieldName}" enum-name="$!{field.upperUnderscoreEnum}" placeholder="$codeGeneratorTool.removeEnumDesc($!{field.label})"/>
</a-form-item>
#end
#if($field.frontComponent == "DictSelect")
<a-form-item label="$codeGeneratorTool.removeEnumDesc($!{field.label})" name="${field.fieldName}">
<DictSelect width="100%" v-model:value="form.${field.fieldName}" :dict-code="DICT_CODE_ENUM.$!{field.dict} || '$!{field.dict}'" placeholder="$!{field.label}"/>
</a-form-item>
#end
#if($field.frontComponent == "Date")
<a-form-item label="$!{field.label}" name="${field.fieldName}">
<a-date-picker valueFormat="YYYY-MM-DD" v-model:value="form.$!{field.fieldName}" style="width: 100%" placeholder="$!{field.label}"/>
</a-form-item>
#end
#if($field.frontComponent == "DateTime")
<a-form-item label="$!{field.label}" name="${field.fieldName}">
<a-date-picker show-time valueFormat="YYYY-MM-DD HH:mm:ss" v-model:value="form.$!{field.fieldName}" style="width: 100%" placeholder="$!{field.label}" />
</a-form-item>
#end
#if($field.frontComponent == "FileUpload")
<a-form-item label="$!{field.label}" name="${field.fieldName}">
<FileUpload
:defaultFileList="form.$!{field.fieldName}"
:folder="FILE_FOLDER_TYPE_ENUM.COMMON.value"
buttonText="上传 $!{field.label}"
listType="text"
@change="e => form.$!{field.fieldName} = e"
/>
</a-form-item>
#end
#end
#end
#if($insertAndUpdate.countPerLine > 1)
<a-row>
#set($span=24 / $!insertAndUpdate.countPerLine )
#foreach ($field in $formFields)
<a-col :span="$!{span}">
#if($field.frontComponent == "Input")
<a-form-item label="$!{field.label}" name="${field.fieldName}">
<a-input style="width: 100%" v-model:value="form.${field.fieldName}" placeholder="$!{field.label}" />
</a-form-item>
#end
#if($field.frontComponent == "InputNumber")
<a-form-item label="$!{field.label}" name="${field.fieldName}">
<a-input-number style="width: 100%" v-model:value="form.${field.fieldName}" placeholder="$!{field.label}" />
</a-form-item>
#end
#if($field.frontComponent == "Textarea")
<a-form-item label="$!{field.label}" name="${field.fieldName}">
<a-textarea style="width: 100%" v-model:value="form.${field.fieldName}" placeholder="$!{field.label}" />
</a-form-item>
#end
#if($field.frontComponent == "BooleanSelect")
<a-form-item label="$!{field.label}" name="${field.fieldName}">
<BooleanSelect v-model:value="form.${field.fieldName}" style="width: 100%" />
</a-form-item>
#end
#if($field.frontComponent == "SmartEnumSelect")
<a-form-item label="$codeGeneratorTool.removeEnumDesc($!{field.label})" name="${field.fieldName}">
<SmartEnumSelect width="100%" v-model:value="form.${field.fieldName}" enum-name="$!{field.upperUnderscoreEnum}" placeholder="$codeGeneratorTool.removeEnumDesc($!{field.label})"/>
</a-form-item>
#end
#if($field.frontComponent == "DictSelect")
<a-form-item label="$codeGeneratorTool.removeEnumDesc($!{field.label})" name="${field.fieldName}">
<DictSelect width="100%" v-model:value="form.${field.fieldName}" :dict-code="DICT_CODE_ENUM.$!{field.dict} || '$!{field.dict}'" placeholder="$!{field.label}"/>
</a-form-item>
#end
#if($field.frontComponent == "Date")
<a-form-item label="$!{field.label}" name="${field.fieldName}">
<a-date-picker valueFormat="YYYY-MM-DD" v-model:value="form.$!{field.fieldName}" style="width: 100%" placeholder="$!{field.label}"/>
</a-form-item>
#end
#if($field.frontComponent == "DateTime")
<a-form-item label="$!{field.label}" name="${field.fieldName}">
<a-date-picker show-time valueFormat="YYYY-MM-DD HH:mm:ss" v-model:value="form.$!{field.fieldName}" style="width: 100%" placeholder="$!{field.label}" />
</a-form-item>
#end
#if($field.frontComponent == "FileUpload")
<a-form-item label="$!{field.label}" name="${field.fieldName}">
<FileUpload
:defaultFileList="form.$!{field.fieldName}"
:folder="FILE_FOLDER_TYPE_ENUM.COMMON.value"
buttonText="上传 $!{field.label}"
listType="text"
@change="e => form.$!{field.fieldName} = e"
/>
</a-form-item>
#end
</a-col>
#end
</a-row>
#end
</a-form>
<template #footer>
<a-space>
<a-button @click="onClose">取消</a-button>
<a-button type="primary" @click="onSubmit">保存</a-button>
</a-space>
</template>
</a-$!{insertAndUpdate.pageType}>
</template>
<script setup lang="ts">
import { reactive, ref, nextTick } from 'vue';
import _ from 'lodash';
import { message } from 'ant-design-vue';
import { SmartLoading } from '/@/components/framework/smart-loading';
import { $!{name.lowerCamel}Api } from '/@/api/business/$!{name.lowerHyphenCamel}/$!{name.lowerHyphenCamel}-api';
import { smartSentry } from '/@/lib/smart-sentry';
#foreach ($import in $frontImportList)
$!{import}
#end
// ------------------------ 事件 ------------------------
const emits = defineEmits(['reloadList']);
// ------------------------ 显示与隐藏 ------------------------
// 是否显示
const visibleFlag = ref(false);
function show(rowData) {
Object.assign(form, formDefault);
if (rowData && !_.isEmpty(rowData)) {
Object.assign(form, rowData);
}
// 使用字典时把下面这注释修改成自己的字典字段 有多个字典字段就复制多份同理修改 不然打开表单时不显示字典初始值
// if (form.status && form.status.length > 0) {
// form.status = form.status.map((e) => e.valueCode);
// }
visibleFlag.value = true;
nextTick(() => {
formRef.value.clearValidate();
});
}
function onClose() {
Object.assign(form, formDefault);
visibleFlag.value = false;
}
// ------------------------ 表单 ------------------------
// 组件ref
const formRef = ref();
const formDefault = {
#foreach ($field in $formFields)
$!{field.fieldName}: undefined, //$!{field.label}
#end
};
let form = reactive({ ...formDefault });
const rules = {
#foreach ($field in $formFields)
#if($field.requiredFlag)
$!{field.fieldName}: [{ required: true, message: '$!{field.label} 必填' }],
#end
#end
};
// 点击确定，验证表单
async function onSubmit() {
try {
await formRef.value.validateFields();
save();
} catch (err) {
message.error('参数验证错误，请仔细填写表单数据!');
}
}
// 新建、编辑API
async function save() {
SmartLoading.show();
try {
if (form.$!{primaryKeyFieldName}) {
await $!{name.lowerCamel}Api.update(form);
} else {
await $!{name.lowerCamel}Api.add(form);
}
message.success('操作成功');
emits('reloadList');
onClose();
} catch (err) {
smartSentry.captureError(err);
} finally {
SmartLoading.hide();
}
}
defineExpose({
show,
});
</script>

348
smart-admin-api-java17-springboot3/sa-base/src/main/resources/code-generator-template/ts/list.vue.vm
View File

@ -1,348 +0,0 @@
<!--
* ${basic.description}
*
* @Author: ${basic.frontAuthor}
* @Date: ${basic.frontDate}
* @Copyright ${basic.copyright}
-->
<template>
<!---------- 查询表单form begin ----------->
<a-form class="smart-query-form">
<a-row class="smart-query-form-row">
#foreach ($field in $queryFields)
#if($field.queryTypeEnum == "Like")
<a-form-item label="${field.label}" class="smart-query-form-item">
<a-input style="width: ${field.width}" v-model:value="queryForm.${field.fieldName}" placeholder="${field.label}" />
</a-form-item>
#end
#if($field.queryTypeEnum == "Equal")
<a-form-item label="${field.label}" class="smart-query-form-item">
<a-input style="width: ${field.width}" v-model:value="queryForm.${field.fieldName}" placeholder="${field.label}" />
</a-form-item>
#end
#if($field.queryTypeEnum == "Dict")
<a-form-item label="${field.label}" class="smart-query-form-item">
<DictSelect :dict-code="DICT_CODE_ENUM.$!{field.dict} || '$!{field.dict}'" placeholder="${field.label}" v-model:value="queryForm.${field.fieldName}" width="${field.width}" />
</a-form-item>
#end
#if($field.queryTypeEnum == "Enum")
<a-form-item label="$codeGeneratorTool.removeEnumDesc(${field.label})" class="smart-query-form-item">
<SmartEnumSelect width="${field.width}" v-model:value="queryForm.${field.fieldName}" enum-name="$!{field.frontEnumName}" placeholder="$codeGeneratorTool.removeEnumDesc(${field.label})"/>
</a-form-item>
#end
#if($field.queryTypeEnum == "Date")
<a-form-item label="${field.label}" class="smart-query-form-item">
<a-date-picker valueFormat="YYYY-MM-DD" v-model:value="queryForm.$!{field.fieldName}" style="width: ${field.width}" />
</a-form-item>
#end
#if($field.queryTypeEnum == "DateRange")
<a-form-item label="${field.label}" class="smart-query-form-item">
<a-range-picker v-model:value="queryForm.$!{field.fieldName}" :presets="defaultTimeRanges" style="width: ${field.width}" @change="onChange$codeGeneratorTool.lowerCamel2UpperCamel(${field.fieldName})" />
</a-form-item>
#end
#end
<a-form-item class="smart-query-form-item">
<a-button type="primary" @click="onSearch">
<template #icon>
<SearchOutlined />
</template>
查询
</a-button>
<a-button @click="resetQuery" class="smart-margin-left10">
<template #icon>
<ReloadOutlined />
</template>
重置
</a-button>
</a-form-item>
</a-row>
</a-form>
<!---------- 查询表单form end ----------->
<a-card size="small" :bordered="false" :hoverable="true">
<!---------- 表格操作行 begin ----------->
<a-row class="smart-table-btn-block">
<div class="smart-table-operate-block">
#if($insertAndUpdate.isSupportInsertAndUpdate)
<a-button @click="showForm" type="primary" size="small">
<template #icon>
<PlusOutlined />
</template>
新建
</a-button>
#end
#if($deleteInfo.isSupportDelete && ($deleteInfo.deleteEnum == "Batch"||$deleteInfo.deleteEnum == "SingleAndBatch"))
<a-button @click="confirmBatchDelete" type="primary" danger size="small" :disabled="selectedRowKeyList.length == 0">
<template #icon>
<DeleteOutlined />
</template>
批量删除
</a-button>
#end
</div>
<div class="smart-table-setting-block">
<TableOperator v-model="columns" :tableId="null" :refresh="queryData" />
</div>
</a-row>
<!---------- 表格操作行 end ----------->
<!---------- 表格 begin ----------->
<a-table
size="small"
:scroll="{ y: 800 }"
:dataSource="tableData"
:columns="columns"
rowKey="$!{primaryKeyFieldName}"
bordered
:loading="tableLoading"
:pagination="false"
#if($deleteInfo.isSupportDelete && ($deleteInfo.deleteEnum == "Batch"||$deleteInfo.deleteEnum == "SingleAndBatch"))
:row-selection="{ selectedRowKeys: selectedRowKeyList, onChange: onSelectChange }"
#end
>
<template #bodyCell="{ text, record, column }">
#foreach ($field in $listFields)
#if($field.frontComponent == "FileUpload")
<template v-if="column.dataIndex === '$field.fieldName'">
<FilePreview :file-list="text" type="picture" />
</template>
#end
#end
#foreach ($field in $listFields)
#if($field.frontEnumPlugin)
<template v-if="column.dataIndex === '$!{field.fieldName}'">
<span>{{ $!{field.frontEnumPlugin} }}</span>
</template>
#end
#end
#foreach ($field in $listFields)
#if($field.dict)
<template v-if="column.dataIndex === '$!{field.fieldName}'">
<DictLabel :dict-code="DICT_CODE_ENUM.$!{field.dict} || '$!{field.dict}'" :data-value="text" />
</template>
#end
#end
<template v-if="column.dataIndex === 'action'">
<div class="smart-table-operate">
#if($insertAndUpdate.isSupportInsertAndUpdate)
<a-button @click="showForm(record)" type="link">编辑</a-button>
#end
#if($deleteInfo.isSupportDelete && ($deleteInfo.deleteEnum == "Single"||$deleteInfo.deleteEnum == "SingleAndBatch"))
<a-button @click="onDelete(record)" danger type="link">删除</a-button>
#end
</div>
</template>
</template>
</a-table>
<!---------- 表格 end ----------->
<div class="smart-query-table-page">
<a-pagination
showSizeChanger
showQuickJumper
show-less-items
:pageSizeOptions="PAGE_SIZE_OPTIONS"
:defaultPageSize="queryForm.pageSize"
v-model:current="queryForm.pageNum"
v-model:pageSize="queryForm.pageSize"
:total="total"
@change="queryData"
@showSizeChange="queryData"
:show-total="(total) => `共${total}条`"
/>
</div>
<$!{name.upperCamel}Form ref="formRef" @reloadList="queryData"/>
</a-card>
</template>
<script setup lang="ts">
import { reactive, ref, onMounted } from 'vue';
import { message, Modal } from 'ant-design-vue';
import { SmartLoading } from '/@/components/framework/smart-loading';
import { $!{name.lowerCamel}Api } from '/@/api/business/$!{name.lowerHyphenCamel}/$!{name.lowerHyphenCamel}-api';
import { PAGE_SIZE_OPTIONS } from '/@/constants/common-const';
import { smartSentry } from '/@/lib/smart-sentry';
import TableOperator from '/@/components/support/table-operator/index.vue';
#foreach ($import in $frontImportList)
$!{import}
#end
// ---------------------------- 表格列 ----------------------------
const columns = ref([
#foreach ($field in $tableFields)
#if($field.showFlag)
{
title: '$!{field.label}',
dataIndex: '$!{field.fieldName}',
ellipsis: $!{field.ellipsisFlag},
#if(${field.width} > 0)
width: $!{field.width},
#end
},
#end
#end
#if($insertAndUpdate.isSupportInsertAndUpdate || $insertAndUpdate.isSupportInsertAndUpdate)
{
title: '操作',
dataIndex: 'action',
fixed: 'right',
width: 90,
},
#end
]);
// ---------------------------- 查询数据表单和方法 ----------------------------
const queryFormState = {
#foreach ($field in $queryFields)
#if($field.queryTypeEnum == "DateRange")
$!{field.fieldName}: [], //$!{field.label}
$!{field.fieldName}Begin: undefined, //$!{field.label} 开始
$!{field.fieldName}End: undefined, //$!{field.label} 结束
#end
#if($field.queryTypeEnum != "DateRange")
$!{field.fieldName}: undefined, //$!{field.label}
#end
#end
pageNum: 1,
pageSize: 10,
};
// 查询表单form
const queryForm = reactive({ ...queryFormState });
// 表格加载loading
const tableLoading = ref(false);
// 表格数据
const tableData = ref([]);
// 总数
const total = ref(0);
// 重置查询条件
function resetQuery() {
let pageSize = queryForm.pageSize;
Object.assign(queryForm, queryFormState);
queryForm.pageSize = pageSize;
queryData();
}
// 搜索
function onSearch(){
queryForm.pageNum = 1;
queryData();
}
// 查询数据
async function queryData() {
tableLoading.value = true;
try {
let queryResult = await $!{name.lowerCamel}Api.queryPage(queryForm);
tableData.value = queryResult.data.list;
total.value = queryResult.data.total;
} catch (e) {
smartSentry.captureError(e);
} finally {
tableLoading.value = false;
}
}
#foreach ($field in $queryFields)
#if($field.queryTypeEnum == "DateRange")
function onChange$codeGeneratorTool.lowerCamel2UpperCamel(${field.fieldName})(dates, dateStrings){
queryForm.$!{field.fieldName}Begin = dateStrings[0];
queryForm.$!{field.fieldName}End = dateStrings[1];
}
#end
#end
onMounted(queryData);
#if($insertAndUpdate.isSupportInsertAndUpdate)
// ---------------------------- 添加/修改 ----------------------------
const formRef = ref();
function showForm(data) {
formRef.value.show(data);
}
#end
#if($deleteInfo.isSupportDelete)
#if($deleteInfo.deleteEnum == "Batch" || $deleteInfo.deleteEnum == "SingleAndBatch")
// ---------------------------- 单个删除 ----------------------------
//确认删除
function onDelete(data){
Modal.confirm({
title: '提示',
content: '确定要删除选吗?',
okText: '删除',
okType: 'danger',
onOk() {
requestDelete(data);
},
cancelText: '取消',
onCancel() {},
});
}
//请求删除
async function requestDelete(data){
SmartLoading.show();
try {
let deleteForm = {
goodsIdList: selectedRowKeyList.value,
};
await $!{name.lowerCamel}Api.delete(data.$!{primaryKeyFieldName});
message.success('删除成功');
queryData();
} catch (e) {
smartSentry.captureError(e);
} finally {
SmartLoading.hide();
}
}
#end
#if($deleteInfo.deleteEnum == "Single" || $deleteInfo.deleteEnum == "SingleAndBatch")
// ---------------------------- 批量删除 ----------------------------
// 选择表格行
const selectedRowKeyList = ref([]);
function onSelectChange(selectedRowKeys) {
selectedRowKeyList.value = selectedRowKeys;
}
// 批量删除
function confirmBatchDelete() {
Modal.confirm({
title: '提示',
content: '确定要批量删除这些数据吗?',
okText: '删除',
okType: 'danger',
onOk() {
requestBatchDelete();
},
cancelText: '取消',
onCancel() {},
});
}
//请求批量删除
async function requestBatchDelete() {
try {
SmartLoading.show();
await $!{name.lowerCamel}Api.batchDelete(selectedRowKeyList.value);
message.success('删除成功');
queryData();
} catch (e) {
smartSentry.captureError(e);
} finally {
SmartLoading.hide();
}
}
#end
#end
</script>

18
smart-admin-api-java17-springboot3/sa-base/src/main/resources/dev/sa-base.yaml
View File

@ -65,26 +65,10 @@ spring:
date-format: yyyy-MM-dd HH:mm:ss
time-zone: GMT+8
# 上传文件和请求大小
servlet:
multipart:
max-file-size: 20MB # 单个文件的最大大小
max-request-size: 10MB # 整个请求的最大大小
# 缓存实现类型
cache:
type: redis
# 健康检查
management:
endpoints:
web:
exposure:
include: health,info
health:
mail:
enabled: false
# tomcat 配置，主要用于 配置 访问日志（便于将来排查错误）
server:
tomcat:
@ -126,7 +110,7 @@ knife4j:
username: api # Basic认证用户名
password: 1024 # Basic认证密码
# RestTemplate 请求配置 毫秒
# RestTemplate 请求配置
http:
pool:
max-total: 20

2
smart-admin-api-java17-springboot3/sa-base/src/main/resources/mapper/support/CodeGeneratorMapper.xml
View File

@ -21,6 +21,8 @@
select
`tables`.table_name,
`tables`.table_comment,
`tables`.create_time,
`tables`.update_time,
t_code_generator_config.update_time configTime
from information_schema.tables `tables`
left join t_code_generator_config on `tables`.table_name = t_code_generator_config.table_name

4
smart-admin-api-java17-springboot3/sa-base/src/main/resources/mapper/support/DictDataMapper.xml
View File

@ -12,9 +12,7 @@
<select id="getAll" resultType="net.lab1024.sa.base.module.support.dict.domain.vo.DictDataVO">
select t_dict_data.*,
t_dict.dict_code,
t_dict.dict_name,
t_dict.disabled_flag dictDisabledFlag
t_dict.dict_code
from t_dict_data
left join t_dict on t_dict_data.dict_id = t_dict.dict_id
order by t_dict_data.sort_order desc

2
smart-admin-api-java17-springboot3/sa-base/src/main/resources/mapper/support/OperateLogMapper.xml
View File

@ -26,7 +26,7 @@
AND (INSTR(module,#{query.keywords}) OR INSTR(content,#{query.keywords}))
</if>
<if test="query.requestKeywords != null and query.requestKeywords != ''">
AND (INSTR(url,#{query.requestKeywords}) OR INSTR(method,#{query.requestKeywords}) OR INSTR(param,#{query.requestKeywords}) OR INSTR(response,#{query.requestKeywords}))
AND (INSTR(url,#{query.requestKeywords}) OR INSTR(method,#{query.requestKeywords}) OR INSTR(param,#{query.requestKeywords}))
</if>
<if test="query.successFlag != null">
AND success_flag = #{query.successFlag}

20
smart-admin-api-java17-springboot3/sa-base/src/main/resources/pre/sa-base.yaml
View File

@ -65,26 +65,10 @@ spring:
date-format: yyyy-MM-dd HH:mm:ss
time-zone: GMT+8
# 上传文件和请求大小
servlet:
multipart:
max-file-size: 20MB # 单个文件的最大大小
max-request-size: 10MB # 整个请求的最大大小
# 缓存实现类型
cache:
type: redis
# 健康检查
management:
endpoints:
web:
exposure:
include: health,info
health:
mail:
enabled: false
# tomcat 配置，主要用于 配置 访问日志（便于将来排查错误）
server:
tomcat:
@ -126,7 +110,7 @@ knife4j:
username: api # Basic认证用户名
password: 1024 # Basic认证密码
# RestTemplate 请求配置 毫秒
# RestTemplate 请求配置
http:
pool:
max-total: 20
@ -184,4 +168,4 @@ smart:
# 数据库配置检测-开关 默认开启 可选（作用是固定间隔读取数据库配置更新任务，关闭后只能重启服务或通过接口修改定时任务，建议开启）
db-refresh-enabled: true
# 数据库配置检测-执行间隔 默认120秒 可选
db-refresh-interval: 60
db-refresh-interval: 60

25
smart-admin-api-java17-springboot3/sa-base/src/main/resources/prod/sa-base.yaml
View File

@ -7,14 +7,14 @@ spring:
driver-class-name: com.mysql.cj.jdbc.Driver
initial-size: 10
min-idle: 10
max-active: 200
max-active: 100
max-wait: 60000
time-between-eviction-runs-millis: 60000
min-evictable-idle-time-millis: 300000
filters: stat
druid:
username: druid
password: 1024
password: 1024lab
login:
enabled: false
method:
@ -34,6 +34,7 @@ spring:
min-idle: 10
max-idle: 50
max-wait: 30000ms
# 邮件，置以SSL的方式发送, 这个需要使用这种方式并且端口是465
mail:
host: smtp.163.com
@ -64,26 +65,10 @@ spring:
date-format: yyyy-MM-dd HH:mm:ss
time-zone: GMT+8
# 上传文件和请求大小
servlet:
multipart:
max-file-size: 20MB # 单个文件的最大大小
max-request-size: 10MB # 整个请求的最大大小
# 缓存实现类型
cache:
type: redis
# 健康检查
management:
endpoints:
web:
exposure:
include: health,info
health:
mail:
enabled: false
# tomcat 配置，主要用于 配置 访问日志（便于将来排查错误）
server:
tomcat:
@ -110,13 +95,13 @@ file:
url-prefix: https://${file.storage.cloud.bucket-name}.${file.storage.cloud.endpoint}/
private-url-expire-seconds: 3600
# open api配置
springdoc:
swagger-ui:
enabled: true # 开关
doc-expansion: none #关闭展开
tags-sorter: alpha
server-base-url:
api-docs:
enabled: true # 开关
knife4j:
@ -126,7 +111,7 @@ knife4j:
username: api # Basic认证用户名
password: 1024 # Basic认证密码
# RestTemplate 请求配置 毫秒
# RestTemplate 请求配置
http:
pool:
max-total: 100

20
smart-admin-api-java17-springboot3/sa-base/src/main/resources/test/sa-base.yaml
View File

@ -65,26 +65,10 @@ spring:
date-format: yyyy-MM-dd HH:mm:ss
time-zone: GMT+8
# 上传文件和请求大小
servlet:
multipart:
max-file-size: 20MB # 单个文件的最大大小
max-request-size: 10MB # 整个请求的最大大小
# 缓存实现类型
cache:
type: redis
# 健康检查
management:
endpoints:
web:
exposure:
include: health,info
health:
mail:
enabled: false
# tomcat 配置，主要用于 配置 访问日志（便于将来排查错误）
server:
tomcat:
@ -126,7 +110,7 @@ knife4j:
username: api # Basic认证用户名
password: 1024 # Basic认证密码
# RestTemplate 请求配置 毫秒
# RestTemplate 请求配置
http:
pool:
max-total: 20
@ -184,4 +168,4 @@ smart:
# 数据库配置检测-开关 默认开启 可选（作用是固定间隔读取数据库配置更新任务，关闭后只能重启服务或通过接口修改定时任务，建议开启）
db-refresh-enabled: true
# 数据库配置检测-执行间隔 默认120秒 可选
db-refresh-interval: 60
db-refresh-interval: 60

122
smart-admin-api-java8-springboot2/pom.xml
View File

@ -22,43 +22,51 @@
<springboot.version>2.7.18</springboot.version>
<spring-mock.version>2.0.8</spring-mock.version>
<spring-security-crypto.version>5.8.16</spring-security-crypto.version>
<mybatis-plus.version>3.5.12</mybatis-plus.version>
<mysql-connector-j.version>9.3.0</mysql-connector-j.version>
<mybatis-plus.version>3.5.2</mybatis-plus.version>
<mysql-connector-j.version>8.0.33</mysql-connector-j.version>
<p6spy.version>3.9.1</p6spy.version>
<springdoc-openapi-ui.version>1.7.0</springdoc-openapi-ui.version>
<knife4j.version>4.5.0</knife4j.version>
<fastjson.version>2.0.57</fastjson.version>
<druid.version>1.2.25</druid.version>
<knife4j.version>4.3.0</knife4j.version>
<fastjson.version>2.0.16</fastjson.version>
<druid.version>1.2.14</druid.version>
<google-linkedhashmap.version>1.4.2</google-linkedhashmap.version>
<google-guava.version>20.0</google-guava.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>
<hutool.version>5.8.39</hutool.version>
<velocity-engine-core.version>2.4.1</velocity-engine-core.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.7.22</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>
<velocity-tools.version>3.1</velocity-tools.version>
<sa-token.version>1.44.0</sa-token.version>
<sa-token.version>1.41.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.4</snakeyaml.version>
<freemarker.version>2.3.34</freemarker.version>
<jsoup.version>1.21.1</jsoup.version>
<tika.version>2.9.4</tika.version>
<snakeyaml.version>2.2</snakeyaml.version>
<freemarker.version>2.3.33</freemarker.version>
<jsoup.version>1.18.1</jsoup.version>
<tika.version>2.9.3</tika.version>
</properties>
<dependencyManagement>
<dependencies>
<!--SpringBoot BOM begin-->
<!--BOM begin-->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
@ -66,16 +74,7 @@
<type>pom</type>
<scope>import</scope>
</dependency>
<!--SpringBoot BOM end-->
<!--mybatis-plus BOM begin-->
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-bom</artifactId>
<version>${mybatis-plus.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<!--mybatis-plus BOM end-->
<!--BOM end-->
<dependency>
<groupId>org.springframework</groupId>
@ -101,6 +100,18 @@
<version>${mysql-connector-j.version}</version>
</dependency>
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId>
<version>${mybatis-plus.version}</version>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>p6spy</groupId>
<artifactId>p6spy</artifactId>
@ -143,6 +154,12 @@
<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>
@ -186,9 +203,9 @@
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>s3</artifactId>
<version>${awssdk-s3.version}</version>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-s3</artifactId>
<version>${aws-java-sdk.version}</version>
<exclusions>
<exclusion>
<artifactId>commons-logging</artifactId>
@ -208,6 +225,19 @@
<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>
@ -259,10 +289,6 @@
<artifactId>logback-classic</artifactId>
<groupId>ch.qos.logback</groupId>
</exclusion>
<exclusion>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
</exclusion>
</exclusions>
</dependency>
@ -286,8 +312,20 @@
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml-full</artifactId>
<version>${poi.version}</version>
<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>
</dependency>
<dependency>

15
smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/interceptor/AdminInterceptor.java
View File

@ -4,6 +4,7 @@ import cn.dev33.satoken.annotation.SaIgnore;
import cn.dev33.satoken.exception.SaTokenException;
import cn.dev33.satoken.stp.StpUtil;
import cn.dev33.satoken.strategy.SaAnnotationStrategy;
import cn.dev33.satoken.strategy.SaStrategy;
import lombok.extern.slf4j.Slf4j;
import net.lab1024.sa.admin.module.system.login.domain.RequestEmployee;
import net.lab1024.sa.admin.module.system.login.service.LoginService;
@ -67,8 +68,7 @@ public class AdminInterceptor implements HandlerInterceptor {
Method method = ((HandlerMethod) handler).getMethod();
NoNeedLogin noNeedLogin = ((HandlerMethod) handler).getMethodAnnotation(NoNeedLogin.class);
if (noNeedLogin != null) {
updateActiveTimeout(requestEmployee);
SmartRequestUtil.setRequestUser(requestEmployee);
checkActiveTimeout(requestEmployee);
return true;
}
@ -77,8 +77,8 @@ public class AdminInterceptor implements HandlerInterceptor {
return false;
}
// 更新活跃
updateActiveTimeout(requestEmployee);
// 检测token 活跃频率
checkActiveTimeout(requestEmployee);
// --------------- 第三步： 校验 权限 ---------------
@ -123,12 +123,15 @@ public class AdminInterceptor implements HandlerInterceptor {
/**
* 更新活跃时间
* 检测：token 最低活跃频率（单位：秒），如果 token 超过此时间没有访问系统就会被冻结
*/
private void updateActiveTimeout(RequestEmployee requestEmployee) {
private void checkActiveTimeout(RequestEmployee requestEmployee) {
// 用户不在线，也不用检测
if (requestEmployee == null) {
return;
}
StpUtil.checkActiveTimeout();
StpUtil.updateLastActiveToNow();
}

2
smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/domain/entity/DepartmentEntity.java
View File

@ -36,7 +36,7 @@ public class DepartmentEntity {
/**
* 负责人员工 id
*/
@TableField(updateStrategy = FieldStrategy.NEVER)
@TableField(updateStrategy = FieldStrategy.IGNORED)
private Long managerId;
/**

6
smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/domain/entity/EmployeeEntity.java
View File

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

41
smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/service/EmployeeService.java
View File

@ -1,7 +1,6 @@
package net.lab1024.sa.admin.module.system.employee.service;
import cn.dev33.satoken.stp.StpUtil;
import cn.hutool.core.lang.UUID;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.google.common.collect.Lists;
import net.lab1024.sa.admin.module.system.department.dao.DepartmentDao;
@ -139,20 +138,16 @@ public class EmployeeService {
}
EmployeeEntity entity = SmartBeanUtil.copy(employeeAddForm, EmployeeEntity.class);
// 员工uid
String employeeUid = UUID.randomUUID(true).toString(true);
entity.setEmployeeUid(employeeUid);
// 设置密码 随机密码
String randomPassword = securityPasswordService.randomPassword();
String generateSaltPassword = this.generateSaltPassword(randomPassword, employeeUid);
entity.setLoginPwd(SecurityPasswordService.getEncryptPwd(generateSaltPassword));
// 设置密码 默认密码
String password = securityPasswordService.randomPassword();
entity.setLoginPwd(SecurityPasswordService.getEncryptPwd(password));
// 保存数据
entity.setDeletedFlag(Boolean.FALSE);
employeeManager.saveEmployee(entity, employeeAddForm.getRoleIdList());
return ResponseDTO.ok(randomPassword);
return ResponseDTO.ok(password);
}
/**
@ -246,6 +241,7 @@ public class EmployeeService {
/**
* 更新登录人头像
*
*/
public ResponseDTO<String> updateAvatar(EmployeeUpdateAvatarForm employeeUpdateAvatarForm) {
Long employeeId = employeeUpdateAvatarForm.getEmployeeId();
@ -347,12 +343,12 @@ public class EmployeeService {
}
// 校验原始密码
if (!SecurityPasswordService.matchesPwd(this.generateSaltPassword(updatePasswordForm.getOldPassword(), employeeEntity.getEmployeeUid()), employeeEntity.getLoginPwd())) {
if (!SecurityPasswordService.matchesPwd(updatePasswordForm.getOldPassword(),employeeEntity.getLoginPwd()) ) {
return ResponseDTO.userErrorParam("原密码有误，请重新输入");
}
// 新旧密码相同
if (Objects.equals(updatePasswordForm.getOldPassword(), updatePasswordForm.getNewPassword())) {
if (Objects.equals(updatePasswordForm.getOldPassword(), updatePasswordForm.getNewPassword()) ){
return ResponseDTO.userErrorParam("新密码与原始密码相同，请重新输入");
}
@ -363,13 +359,14 @@ public class EmployeeService {
}
// 根据三级等保规则，校验密码是否重复
ResponseDTO<String> passwordRepeatTimes = securityPasswordService.validatePasswordRepeatTimes(requestUser, this.generateSaltPassword(updatePasswordForm.getNewPassword(), employeeEntity.getEmployeeUid()));
ResponseDTO<String> passwordRepeatTimes = securityPasswordService.validatePasswordRepeatTimes(requestUser, updatePasswordForm.getNewPassword());
if (!passwordRepeatTimes.getOk()) {
return ResponseDTO.error(passwordRepeatTimes);
}
// 更新密码
String newEncryptPassword = SecurityPasswordService.getEncryptPwd(this.generateSaltPassword(updatePasswordForm.getNewPassword(), employeeEntity.getEmployeeUid()));
String newEncryptPassword = SecurityPasswordService.getEncryptPwd(updatePasswordForm.getNewPassword());
EmployeeEntity updateEntity = new EmployeeEntity();
updateEntity.setEmployeeId(employeeId);
updateEntity.setLoginPwd(newEncryptPassword);
@ -408,14 +405,8 @@ 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();
String saltPassword = this.generateSaltPassword(password, employeeEntity.getEmployeeUid());
employeeDao.updatePassword(employeeId, SecurityPasswordService.getEncryptPwd(saltPassword));
employeeDao.updatePassword(employeeId, SecurityPasswordService.getEncryptPwd(password));
return ResponseDTO.ok(password);
}
@ -435,14 +426,4 @@ 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();
}
}

2
smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/controller/LoginController.java
View File

@ -58,7 +58,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());

15
smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/manager/LoginManager.java
View File

@ -153,19 +153,8 @@ public class LoginManager {
}
/**
* 清除用户权限
*/
@CacheEvict(value = AdminCacheConst.Login.USER_PERMISSION)
public void clearUserPermission(Long employeeId) {
}
/**
* 清除用户登录信息
*/
@CacheEvict(value = AdminCacheConst.Login.REQUEST_EMPLOYEE)
public void clearUserLoginInfo(Long employeeId) {
@CacheEvict(value = {AdminCacheConst.Login.USER_PERMISSION, AdminCacheConst.Login.REQUEST_EMPLOYEE}, allEntries = true)
public void clear(){
}

22
smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/service/LoginService.java
View File

@ -7,6 +7,7 @@ import cn.hutool.core.util.NumberUtil;
import cn.hutool.core.util.RandomUtil;
import cn.hutool.extra.servlet.ServletUtil;
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;
@ -48,6 +49,8 @@ import net.lab1024.sa.base.module.support.securityprotect.domain.LoginFailEntity
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.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@ -79,6 +82,9 @@ public class LoginService implements StpInterface {
@Resource
private EmployeeService employeeService;
@Resource
private DepartmentService departmentService;
@Resource
private CaptchaService captchaService;
@ -100,6 +106,9 @@ public class LoginService implements StpInterface {
@Resource
private SecurityPasswordService protectPasswordService;
@Resource
private IFileStorageService fileStorageService;
@Resource
private ApiEncryptService apiEncryptService;
@ -123,7 +132,7 @@ public class LoginService implements StpInterface {
}
/**
* 员工登录
* 员工登陆
*
* @return 返回用户登录信息
*/
@ -187,7 +196,7 @@ public class LoginService implements StpInterface {
}
// 密码错误
if (!SecurityPasswordService.matchesPwd(employeeService.generateSaltPassword(requestPassword, employeeEntity.getEmployeeUid()), employeeEntity.getLoginPwd())) {
if (!SecurityPasswordService.matchesPwd(requestPassword, employeeEntity.getLoginPwd())) {
// 记录登录失败
saveLoginLog(employeeEntity, ip, userAgent, "密码错误", LoginLogResultEnum.LOGIN_FAIL, loginDeviceEnum);
// 记录等级保护次数
@ -264,7 +273,7 @@ public class LoginService implements StpInterface {
/**
* 根据登录token 获取员请求工信息
* 根据登陆token 获取员请求工信息
*/
public RequestEmployee getLoginEmployee(String loginId, HttpServletRequest request) {
if (loginId == null) {
@ -319,8 +328,8 @@ public class LoginService implements StpInterface {
// sa token 登出
StpUtil.logout();
// 清除用户登录信息缓存和权限信息
this.clearLoginEmployeeCache(requestUser.getUserId());
// 清空登录信息缓存
loginManager.clear();
//保存登出日志
LoginLogEntity loginEntity = LoginLogEntity.builder()
@ -476,7 +485,6 @@ public class LoginService implements StpInterface {
}
public void clearLoginEmployeeCache(Long employeeId) {
loginManager.clearUserPermission(employeeId);
loginManager.clearUserLoginInfo(employeeId);
loginManager.clear();
}
}

2
smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/position/domain/entity/PositionEntity.java
View File

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

2
smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/position/domain/form/PositionAddForm.java
View File

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

2
smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/position/domain/vo/PositionVO.java
View File

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

3
smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/domain/vo/RoleVO.java
View File

@ -2,6 +2,9 @@ package net.lab1024.sa.admin.module.system.role.domain.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.NotNull;
/**
* 角色

1
smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/manager/RoleMenuManager.java
View File

@ -3,6 +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.RoleMenuDao;
import net.lab1024.sa.admin.module.system.role.domain.entity.RoleMenuEntity;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

5
smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/service/RoleDataScopeService.java
View File

@ -1,13 +1,14 @@
package net.lab1024.sa.admin.module.system.role.service;
import com.google.common.collect.Lists;
import net.lab1024.sa.admin.module.system.role.domain.entity.RoleDataScopeEntity;
import net.lab1024.sa.admin.module.system.role.domain.form.RoleDataScopeUpdateForm;
import net.lab1024.sa.admin.module.system.role.domain.vo.RoleDataScopeVO;
import net.lab1024.sa.admin.module.system.role.manager.RoleDataScopeManager;
import net.lab1024.sa.base.common.code.UserErrorCode;
import net.lab1024.sa.base.common.domain.ResponseDTO;
import net.lab1024.sa.base.common.util.SmartBeanUtil;
import net.lab1024.sa.admin.module.system.role.domain.entity.RoleDataScopeEntity;
import net.lab1024.sa.admin.module.system.role.manager.RoleDataScopeManager;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;

17
smart-admin-api-java8-springboot2/sa-admin/src/main/resources/dev/log4j2-spring.xml
View File

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

14
smart-admin-api-java8-springboot2/sa-admin/src/main/resources/pre/log4j2-spring.xml
View File

@ -5,12 +5,12 @@
-->
<Configuration status="INFO" monitorInterval="30">
<Properties>
<Property name="log-directory" value="${spring:project.log-directory}"/>
<Property name="log-directory" value="${sys:project.log-directory}"/>
</Properties>
<Appenders>
<Console name="Console" target="SYSTEM_OUT">
<ThresholdFilter level="info" onMatch="ACCEPT" onMismatch="DENY"/>
<PatternLayout pattern="[%d][%-5p][%t][%c{1.}:%L] %m %n"/>
<PatternLayout pattern="[%d][%-5p][%t] %m (%F:%L)%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][%c{1.}:%L] %m %n"/>
<PatternLayout pattern="[%d][%-5p][%t] %m (%F:%L)%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][%c{1.}:%L] %m %n"/>
<PatternLayout pattern="[%d][%-5p][%t] %m (%F:%L)%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][%c{1.}:%L] %m %n"/>
<PatternLayout pattern="[%d][%-5p][%t] %m (%F:%L)%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][%c{1.}:%L] %m %n"/>
<PatternLayout pattern="[%d][%-5p][%t] %m (%F:%L)%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][%c{1.}:%L] %m %n"/>
<PatternLayout pattern="[%d][%-5p][%t] %m (%F:%L)%n"/>
<Policies>
<TimeBasedTriggeringPolicy interval="1" modulate="true"/>
<SizeBasedTriggeringPolicy size="50 MB"/>

14
smart-admin-api-java8-springboot2/sa-admin/src/main/resources/prod/log4j2-spring.xml
View File

@ -5,12 +5,12 @@
-->
<Configuration status="INFO" monitorInterval="30">
<Properties>
<Property name="log-directory" value="${spring:project.log-directory}"/>
<Property name="log-directory" value="${sys:project.log-directory}"/>
</Properties>
<Appenders>
<Console name="Console" target="SYSTEM_OUT">
<ThresholdFilter level="info" onMatch="ACCEPT" onMismatch="DENY"/>
<PatternLayout pattern="[%d][%-5p][%t][%c{1.}:%L] %m %n"/>
<PatternLayout pattern="[%d][%-5p][%t] %m (%F:%L)%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][%c{1.}:%L] %m %n"/>
<PatternLayout pattern="[%d][%-5p][%t] %m (%F:%L)%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][%c{1.}:%L] %m %n"/>
<PatternLayout pattern="[%d][%-5p][%t] %m (%F:%L)%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][%c{1.}:%L] %m %n"/>
<PatternLayout pattern="[%d][%-5p][%t] %m (%F:%L)%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][%c{1.}:%L] %m %n"/>
<PatternLayout pattern="[%d][%-5p][%t] %m (%F:%L)%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][%c{1.}:%L] %m %n"/>
<PatternLayout pattern="[%d][%-5p][%t] %m (%F:%L)%n"/>
<Policies>
<TimeBasedTriggeringPolicy interval="1" modulate="true"/>
<SizeBasedTriggeringPolicy size="50 MB"/>

14
smart-admin-api-java8-springboot2/sa-admin/src/main/resources/test/log4j2-spring.xml
View File

@ -5,12 +5,12 @@
-->
<Configuration status="INFO" monitorInterval="30">
<Properties>
<Property name="log-directory" value="${spring:project.log-directory}"/>
<Property name="log-directory" value="${sys:project.log-directory}"/>
</Properties>
<Appenders>
<Console name="Console" target="SYSTEM_OUT">
<ThresholdFilter level="info" onMatch="ACCEPT" onMismatch="DENY"/>
<PatternLayout pattern="[%d][%-5p][%t][%c{1.}:%L] %m %n"/>
<PatternLayout pattern="[%d][%-5p][%t] %m (%F:%L)%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][%c{1.}:%L] %m %n"/>
<PatternLayout pattern="[%d][%-5p][%t] %m (%F:%L)%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][%c{1.}:%L] %m %n"/>
<PatternLayout pattern="[%d][%-5p][%t] %m (%F:%L)%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][%c{1.}:%L] %m %n"/>
<PatternLayout pattern="[%d][%-5p][%t] %m (%F:%L)%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][%c{1.}:%L] %m %n"/>
<PatternLayout pattern="[%d][%-5p][%t] %m (%F:%L)%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][%c{1.}:%L] %m %n"/>
<PatternLayout pattern="[%d][%-5p][%t] %m (%F:%L)%n"/>
<Policies>
<TimeBasedTriggeringPolicy interval="1" modulate="true"/>
<SizeBasedTriggeringPolicy size="50 MB"/>

42
smart-admin-api-java8-springboot2/sa-base/pom.xml
View File

@ -131,17 +131,6 @@
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-jsqlparser-4.9</artifactId>
</dependency>
<dependency>
@ -190,8 +179,8 @@
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>s3</artifactId>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-s3</artifactId>
</dependency>
@ -219,6 +208,16 @@
<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>
@ -242,6 +241,12 @@
<dependency>
<groupId>cn.idev.excel</groupId>
<artifactId>fastexcel</artifactId>
<exclusions>
<exclusion>
<artifactId>logback-classic</artifactId>
<groupId>ch.qos.logback</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
@ -261,12 +266,17 @@
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
<artifactId>ooxml-schemas</artifactId>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml-full</artifactId>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-yaml</artifactId>
</dependency>
<dependency>

16
smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/json/serializer/LongJsonSerializer.java
View File

@ -20,25 +20,17 @@ 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;
}
// 如果超出了 JavaScript 安全整数范围，则序列化为字符串
if (value < JS_MIN_SAFE_INTEGER || value > JS_MAX_SAFE_INTEGER) {
gen.writeString(Long.toString(value));
// js中最大安全整数16位 Number.MAX_SAFE_INTEGER
String longStr = String.valueOf(value);
if (longStr.length() > 16) {
gen.writeString(longStr);
} else {
// 否则，序列化为数字
gen.writeNumber(value);
}
}

5
smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/util/SmartPageUtil.java
View File

@ -52,7 +52,8 @@ public class SmartPageUtil {
log.error("《存在SQL注入：》 : {}", sortItem.getColumn());
throw new BusinessException("存在SQL注入风险，请联系技术工作人员！");
}
orderItemList.add(sortItem.getIsAsc() ? OrderItem.asc(sortItem.getColumn()) : OrderItem.desc(sortItem.getColumn()));
orderItemList.add(new OrderItem(sortItem.getColumn(), sortItem.getIsAsc()));
}
page.setOrders(orderItemList);
return page;
@ -93,7 +94,7 @@ public class SmartPageUtil {
return newPageResult;
}
public static <T> PageResult<T> subListPage(Integer pageNum, Integer pageSize, List<T> list) {
public static <T> PageResult subListPage(Integer pageNum, Integer pageSize, List<T> list) {
PageResult<T> pageRet = new PageResult<T>();
//总条数
int count = list.size();

3
smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/util/SmartRequestUtil.java
View File

@ -18,9 +18,6 @@ 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);
}

4
smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/util/SmartResponseUtil.java
View File

@ -11,6 +11,7 @@ import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import static cn.hutool.core.util.CharsetUtil.UTF_8;
@ -54,8 +55,9 @@ public class SmartResponseUtil {
if (SmartStringUtil.isNotEmpty(fileName)) {
response.setHeader(HttpHeaders.CONTENT_TYPE, MediaTypeFactory.getMediaType(fileName).orElse(MediaType.APPLICATION_OCTET_STREAM) + ";charset=utf-8");
try {
response.setHeader(HttpHeaders.CONTENT_DISPOSITION, "attachment;filename=" + URLEncoder.encode(fileName, "utf-8").replaceAll("\\+", "%20"));
response.setHeader(HttpHeaders.CONTENT_DISPOSITION, "attachment;filename=" + URLEncoder.encode(fileName, UTF_8).replaceAll("\\+", "%20"));
} catch (UnsupportedEncodingException e) {
log.error(e.getMessage(), e);
throw new RuntimeException(e);
}
response.setHeader(HttpHeaders.ACCESS_CONTROL_EXPOSE_HEADERS, HttpHeaders.CONTENT_DISPOSITION);

51
smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/config/CacheConfig.java
View File

@ -4,13 +4,10 @@ import com.alibaba.fastjson.support.spring.GenericFastJsonRedisSerializer;
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;
@ -19,6 +16,8 @@ import javax.annotation.Resource;
/**
* 缓存配置
*
* @author zhoumingfa
* @date 2025/03/28
*/
@Configuration
public class CacheConfig {
@ -28,44 +27,28 @@ public class CacheConfig {
@Resource
private RedisConnectionFactory redisConnectionFactory;
private RedisConnectionFactory factory;
/**
* 创建自定义Redis缓存管理器Bean 整合spring-cache
* Redis连接工厂，用于建立与Redis服务器的连接
*
* @return CacheManager Redis缓存管理器实例
*/
@Bean
@ConditionalOnProperty(prefix = "spring.cache", name = {"type"}, havingValue = REDIS_CACHE)
public CacheManager cacheManager() {
// 使用非阻塞模式的缓存写入器，适用于大多数高并发场景
RedisCacheWriter redisCacheWriter = RedisCacheWriter.nonLockingRedisCacheWriter(redisConnectionFactory);
// 构建默认缓存配置
RedisCacheConfiguration defaultCacheConfig = RedisCacheConfiguration.defaultCacheConfig()
// 禁止缓存 null 值，避免缓存穿透
public RedisCacheConfiguration redisCacheConfiguration() {
return RedisCacheConfiguration.defaultCacheConfig()
.disableCachingNullValues()
.computePrefixWith(name -> "cache:" + name + ":")
// 使用 FastJSON 序列化缓存值，支持复杂对象
.serializeValuesWith(RedisSerializationContext.SerializationPair
.fromSerializer(new GenericFastJsonRedisSerializer()));
// 返回自定义缓存管理器，支持 cacheName#ttl 格式与永久缓存（#-1）
return new CustomRedisCacheManager(redisCacheWriter, defaultCacheConfig);
// .serializeValuesWith(RedisSerializationContext.SerializationPair.fromSerializer(new GenericFastJsonRedisSerializer()));
;
}
@Bean
@ConditionalOnProperty(prefix = "spring.cache", name = {"type"}, havingValue = REDIS_CACHE)
public CacheService redisCacheService() {
return new RedisCacheServiceImpl();
}
@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();
}
@Bean
@ConditionalOnProperty(prefix = "spring.cache", name = {"type"}, havingValue = CAFFEINE_CACHE)
public CacheService caffeineCacheService() {
return new CaffeineCacheServiceImpl();
}
}

38
smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/config/FileConfig.java
View File

@ -1,5 +1,12 @@
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;
@ -10,13 +17,6 @@ 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,10 +31,6 @@ import java.net.URI;
@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";
@ -73,17 +69,15 @@ public class FileConfig implements WebMvcConfigurer {
*/
@Bean
@ConditionalOnProperty(prefix = "file.storage", name = {"mode"}, havingValue = MODE_CLOUD)
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())
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)
.build();
}

6
smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/config/JsonConfig.java
View File

@ -2,7 +2,6 @@ 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;
@ -14,8 +13,6 @@ 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;
@ -40,9 +37,6 @@ 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);
};
}

14
smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/config/RepeatSubmitConfig.java
View File

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

5
smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/listener/WebServerListener.java
View File

@ -6,10 +6,15 @@ import lombok.extern.slf4j.Slf4j;
import net.lab1024.sa.base.common.code.ErrorCodeRegister;
import net.lab1024.sa.base.common.enumeration.SystemEnvironmentEnum;
import net.lab1024.sa.base.common.util.SmartEnumUtil;
import net.lab1024.sa.base.module.support.reload.ReloadCommand;
import net.lab1024.sa.base.module.support.reload.core.SmartReloadManager;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.boot.web.context.WebServerApplicationContext;
import org.springframework.boot.web.context.WebServerInitializedEvent;
import org.springframework.boot.web.server.WebServer;
import org.springframework.context.ApplicationListener;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.core.annotation.Order;
import org.springframework.core.env.Environment;
import org.springframework.stereotype.Component;

Some files were not shown because too many files have changed in this diff Show More