From 55ce0e34c9183aebe802b91dba88cd54c6eaa48b Mon Sep 17 00:00:00 2001
From: 司猫子 <songshuang@qq.com>
Date: 星期日, 04 二月 2024 09:52:19 +0800
Subject: [PATCH] !480 优化单元格合并后多余内容的清除 * excel插件 优化合并策略 在合适的生命周期完成合并 去除被合并单元格的非首行内容
---
ruoyi-common/ruoyi-common-security/src/main/java/org/dromara/common/security/config/SecurityConfig.java | 12 +-----------
1 files changed, 1 insertions(+), 11 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/org/dromara/common/security/config/SecurityConfig.java b/ruoyi-common/ruoyi-common-security/src/main/java/org/dromara/common/security/config/SecurityConfig.java
index 211cefa..b9283e0 100644
--- a/ruoyi-common/ruoyi-common-security/src/main/java/org/dromara/common/security/config/SecurityConfig.java
+++ b/ruoyi-common/ruoyi-common-security/src/main/java/org/dromara/common/security/config/SecurityConfig.java
@@ -59,9 +59,6 @@
StpUtil.getTokenValue());
}
- // 淇濆瓨鐢ㄦ埛淇℃伅
-// ThreadLocalHolder.set(LoginHelper.LOGIN_USER_KEY, LoginHelper.getLoginUser());
-
// 鏈夋晥鐜囧奖鍝� 鐢ㄤ簬涓存椂娴嬭瘯
// if (log.isDebugEnabled()) {
// log.info("鍓╀綑鏈夋晥鏃堕棿: {}", StpUtil.getTokenTimeout());
@@ -69,14 +66,7 @@
// }
});
- })
-// {
-// @Override
-// public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws Exception {
-// ThreadLocalHolder.clear();
-// }
-// }
- ).addPathPatterns("/**")
+ })).addPathPatterns("/**")
// 鎺掗櫎涓嶉渶瑕佹嫤鎴殑璺緞
.excludePathPatterns(securityProperties.getExcludes());
}
--
Gitblit v1.9.3