v3.6.0 三级等保重磅更新：1、【新增】双因子方式登录；2、【新增】定期修改密码;3、【新增】最大活跃时间;4、【新增】敏感数据脱敏;5、【新增】登录锁定配置;6、【新增】密码复杂度配置;7、【新增】三级等保可配置

2025-11-09 04:03:51 +08:00 · 2024-09-03 22:35:00 +08:00
parent 6855b8b088
commit 4362e8df8b
15 changed files with 363 additions and 381 deletions
--- a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/reload/ReloadCommand.java
+++ b/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/reload/ReloadCommand.java
@@ -8,7 +8,6 @@ import net.lab1024.sa.base.module.support.reload.dao.ReloadItemDao;
 import net.lab1024.sa.base.module.support.reload.dao.ReloadResultDao;
 import net.lab1024.sa.base.module.support.reload.domain.ReloadItemEntity;
 import net.lab1024.sa.base.module.support.reload.domain.ReloadResultEntity;
-import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;

 import javax.annotation.Resource;
--- a/smart-admin-api/sa-base/src/main/resources/dev/sa-base.yaml
+++ b/smart-admin-api/sa-base/src/main/resources/dev/sa-base.yaml
@@ -1,16 +1,16 @@
 spring:
  # 数据库连接信息
  datasource:
-    url: jdbc:p6spy:mysql://47.96.105.74:11024/smart_admin_v3_dev?autoReconnect=true&useServerPreparedStmts=false&rewriteBatchedStatements=true&characterEncoding=UTF-8&useSSL=false&allowMultiQueries=true&serverTimezone=Asia/Shanghai
+    url: jdbc:p6spy:mysql://127.0.0.1:3306/smart_admin_v3?autoReconnect=true&useServerPreparedStmts=false&rewriteBatchedStatements=true&characterEncoding=UTF-8&useSSL=false&allowMultiQueries=true&serverTimezone=Asia/Shanghai
    username: root
-    password: 11024Lab
+    password: SmartAdmin666
+    driver-class-name: com.p6spy.engine.spy.P6SpyDriver
    initial-size: 2
    min-idle: 2
    max-active: 10
    max-wait: 60000
    time-between-eviction-runs-millis: 60000
    min-evictable-idle-time-millis: 300000
-    driver-class-name: com.p6spy.engine.spy.P6SpyDriver
    filters: stat
    druid:
      username: druid
@@ -22,10 +22,10 @@ spring:

  # redis 连接池配置信息
  redis:
-    database: 7
-    host: 47.96.105.74
-    port: 6666
-    password: ASDasd123
+    database: 1
+    host: 127.0.0.1
+    port: 6379
+    password:
    timeout: 10000ms
    lettuce:
      pool:
@@ -39,7 +39,7 @@ spring:
    host: smtp.163.com
    port: 465
    username: lab1024@163.com
-    password: ROIMSIQCEXHTQFTA
+    password: ROIASDFJKHQFTA
    properties:
      mail:
        smtp:
@@ -87,8 +87,8 @@ file:
      region: oss-cn-hangzhou
      endpoint: oss-cn-hangzhou.aliyuncs.com
      bucket-name: 1024lab-smart-admin
-      access-key: LTAI5tBAbehjXWyAqLhc58e1
-      secret-key: asX6ZWutaoTbQL3GxsFs24CmfAcYu3
+      access-key:
+      secret-key:
      url-prefix: https://${file.storage.cloud.bucket-name}.${file.storage.cloud.endpoint}/
      private-url-expire-seconds: 3600

--- a/smart-admin-api/sa-base/src/main/resources/pre/sa-base.yaml
+++ b/smart-admin-api/sa-base/src/main/resources/pre/sa-base.yaml
@@ -1,16 +1,16 @@
 spring:
  # 数据库连接信息
  datasource:
-    url: jdbc:p6spy:mysql://47.96.105.74:11024/smart_admin_v3_dev?autoReconnect=true&useServerPreparedStmts=false&rewriteBatchedStatements=true&characterEncoding=UTF-8&useSSL=false&allowMultiQueries=true&serverTimezone=Asia/Shanghai
+    url: jdbc:p6spy:mysql://127.0.0.1:3306/smart_admin_v3?autoReconnect=true&useServerPreparedStmts=false&rewriteBatchedStatements=true&characterEncoding=UTF-8&useSSL=false&allowMultiQueries=true&serverTimezone=Asia/Shanghai
    username: root
-    password: 11024Lab
+    password: SmartAdmin666
+    driver-class-name: com.p6spy.engine.spy.P6SpyDriver
    initial-size: 2
    min-idle: 2
    max-active: 10
    max-wait: 60000
    time-between-eviction-runs-millis: 60000
    min-evictable-idle-time-millis: 300000
-    driver-class-name: com.p6spy.engine.spy.P6SpyDriver
    filters: stat
    druid:
      username: druid
@@ -22,10 +22,10 @@ spring:

  # redis 连接池配置信息
  redis:
-    database: 7
-    host: 47.96.105.74
-    port: 6666
-    password: ASDasd123
+    database: 1
+    host: 127.0.0.1
+    port: 6379
+    password:
    timeout: 10000ms
    lettuce:
      pool:
@@ -39,7 +39,7 @@ spring:
    host: smtp.163.com
    port: 465
    username: lab1024@163.com
