From cb39dedfd5d405f8a5a52eea0aca89f66f6e894c Mon Sep 17 00:00:00 2001 From: zhuoda Date: Sun, 24 Nov 2024 20:02:08 +0800 Subject: [PATCH] =?UTF-8?q?v3.11.0=20=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91S?= =?UTF-8?q?aTokenConfig=E4=B8=8E=E4=B8=89=E7=BA=A7=E7=AD=89=E4=BF=9D?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=85=B3=E8=81=94=EF=BC=9B=E3=80=90=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E3=80=91smart-app=E5=8E=BB=E6=8E=89=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E8=AF=B7=E6=B1=82=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lab1024/sa/base/config/TokenConfig.java | 34 +++++++++++++++++++ .../service/Level3ProtectConfigService.java | 2 +- .../src/main/resources/dev/sa-base.yaml | 2 +- .../src/main/resources/prod/sa-base.yaml | 25 +++++++------- .../lab1024/sa/base/config/TokenConfig.java | 34 +++++++++++++++++++ .../service/Level3ProtectConfigService.java | 2 +- smart-app/src/store/modules/system/user.js | 6 ++++ 7 files changed, 90 insertions(+), 15 deletions(-) create mode 100644 smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/config/TokenConfig.java create mode 100644 smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/config/TokenConfig.java diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/config/TokenConfig.java b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/config/TokenConfig.java new file mode 100644 index 00000000..0d7d076a --- /dev/null +++ b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/config/TokenConfig.java @@ -0,0 +1,34 @@ +package net.lab1024.sa.base.config; + +import cn.dev33.satoken.config.SaTokenConfig; +import net.lab1024.sa.base.module.support.securityprotect.service.Level3ProtectConfigService; +import org.springframework.context.annotation.Configuration; + +import javax.annotation.Resource; + +/** + * + * 三级等保配置初始化后最低活跃频率全局配置 + * + * @Author 1024创新实验室-创始人兼主任:卓大 + * @Date 2024/11/24 + * @Wechat zhuoda1024 + * @Email lab1024@163.com + * @Copyright 1024创新实验室 ，Since 2012 + */ + +@Configuration +public class TokenConfig { + + @Resource + private Level3ProtectConfigService level3ProtectConfigService; + + // 此配置会覆盖 sa-base.yaml 中的配置 + @Resource + public void configSaToken(SaTokenConfig config) { + + config.setActiveTimeout(level3ProtectConfigService.getLoginActiveTimeoutSeconds()); + } + + +} diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/service/Level3ProtectConfigService.java b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/service/Level3ProtectConfigService.java index 2d9d4551..ad39fc4e 100644 --- a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/service/Level3ProtectConfigService.java +++ b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/service/Level3ProtectConfigService.java @@ -44,7 +44,7 @@ public class Level3ProtectConfigService { /** * 最低活跃时间（单位：秒），超过此时间没有操作系统就会被冻结，默认-1 代表不限制，永不冻结; 默认 30分钟 */ - private int loginActiveTimeoutSeconds = 1800; + private int loginActiveTimeoutSeconds = -1; /** * 密码复杂度 是否开启，默认：开启 diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/resources/dev/sa-base.yaml b/smart-admin-api-java17-springboot3/sa-base/src/main/resources/dev/sa-base.yaml index 4b2c4094..1600d310 100644 --- a/smart-admin-api-java17-springboot3/sa-base/src/main/resources/dev/sa-base.yaml +++ b/smart-admin-api-java17-springboot3/sa-base/src/main/resources/dev/sa-base.yaml @@ -40,7 +40,7 @@ spring: host: smtp.163.com port: 465 username: lab1024@163.com - password: ROIMSIQCEXHTQFTA + password: LAB1024LAB properties: mail: smtp: diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/resources/prod/sa-base.yaml b/smart-admin-api-java17-springboot3/sa-base/src/main/resources/prod/sa-base.yaml index 1162a1ce..adcac8c9 100644 --- a/smart-admin-api-java17-springboot3/sa-base/src/main/resources/prod/sa-base.yaml +++ b/smart-admin-api-java17-springboot3/sa-base/src/main/resources/prod/sa-base.yaml @@ -21,18 +21,19 @@ spring: pointcut: net.lab1024.sa..*Service.* # redis 连接池配置信息 - redis: - database: 1 - host: 127.0.0.1 - port: 6379 - password: - timeout: 10000ms - lettuce: - pool: - max-active: 100 - min-idle: 10 - max-idle: 50 - max-wait: 30000ms + data: + redis: + database: 1 + host: 127.0.0.1 + port: 6379 + password: + timeout: 10000ms + lettuce: + pool: + max-active: 100 + min-idle: 10 + max-idle: 50 + max-wait: 30000ms # 邮件，置以SSL的方式发送, 这个需要使用这种方式并且端口是465 mail: host: smtp.163.com diff --git a/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/config/TokenConfig.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/config/TokenConfig.java new file mode 100644 index 00000000..0d7d076a --- /dev/null +++ b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/config/TokenConfig.java @@ -0,0 +1,34 @@ +package net.lab1024.sa.base.config; + +import cn.dev33.satoken.config.SaTokenConfig; +import net.lab1024.sa.base.module.support.securityprotect.service.Level3ProtectConfigService; +import org.springframework.context.annotation.Configuration; + +import javax.annotation.Resource; + +/** + * + * 三级等保配置初始化后最低活跃频率全局配置 + * + * @Author 1024创新实验室-创始人兼主任:卓大 + * @Date 2024/11/24 + * @Wechat zhuoda1024 + * @Email lab1024@163.com + * @Copyright 1024创新实验室 ，Since 2012 + */ + +@Configuration +public class TokenConfig { + + @Resource + private Level3ProtectConfigService level3ProtectConfigService; + + // 此配置会覆盖 sa-base.yaml 中的配置 + @Resource + public void configSaToken(SaTokenConfig config) { + + config.setActiveTimeout(level3ProtectConfigService.getLoginActiveTimeoutSeconds()); + } + + +} diff --git a/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/service/Level3ProtectConfigService.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/service/Level3ProtectConfigService.java index 37bba688..40a9afb2 100644 --- a/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/service/Level3ProtectConfigService.java +++ b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/service/Level3ProtectConfigService.java @@ -45,7 +45,7 @@ public class Level3ProtectConfigService { /** * 最低活跃时间（单位：秒），超过此时间没有操作系统就会被冻结，默认-1 代表不限制，永不冻结; 默认 30分钟 */ - private int loginActiveTimeoutSeconds = 1800; + private int loginActiveTimeoutSeconds = -1; /** * 密码复杂度 是否开启，默认：开启 diff --git a/smart-app/src/store/modules/system/user.js b/smart-app/src/store/modules/system/user.js index ac9b546a..b8734f81 100644 --- a/smart-app/src/store/modules/system/user.js +++ b/smart-app/src/store/modules/system/user.js @@ -61,13 +61,19 @@ export const useUserStore = defineStore({ logout() { this.token = null; this.setUserLoginInfo(defaultUserInfo); + console.log(333,USER_TOKEN); uni.removeStorage(USER_TOKEN); }, clearUserLoginInfo() { this.setUserLoginInfo(defaultUserInfo); + console.log(444,USER_TOKEN); uni.removeStorage(USER_TOKEN); }, async getLoginInfo() { + let token = uni.getStorageSync(USER_TOKEN); + if(!token){ + return; + } let res = await loginApi.getLoginInfo(); this.setUserLoginInfo(res.data); },