From 48ff01a24c2b4879b754a0bd671729d903279198 Mon Sep 17 00:00:00 2001 From: ganhao Date: Wed, 13 May 2026 15:11:44 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=BE=E5=BC=80=E7=99=BB=E5=BD=95=E8=AE=A4?= =?UTF-8?q?=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/AppEnterpriseLoginServiceImpl.java | 8 +++- .../src/main/resources/application-dev.yml | 6 +-- .../src/main/resources/application.yml | 46 +++++++++++-------- 3 files changed, 35 insertions(+), 25 deletions(-) diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/enterprise/impl/AppEnterpriseLoginServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/enterprise/impl/AppEnterpriseLoginServiceImpl.java index f799b7f9..2104c3f6 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/enterprise/impl/AppEnterpriseLoginServiceImpl.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/enterprise/impl/AppEnterpriseLoginServiceImpl.java @@ -27,6 +27,7 @@ import org.dromara.common.core.domain.model.LoginUser; import org.dromara.common.core.exception.base.BaseException; import org.dromara.common.core.utils.DateUtils; import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.redis.utils.RedisUtils; import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.system.mapper.SysUserPostMapper; import org.dromara.system.mapper.SysUserRoleMapper; @@ -485,7 +486,6 @@ public class AppEnterpriseLoginServiceImpl implements IAppEnterpriseLoginService loginUser.setUsername(user.getLoginName()); loginUser.setNickname(user.getUserName()); loginUser.setUserType(user.getUserType()); - loginUser.setDeptId(String.valueOf(user.getDeptId())); loginUser.setTenantId("000000"); loginUser.setDeptId(enterpriseInformation.getId()); loginUser.setDeptName(enterpriseInformation.getEnterpriseName()); @@ -499,7 +499,11 @@ public class AppEnterpriseLoginServiceImpl implements IAppEnterpriseLoginService LoginHelper.login(loginUser, model); String token = StpUtil.getTokenValue(); - log.info("生成token成功: userId={}, token={}", user.getUserId(), token); + + // 调试：检查 Token 是否成功存储到 Redis + long timeout = StpUtil.getTokenTimeout(); + log.info("生成token成功: userId={}, token={}, timeout={}秒", user.getUserId(), token, timeout); + log.info("Token session key: login:token:{}", token); return token; } diff --git a/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-dev.yml b/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-dev.yml index ce484129..0460997b 100644 --- a/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-dev.yml +++ b/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-dev.yml @@ -280,9 +280,9 @@ justauth: client-secret: 1f7d08**********5b7**********29e redirect-uri: ${justauth.address}/social-callback?source=gitea -security: - excludes: - - /** +#security: +# excludes: +# - /** #深i企对接密钥 测试环境 siq: 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 a45e68da..09a1b30d 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 @@ -131,7 +131,7 @@ security: # 多租户配置 tenant: # 是否开启 - enable: true + enable: false # 排除表 excludes: - sys_menu @@ -225,30 +225,23 @@ springdoc: api-docs: # 是否开启接口文档 enabled: true - components: - securitySchemes: - Authorization: - type: apiKey - in: header - name: Authorization - description: "Bearer Token，格式: Bearer {token}" - clientid: - type: apiKey - in: header - name: clientid - description: "客户端ID" + info: # 标题 - title: '标题：zdxt-Vue-Plus多租户管理系统_接口文档' + title: '执法监督码接口文档' # 描述 - description: '描述：用于管理集团旗下公司的人员信息,具体包括XXX,XXX模块...' + description: '执法监督码系统接口文档' # 版本 version: '版本号: ${project.version}' - # 作者信息 - contact: - name: Lion Li - email: crazylionli@163.com - url: https://gitee.com/dromara/zdxt-Vue-Plus + # Swagger UI 安全认证配置（Token 登录入口） + components: + security-schemes: + Authorization: + type: HTTP + scheme: bearer + bearer-format: JWT + description: "请输入 Token，格式：Bearer {token} 或直接输入 {token}" + #这里定义了两个分组，可定义多个，也可以不定义 group-configs: - group: 1、执法监督码 @@ -326,3 +319,16 @@ warm-flow: sjdm: profile: /usr/local/uploadPath qr_code_url: /usr/local/uploads/zfjd_logo.png + +# Spring Boot RestTemplate 超时配置 +spring: + mvc: + async: + request-timeout: 30000 # 30秒 + +# 如果需要自定义 RestTemplate Bean，可以添加： +http: + client: + connect-timeout: 10000 # 连接超时：5秒 + read-timeout: 10000 # 读取超时：30秒 + write-timeout: 10000 # 写入超时：30秒