From fef78fa5caa8a6cb4a55e6908acc3ffe3e589800 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 23 四月 2024 14:48:25 +0800
Subject: [PATCH] 1、完善系统架构，增加了分布式web文件模块； 2、完善部分代码。
---
pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/config/WebFilterConfiguration.java | 12 +-----------
pms-parent/pms-common/src/main/java/com/dy/common/webListener/ConfigListener.java | 6 ++++++
pms-parent/pms-common/src/main/java/com/dy/common/webListener/GenerateIdSetSuffixListener.java | 4 ++++
pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/role/RoleSv.java | 1 -
pms-parent/pms-common/src/main/java/com/dy/common/webFilter/UserTokenFilter.java | 4 ++++
pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/config/WebListenerConfiguration.java | 16 ++--------------
6 files changed, 17 insertions(+), 26 deletions(-)
diff --git a/pms-parent/pms-common/src/main/java/com/dy/common/webFilter/UserTokenFilter.java b/pms-parent/pms-common/src/main/java/com/dy/common/webFilter/UserTokenFilter.java
index 23143c5..15c7f37 100644
--- a/pms-parent/pms-common/src/main/java/com/dy/common/webFilter/UserTokenFilter.java
+++ b/pms-parent/pms-common/src/main/java/com/dy/common/webFilter/UserTokenFilter.java
@@ -13,6 +13,10 @@
import java.io.IOException;
import java.io.PrintWriter;
+/**
+ * 鐧诲綍鐢ㄦ埛token杩囨睙鍣�
+ * 姝ょ被娌℃湁娉ㄨВ @Component 鐨勪互鍦ㄩ泦鎴愬叾鐨勫瓙妯″潡涓姞鍏ユ杩囨睙鍣�
+ */
@Slf4j
public class UserTokenFilter implements Filter {
@Override
diff --git a/pms-parent/pms-common/src/main/java/com/dy/common/webListener/ConfigListener.java b/pms-parent/pms-common/src/main/java/com/dy/common/webListener/ConfigListener.java
index bb11d2e..0c0ed91 100644
--- a/pms-parent/pms-common/src/main/java/com/dy/common/webListener/ConfigListener.java
+++ b/pms-parent/pms-common/src/main/java/com/dy/common/webListener/ConfigListener.java
@@ -10,6 +10,12 @@
import java.io.InputStream;
import java.net.URL;
+
+/**
+ * 鍔犺浇config.xml閰嶇疆鐨勫伐鍏风被
+ * 姝ょ被娌℃湁娉ㄨВ @Component 鎵�浠ュ湪闆嗘垚鍏剁殑瀛愭ā鍧椾腑鍔犲叆姝よ繃姹熷櫒
+ * 鍦╯pringboot涓竴鑸笉鐢╟onfig.xml閰嶇疆
+ */
@Slf4j
public class ConfigListener implements ServletContextListener {
diff --git a/pms-parent/pms-common/src/main/java/com/dy/common/webListener/GenerateIdSetSuffixListener.java b/pms-parent/pms-common/src/main/java/com/dy/common/webListener/GenerateIdSetSuffixListener.java
index f64190d..edbada1 100644
--- a/pms-parent/pms-common/src/main/java/com/dy/common/webListener/GenerateIdSetSuffixListener.java
+++ b/pms-parent/pms-common/src/main/java/com/dy/common/webListener/GenerateIdSetSuffixListener.java
@@ -7,6 +7,10 @@
import jakarta.servlet.ServletContextListener;
import lombok.extern.slf4j.Slf4j;
+/**
+ * 鍔犺浇骞惰缃ā鍧楁暟鎹簱涓婚敭ID鐨勫悗缂�鐨勮繃婊ゅ櫒
+ * 姝ょ被娌℃湁娉ㄨВ @Component 鎵�浠ュ湪闆嗘垚鍏剁殑瀛愭ā鍧椾腑鍔犲叆姝よ繃姹熷櫒
+ */
@Slf4j
public class GenerateIdSetSuffixListener implements ServletContextListener {
diff --git a/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/config/WebFilterConfiguration.java b/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/config/WebFilterConfiguration.java
index 43ab770..6cb533e 100644
--- a/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/config/WebFilterConfiguration.java
+++ b/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/config/WebFilterConfiguration.java
@@ -1,6 +1,5 @@
package com.dy.pmsBase.config;
-//import com.dy.common.webFilter.DevOfDataSourceNameSetFilter;
import com.dy.common.webFilter.UserTokenFilter;
import jakarta.servlet.Filter;
import org.springframework.beans.factory.annotation.Value;
@@ -13,26 +12,17 @@
@Value("${pms.global.dev}")
public String isDevStage ;//鏄惁涓哄紑鍙戦樁娈�
-// @Value("${pipIrr.global.dsName}")
-// public String dsName ;//寮�鍙戦樁娈电殑鏁版嵁婧愬悕绉�
/**
- * DevOfDataSourceNameSetFilter涓嶶serTokenFilter鍙兘涓�涓閰嶇疆涓婏紝
- * 鎵�浠ヤ粬浠殑order閮芥槸1
+ * 鍚姩椤哄簭
*/
private static final int order_UserTokenFilter = 1 ;//涓庝笅闈�
- private static final int order_DevOfDataSourceNameSetFilter = 1 ;
@Bean
public FilterRegistrationBean<? extends Filter> RegFilter() {
FilterRegistrationBean<Filter> filterRegistrationBean = new FilterRegistrationBean<>();
if(this.isDevStage != null && !this.isDevStage.trim().equals("") && this.isDevStage.trim().equalsIgnoreCase("true")){
-// filterRegistrationBean.setFilter(new DevOfDataSourceNameSetFilter());
-// filterRegistrationBean.addUrlPatterns("/*");//閰嶇疆杩囨护瑙勫垯
-// filterRegistrationBean.addInitParameter("dataSourceName",dsName);//璁剧疆init鍙傛暟
-// filterRegistrationBean.setName("DevOfDataSourceNameSetFilter");//璁剧疆杩囨护鍣ㄥ悕绉�
-// filterRegistrationBean.setOrder(order_DevOfDataSourceNameSetFilter);//鎵ц娆″簭
}else{
filterRegistrationBean.setFilter(new UserTokenFilter());
filterRegistrationBean.addUrlPatterns("/*");//閰嶇疆杩囨护瑙勫垯
diff --git a/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/config/WebListenerConfiguration.java b/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/config/WebListenerConfiguration.java
index eb55338..f7435b6 100644
--- a/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/config/WebListenerConfiguration.java
+++ b/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/config/WebListenerConfiguration.java
@@ -14,10 +14,9 @@
*/
//private static final int order_config = 0 ;
private static final int order_idSetSuffix = 1 ;
- //private static final int order_init = 2 ;
/*
- * 瑙ｆ瀽鍚勭***.config閰嶇疆鐨凜onfigListener锛屾殏鏃朵笉閲囩敤姝ょ閰嶇疆鏂瑰紡
+ * 瑙ｆ瀽鍚勭***config.xml閰嶇疆鐨凜onfigListener锛屽綋鍓峴pringboot宸ョ▼鏆傛椂涓嶉噰鐢ㄦ绉嶉厤缃柟寮�
*
@Bean
public ConfigListener getGlConfigListener(){
@@ -41,22 +40,11 @@
* @return 娉ㄥ唽Bean
*/
@Bean
- public ServletListenerRegistrationBean<? extends ServletContextListener> regSsoListener() {
+ public ServletListenerRegistrationBean<? extends ServletContextListener> regIdSuffixListener() {
ServletListenerRegistrationBean<GenerateIdSetSuffixListener> listenerRegistrationBean = new ServletListenerRegistrationBean<>();
listenerRegistrationBean.setListener(new GenerateIdSetSuffixListener());
listenerRegistrationBean.setOrder(order_idSetSuffix);
return listenerRegistrationBean;
}
-// /**
-// * 鍐呴儴鎻愪緵listener锛岃listener鍦ㄧ郴缁熷惎鍔ㄦ椂锛屽垵濮嬪寲鏁版嵁搴撴暟鎹�
-// * @return 娉ㄥ唽Bean
-// */
-// @Bean
-// public ServletListenerRegistrationBean<? extends ServletContextListener> regInitListener() {
-// ServletListenerRegistrationBean<InitListener> listenerRegistrationBean = new ServletListenerRegistrationBean<>();
-// listenerRegistrationBean.setListener(new InitListener());
-// listenerRegistrationBean.setOrder(order_init);
-// return listenerRegistrationBean;
-// }
}
diff --git a/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/role/RoleSv.java b/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/role/RoleSv.java
index e3a95c6..ce9d298 100644
--- a/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/role/RoleSv.java
+++ b/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/role/RoleSv.java
@@ -2,7 +2,6 @@
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.dy.common.webUtil.QueryResultVo;
-import com.dy.pmsBase.role.QueryVo;
import com.dy.pmsGlobal.daoBa.BaPrivilegeMapper;
import com.dy.pmsGlobal.daoBa.BaRoleMapper;
import com.dy.pmsGlobal.daoBa.BaRolePrivilegeMapper;
--
Gitblit v1.8.0