-    password: ROIMSIQCEXHTQFTA
+    password: ROIASDFJKHQFTA
    properties:
      mail:
        smtp:
@@ -87,8 +87,8 @@ file:
      region: oss-cn-hangzhou
      endpoint: oss-cn-hangzhou.aliyuncs.com
      bucket-name: 1024lab-smart-admin
-      access-key: LTAI5tBAbehjXWyAqLhc58e1
-      secret-key: asX6ZWutaoTbQL3GxsFs24CmfAcYu3
+      access-key:
+      secret-key:
      url-prefix: https://${file.storage.cloud.bucket-name}.${file.storage.cloud.endpoint}/
      private-url-expire-seconds: 3600

@@ -104,7 +104,7 @@ springdoc:
 knife4j:
  enable: true
  basic:
-    enable: false
+    enable: true
    username: api # Basic认证用户名
    password: 1024 # Basic认证密码

--- a/smart-admin-api/sa-base/src/main/resources/prod/sa-base.yaml
+++ b/smart-admin-api/sa-base/src/main/resources/prod/sa-base.yaml
@@ -3,14 +3,14 @@ spring:
  datasource:
    url: jdbc:mysql://127.0.0.1:3306/smart_admin_v3_dev?autoReconnect=true&useServerPreparedStmts=false&rewriteBatchedStatements=true&characterEncoding=UTF-8&useSSL=false&allowMultiQueries=true&serverTimezone=Asia/Shanghai
    username: root
-    password: Zhuoda#1024lab
+    password: SmartAdmin666
+    driver-class-name: com.mysql.cj.jdbc.Driver
    initial-size: 10
    min-idle: 10
    max-active: 100
    max-wait: 60000
    time-between-eviction-runs-millis: 60000
    min-evictable-idle-time-millis: 300000
-    driver-class-name: com.mysql.cj.jdbc.Driver
    filters: stat
    druid:
      username: druid
@@ -38,7 +38,7 @@ spring:
    host: smtp.163.com
    port: 465
    username: lab1024@163.com
-    password: 1024lab
+    password: ROIASDFJKHQFTA
    properties:
      mail:
        smtp:
@@ -84,9 +84,9 @@ file:
      upload-path: /home/smart_admin_v3/upload/   #文件上传目录
      url-prefix:
    cloud:
-      region: oss-cn-qingdao
-      endpoint: oss-cn-qingdao.aliyuncs.com
-      bucket-name: common
+      region: oss-cn-hangzhou
+      endpoint: oss-cn-hangzhou.aliyuncs.com
+      bucket-name: 1024lab-smart-admin
      access-key:
      secret-key:
      url-prefix: https://${file.storage.cloud.bucket-name}.${file.storage.cloud.endpoint}/
--- a/smart-admin-api/sa-base/src/main/resources/test/sa-base.yaml
+++ b/smart-admin-api/sa-base/src/main/resources/test/sa-base.yaml
@@ -1,16 +1,16 @@
 spring:
  # 数据库连接信息
  datasource:
-    url: jdbc:p6spy:mysql://47.96.105.74:11024/smart_admin_v3_dev?autoReconnect=true&useServerPreparedStmts=false&rewriteBatchedStatements=true&characterEncoding=UTF-8&useSSL=false&allowMultiQueries=true&serverTimezone=Asia/Shanghai
+    url: jdbc:p6spy:mysql://127.0.0.1:3306/smart_admin_v3?autoReconnect=true&useServerPreparedStmts=false&rewriteBatchedStatements=true&characterEncoding=UTF-8&useSSL=false&allowMultiQueries=true&serverTimezone=Asia/Shanghai
    username: root
-    password: 11024Lab
+    password: SmartAdmin666
+    driver-class-name: com.p6spy.engine.spy.P6SpyDriver
    initial-size: 2
    min-idle: 2
    max-active: 10
    max-wait: 60000
    time-between-eviction-runs-millis: 60000
    min-evictable-idle-time-millis: 300000
-    driver-class-name: com.p6spy.engine.spy.P6SpyDriver
    filters: stat
    druid:
      username: druid
@@ -22,10 +22,10 @@ spring:

  # redis 连接池配置信息
  redis:
-    database: 7
-    host: 47.96.105.74
-    port: 6666
-    password: ASDasd123
+    database: 1
+    host: 127.0.0.1
+    port: 6379
+    password:
    timeout: 10000ms
    lettuce:
      pool:
@@ -39,7 +39,7 @@ spring:
    host: smtp.163.com
    port: 465
    username: lab1024@163.com
-    password: ROIMSIQCEXHTQFTA
+    password: ROIASDFJKHQFTA
    properties:
      mail:
        smtp:
@@ -87,8 +87,8 @@ file:
      region: oss-cn-hangzhou
      endpoint: oss-cn-hangzhou.aliyuncs.com
      bucket-name: 1024lab-smart-admin
-      access-key: LTAI5tBAbehjXWyAqLhc58e1
-      secret-key: asX6ZWutaoTbQL3GxsFs24CmfAcYu3
+      access-key:
+      secret-key:
      url-prefix: https://${file.storage.cloud.bucket-name}.${file.storage.cloud.endpoint}/
      private-url-expire-seconds: 3600