From ec6c273df55789edecd2e816f37082d7842a41c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=84=E9=94=90=E6=B3=A2?=
<10549902+zhuangruibo@user.noreply.gitee.com>
Date: Tue, 23 Jun 2026 17:13:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E9=9D=9E=E7=8E=B0=E5=9C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ng/3/nginx.conf | 18 +++-
.../common/satoken/config/SaTokenConfig.java | 4 +-
.../src/main/resources/common-satoken.yml | 6 ++
.../controller/app/LoginController.java | 13 +++
.../zdxt-admin-plus-ui/public/css/index.html | 88 -------------------
.../src/main/resources/application.yml | 2 +-
.../service/test/ResetUserPasswordTest.java | 3 +-
7 files changed, 42 insertions(+), 92 deletions(-)
delete mode 100644 zdxt-web-client/zdxt-admin-plus-ui/public/css/index.html
diff --git a/ng/3/nginx.conf b/ng/3/nginx.conf
index 9cc07ce8..a7c8dd9c 100644
--- a/ng/3/nginx.conf
+++ b/ng/3/nginx.conf
@@ -329,7 +329,9 @@ http {
ssl_session_cache shared:SSL:1m;
ssl_session_timeout 5m;
- ssl_ciphers HIGH:!aNULL:!MD5;
+ ssl_protocols TLSv1.2 TLSv1.3;
+
+ ssl_ciphers HIGH:!aNULL:!MD5:!3DES:!RC4:!DES:!EXPORT;
ssl_prefer_server_ciphers on;
root /usr/local/nginx/html;
@@ -343,5 +345,19 @@ http {
index index.html index.htm;
}
+
+ location /efcode20-ent-app/ {
+ proxy_pass http://10.76.108.14:12001/;
+ proxy_set_header Host $http_host;
+ proxy_set_header X-Real-IP $remote_addr;
+ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+ }
+ location /efcode20-enf-app/ {
+ proxy_pass http://10.76.108.14:12003/;
+ proxy_set_header Host $http_host;
+ proxy_set_header X-Real-IP $remote_addr;
+ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+ }
+
}
}
diff --git a/zdxt-common/zdxt-common-satoken/src/main/java/org/dromara/common/satoken/config/SaTokenConfig.java b/zdxt-common/zdxt-common-satoken/src/main/java/org/dromara/common/satoken/config/SaTokenConfig.java
index 61c6b9ac..43755f87 100644
--- a/zdxt-common/zdxt-common-satoken/src/main/java/org/dromara/common/satoken/config/SaTokenConfig.java
+++ b/zdxt-common/zdxt-common-satoken/src/main/java/org/dromara/common/satoken/config/SaTokenConfig.java
@@ -1,6 +1,7 @@
package org.dromara.common.satoken.config;
import cn.dev33.satoken.dao.SaTokenDao;
+import cn.dev33.satoken.jwt.StpLogicJwtForMixin;
import cn.dev33.satoken.jwt.StpLogicJwtForSimple;
import cn.dev33.satoken.stp.StpInterface;
import cn.dev33.satoken.stp.StpLogic;
@@ -24,7 +25,8 @@ public class SaTokenConfig {
@Bean
public StpLogic getStpLogicJwt() {
// Sa-Token 整合 jwt (简单模式)
- return new StpLogicJwtForSimple();
+ //return new StpLogicJwtForSimple();
+ return new StpLogicJwtForMixin();
}
/**
diff --git a/zdxt-common/zdxt-common-satoken/src/main/resources/common-satoken.yml b/zdxt-common/zdxt-common-satoken/src/main/resources/common-satoken.yml
index 95e1b41b..86589582 100644
--- a/zdxt-common/zdxt-common-satoken/src/main/resources/common-satoken.yml
+++ b/zdxt-common/zdxt-common-satoken/src/main/resources/common-satoken.yml
@@ -1,6 +1,10 @@
# 内置配置 不允许修改 如需修改请在 nacos 上写相同配置覆盖
# Sa-Token配置
sa-token:
+ # token有效期（单位：秒） 默认7天
+ timeout: 604800
+ # token最低活跃频率（单位：秒） 默认30分钟无操作则过期
+ active-timeout: 1800
# 允许动态设置 token 有效期
dynamic-active-timeout: true
# 允许从 请求参数 读取 token
@@ -11,3 +15,5 @@ sa-token:
is-read-cookie: false
# token前缀
token-prefix: "Bearer"
+ # jwt签名密钥（Mixin模式必须配置）
+ jwt-secret-key: "zdxt-efcode-jwt-secret-key-2026@Secure!"
diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/LoginController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/LoginController.java
index 7f64b650..7b5827f7 100644
--- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/LoginController.java
+++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/LoginController.java
@@ -28,6 +28,17 @@ public abstract class LoginController {
*/
protected static final String AES_KEY = "1234567898745621";
+
+ /**
+ * App端token固定超时时间（单位：秒） 7天
+ */
+ protected static final long APP_TOKEN_TIMEOUT = 604800;
+
+ /**
+ * App端token活跃超时时间（单位：秒） 30分钟
+ */
+ protected static final long APP_TOKEN_ACTIVE_TIMEOUT = 1800;
+
/**
* 校验登录参数非空
*
@@ -89,6 +100,8 @@ public abstract class LoginController {
}
SaLoginParameter model = new SaLoginParameter();
model.setDeviceType(deviceType);
+ model.setTimeout(APP_TOKEN_TIMEOUT);
+ model.setActiveTimeout(APP_TOKEN_ACTIVE_TIMEOUT);
model.setExtra("clientid", clientId);
LoginHelper.login(loginUser, model);
diff --git a/zdxt-web-client/zdxt-admin-plus-ui/public/css/index.html b/zdxt-web-client/zdxt-admin-plus-ui/public/css/index.html
deleted file mode 100644
index 73505a4f..00000000
--- a/zdxt-web-client/zdxt-admin-plus-ui/public/css/index.html
+++ /dev/null
@@ -1,88 +0,0 @@
-
-
-
- 路书
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application.yml b/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application.yml
index 8d640090..eee4aaa9 100644
--- a/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application.yml
+++ b/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application.yml
@@ -310,7 +310,7 @@ management:
--- # 默认/推荐使用sse推送
sse:
- enabled: true
+ enabled: false
path: /resource/sse
--- # websocket
diff --git a/zdxt-web-server/zdxt-admin-web-server/src/test/java/com/zdxt/service/test/ResetUserPasswordTest.java b/zdxt-web-server/zdxt-admin-web-server/src/test/java/com/zdxt/service/test/ResetUserPasswordTest.java
index acf07882..0ad2f739 100644
--- a/zdxt-web-server/zdxt-admin-web-server/src/test/java/com/zdxt/service/test/ResetUserPasswordTest.java
+++ b/zdxt-web-server/zdxt-admin-web-server/src/test/java/com/zdxt/service/test/ResetUserPasswordTest.java
@@ -50,6 +50,7 @@ public class ResetUserPasswordTest {
/** 重置后的明文密码 */
private static final String NEW_PASSWORD = "szsf@zfjd";
+ //private static final String NEW_PASSWORD = "Szsf@123";
private static final String TEST_CLIENT_ID = "e5cd7e4891bf95d1d19206ce24a7b32e";
@@ -164,7 +165,7 @@ public class ResetUserPasswordTest {
// 1. 执法端的测试用户
List userIds = Arrays.asList(
// TODO: 在此填入需要重置的用户ID
- 7897L, 17608416858L,17608416876L, 17608416904L,17608416912L, 17608416926L,17608416927L, 17608416945L,17608417058L
+ 7897L, 17608416858L,17608416876L, 17608416904L,17608416912L, 17608416926L,17608416927L, 17608416945L,17608417058L,17608642193L
);
// 监督端的报表测试用户