From 5f0481c0676f03586db080a0f80448624ad0b8c9 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期五, 18 三月 2022 01:53:38 +0800
Subject: [PATCH] !157 修复执行"查询当前数据库类型"后未关闭数据库链接，导致当前连接池中活跃连接数达到最大连接数的bug Merge pull request !157 from KonBAI/close_dataSource_conn
---
ruoyi-framework/src/main/java/com/ruoyi/framework/config/SaTokenConfig.java | 35 ++++++++++++++++++++++-------------
1 files changed, 22 insertions(+), 13 deletions(-)
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SaTokenConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SaTokenConfig.java
index 2604245..54f373b 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SaTokenConfig.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SaTokenConfig.java
@@ -5,28 +5,30 @@
import cn.dev33.satoken.jwt.StpLogicJwtForStyle;
import cn.dev33.satoken.router.SaRouter;
import cn.dev33.satoken.stp.StpLogic;
-import cn.dev33.satoken.stp.StpUtil;
-import com.ruoyi.common.utils.LoginUtils;
-import com.ruoyi.common.utils.StringUtils;
+import cn.hutool.core.util.ObjectUtil;
+import com.ruoyi.common.helper.LoginHelper;
import com.ruoyi.framework.config.properties.SecurityProperties;
+import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
/**
* sa-token 閰嶇疆
*
* @author Lion Li
*/
+@RequiredArgsConstructor
@Slf4j
@Configuration
public class SaTokenConfig implements WebMvcConfigurer {
- @Autowired
- private SecurityProperties securityProperties;
+ private final SecurityProperties securityProperties;
/**
* 娉ㄥ唽sa-token鐨勬嫤鎴櫒
@@ -42,15 +44,22 @@
// 鎺掗櫎涓嬩笉闇�瑕佹嫤鎴殑
.notMatch(securityProperties.getExcludes())
.check(() -> {
- if (log.isDebugEnabled()) {
- Long userId = LoginUtils.getUserId();
- if (StringUtils.isNotNull(userId)) {
- log.debug("鍓╀綑鏈夋晥鏃堕棿: {}", StpUtil.getTokenTimeout());
- log.debug("涓存椂鏈夋晥鏃堕棿: {}", StpUtil.getTokenActivityTimeout());
- }
+ Long userId = LoginHelper.getUserId();
+ if (ObjectUtil.isNotNull(userId)) {
+ // 鏈夋晥鐜囧奖鍝� 鐢ㄤ簬涓存椂娴嬭瘯
+ // if (log.isDebugEnabled()) {
+ // log.debug("鍓╀綑鏈夋晥鏃堕棿: {}", StpUtil.getTokenTimeout());
+ // log.debug("涓存椂鏈夋晥鏃堕棿: {}", StpUtil.getTokenActivityTimeout());
+ // }
}
});
- })).addPathPatterns("/**");
+ }) {
+ @SuppressWarnings("all")
+ @Override
+ public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws Exception {
+ LoginHelper.clearCache();
+ }
+ }).addPathPatterns("/**");
registry.addInterceptor(new SaAnnotationInterceptor()).addPathPatterns("/**");
}
--
Gitblit v1.9.3