From 87e74fc1137cb50492005590086894d5a1ca0512 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 20 八月 2024 21:00:29 +0800
Subject: [PATCH] 优化代码
---
pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/resources/application.yml | 2
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/resources/application.yml | 3
pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/resources/application.yml | 2
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/config/WebListenerConfiguration.java | 23 ----
pipIrr-platform/pipIrr-web/pipIrr-web-gis/src/main/resources/application.yml | 2
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/application.yml | 2
pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/config/WebListenerConfiguration.java | 21 ----
pipIrr-platform/pipIrr-web/pipIrr-web-operation/src/main/java/com/dy/pipIrrOperation/config/WebListenerConfiguration.java | 22 ----
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/util/InitListener.java | 3
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/config/WebListenerConfiguration.java | 22 ----
pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/resources/application.yml | 2
pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/config/WebListenerConfiguration.java | 21 ----
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/OrgListenerSupport.java | 3
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/resources/application.yml | 2
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/config/WebListenerConfiguration.java | 21 ----
pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/resources/application.yml | 2
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/resources/application.yml | 2
/dev/null | 49 ---------
pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/config/WebListenerConfiguration.java | 21 ----
pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/config/WebListenerConfiguration.java | 21 ----
pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/config/WebListenerConfiguration.java | 21 ----
pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/resources/application.yml | 3
pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/util/SsoListener.java | 1
pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/resources/application.yml | 2
pipIrr-platform/pipIrr-web/pipIrr-web-operation/src/main/resources/application.yml | 2
25 files changed, 6 insertions(+), 269 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/OrgListenerSupport.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/OrgListenerSupport.java
index d4c1c14..2e1fdfc 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/OrgListenerSupport.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/OrgListenerSupport.java
@@ -1,7 +1,6 @@
package com.dy.pipIrrGlobal.util;
import com.dy.common.util.ConfigXml;
-import com.dy.common.webListener.ConfigListener;
import org.jdom2.Document;
import org.springframework.boot.context.event.ApplicationReadyEvent;
@@ -27,7 +26,7 @@
@SuppressWarnings("unused ")
protected void init(ApplicationReadyEvent event) {
try {
- URL configFileURL = ConfigListener.class.getResource("/init-config.xml");
+ URL configFileURL = OrgListenerSupport.class.getResource("/init-config.xml");
ConfigXml configXml = new ConfigXml();
Document doc = configXml.createDom(configFileURL);
this.doInit(configXml, doc);
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/config/config-global.xml b/pipIrr-platform/pipIrr-global/src/main/resources/config/config-global.xml
deleted file mode 100644
index b34bb13..0000000
--- a/pipIrr-platform/pipIrr-global/src/main/resources/config/config-global.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE config>
-<config>
- <sys.name>${sys.name}</sys.name>
-</config>
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/config/config.properties b/pipIrr-platform/pipIrr-global/src/main/resources/config/config.properties
deleted file mode 100644
index d6c00b4..0000000
--- a/pipIrr-platform/pipIrr-global/src/main/resources/config/config.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-spring.http.encoding.enabled=true
-sys.name=鍏冭皨绠＄亴鐩戞帶绠＄悊绯荤粺
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/application.yml b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/application.yml
index 4d129e5..f45a73c 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/application.yml
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/application.yml
@@ -20,5 +20,3 @@
context-parameters:
#GenerateIdSetSuffixListener涓簲鐢紝鍙栧�艰寖鍥存槸0-99
idSuffix: ${pipIrr.mw.idSuffix}
- #ConfigListener涓簲鐢�
- #configFileNames: config-global.xml,config-demo.xml
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/config/WebListenerConfiguration.java b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/config/WebListenerConfiguration.java
index fd7f421..a3451e3 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/config/WebListenerConfiguration.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/config/WebListenerConfiguration.java
@@ -18,29 +18,8 @@
/**
* 鍚姩椤哄簭
*/
- //private static final int order_config = 0 ;
private static final int order_idSetSuffix = 1 ;
- //private static final int order_init = 2 ;
- /*
- * 瑙ｆ瀽鍚勭***.config閰嶇疆鐨凜onfigListener锛屾殏鏃朵笉閲囩敤姝ょ閰嶇疆鏂瑰紡
- *
- @Bean
- public ConfigListener getGlConfigListener(){
- return new ConfigListener() ;
- }
- /**
- * 澶栭儴鎻愪緵Listener
- * @param listener 澶栭儴鎻愪緵Listener
- * @return 娉ㄥ唽Bean
- @Bean
- public ServletListenerRegistrationBean<? extends ServletContextListener> regConfigListener(ConfigListener listener) {
- ServletListenerRegistrationBean<ConfigListener> listenerRegistrationBean = new ServletListenerRegistrationBean<>();
- listenerRegistrationBean.setListener(listener);
- listenerRegistrationBean.setOrder(order_config);
- return listenerRegistrationBean;
- }
- */
/**
* 鍐呴儴鎻愪緵listener锛岃listener鍦ㄧ郴缁熷惎鍔ㄦ椂锛屾牴鎹厤缃� 璁剧疆ID浜х敓鍣ㄧ殑鍚庣紑
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/resources/application.yml b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/resources/application.yml
index aae91ff..cbdce6c 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/resources/application.yml
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/resources/application.yml
@@ -14,5 +14,3 @@
context-parameters:
#GenerateIdSetSuffixListener涓簲鐢紝鍙栧�艰寖鍥存槸0-99
idSuffix: ${pipIrr.app.idSuffix}
- #ConfigListener涓簲鐢�
- #configFileNames: config-global.xml,config-demo.xml
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/config/WebListenerConfiguration.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/config/WebListenerConfiguration.java
index 25d1a9c..87b833b 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/config/WebListenerConfiguration.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/config/WebListenerConfiguration.java
@@ -1,7 +1,6 @@
package com.dy.pipIrrBase.config;
import com.dy.common.webListener.GenerateIdSetSuffixListener;
-import com.dy.pipIrrBase.util.InitListener;
import jakarta.servlet.ServletContextListener;
import org.springframework.boot.web.servlet.ServletListenerRegistrationBean;
import org.springframework.context.annotation.Bean;
@@ -13,29 +12,7 @@
/**
* 鍚姩椤哄簭
*/
- //private static final int order_config = 0 ;
private static final int order_idSetSuffix = 1 ;
- //private static final int order_init = 2 ;
-
- /*
- * 瑙ｆ瀽鍚勭***.config閰嶇疆鐨凜onfigListener锛屾殏鏃朵笉閲囩敤姝ょ閰嶇疆鏂瑰紡
- *
- @Bean
- public ConfigListener getGlConfigListener(){
- return new ConfigListener() ;
- }
- /**
- * 澶栭儴鎻愪緵Listener
- * @param listener 澶栭儴鎻愪緵Listener
- * @return 娉ㄥ唽Bean
- @Bean
- public ServletListenerRegistrationBean<? extends ServletContextListener> regConfigListener(ConfigListener listener) {
- ServletListenerRegistrationBean<ConfigListener> listenerRegistrationBean = new ServletListenerRegistrationBean<>();
- listenerRegistrationBean.setListener(listener);
- listenerRegistrationBean.setOrder(order_config);
- return listenerRegistrationBean;
- }
- */
/**
* 鍐呴儴鎻愪緵listener锛岃listener鍦ㄧ郴缁熷惎鍔ㄦ椂锛屾牴鎹厤缃� 璁剧疆ID浜х敓鍣ㄧ殑鍚庣紑
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/util/InitListener.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/util/InitListener.java
index 6c87c31..6bd3886 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/util/InitListener.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/util/InitListener.java
@@ -5,7 +5,6 @@
import com.dy.common.mybatis.envm.Disabled;
import com.dy.common.util.ConfigXml;
import com.dy.common.util.MD5;
-import com.dy.common.webListener.ConfigListener;
import com.dy.pipIrrGlobal.daoBa.BaDistrictMapper;
import com.dy.pipIrrGlobal.daoBa.BaSettingsMapper;
import com.dy.pipIrrGlobal.daoBa.BaUserMapper;
@@ -89,7 +88,7 @@
@SuppressWarnings("unused ")
private void init(ApplicationReadyEvent event){
try {
- URL configFileURL = ConfigListener.class.getResource("/init-config.xml" );
+ URL configFileURL = InitListener.class.getResource("/init-config.xml" );
ConfigXml configXml = new ConfigXml() ;
Document doc = configXml.createDom(configFileURL) ;
this.doInit(configXml, doc);
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/resources/application.yml b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/resources/application.yml
index 2a6f76b..d65eff6 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/resources/application.yml
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/resources/application.yml
@@ -17,5 +17,3 @@
context-parameters:
#GenerateIdSetSuffixListener涓簲鐢紝鍙栧�艰寖鍥存槸0-99
idSuffix: ${pipIrr.base.idSuffix}
- #ConfigListener涓簲鐢�
- #configFileNames: config-global.xml,config-demo.xml
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-gis/src/main/resources/application.yml b/pipIrr-platform/pipIrr-web/pipIrr-web-gis/src/main/resources/application.yml
index 9945c2b..b81536f 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-gis/src/main/resources/application.yml
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-gis/src/main/resources/application.yml
@@ -14,5 +14,3 @@
context-parameters:
#GenerateIdSetSuffixListener涓簲鐢紝鍙栧�艰寖鍥存槸0-99
idSuffix: ${pipIrr.gis.idSuffix}
- #ConfigListener涓簲鐢�
- #configFileNames: config-global.xml,config-demo.xml
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/config/WebListenerConfiguration.java b/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/config/WebListenerConfiguration.java
index b1aec52..0971a1d 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/config/WebListenerConfiguration.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/config/WebListenerConfiguration.java
@@ -18,29 +18,8 @@
/**
* 鍚姩椤哄簭
*/
- //private static final int order_config = 0 ;
private static final int order_idSetSuffix = 1 ;
- //private static final int order_init = 2 ;
- /*
- * 瑙ｆ瀽鍚勭***.config閰嶇疆鐨凜onfigListener锛屾殏鏃朵笉閲囩敤姝ょ閰嶇疆鏂瑰紡
- *
- @Bean
- public ConfigListener getGlConfigListener(){
- return new ConfigListener() ;
- }
- /**
- * 澶栭儴鎻愪緵Listener
- * @param listener 澶栭儴鎻愪緵Listener
- * @return 娉ㄥ唽Bean
- @Bean
- public ServletListenerRegistrationBean<? extends ServletContextListener> regConfigListener(ConfigListener listener) {
- ServletListenerRegistrationBean<ConfigListener> listenerRegistrationBean = new ServletListenerRegistrationBean<>();
- listenerRegistrationBean.setListener(listener);
- listenerRegistrationBean.setOrder(order_config);
- return listenerRegistrationBean;
- }
- */
/**
* 鍐呴儴鎻愪緵listener锛岃listener鍦ㄧ郴缁熷惎鍔ㄦ椂锛屾牴鎹厤缃� 璁剧疆ID浜х敓鍣ㄧ殑鍚庣紑
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/resources/application.yml b/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/resources/application.yml
index 607ed8e..bb3c263 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/resources/application.yml
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/resources/application.yml
@@ -14,5 +14,3 @@
context-parameters:
#GenerateIdSetSuffixListener涓簲鐢紝鍙栧�艰寖鍥存槸0-99
idSuffix: ${pipIrr.irrigate.idSuffix}
- #ConfigListener涓簲鐢�
- #configFileNames: config-global.xml,config-demo.xml
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-operation/src/main/java/com/dy/pipIrrOperation/config/WebListenerConfiguration.java b/pipIrr-platform/pipIrr-web/pipIrr-web-operation/src/main/java/com/dy/pipIrrOperation/config/WebListenerConfiguration.java
index ff4750f..0ba7652 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-operation/src/main/java/com/dy/pipIrrOperation/config/WebListenerConfiguration.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-operation/src/main/java/com/dy/pipIrrOperation/config/WebListenerConfiguration.java
@@ -18,29 +18,9 @@
/**
* 鍚姩椤哄簭
*/
- //private static final int order_config = 0 ;
private static final int order_idSetSuffix = 1 ;
- //private static final int order_init = 2 ;
- /*
- * 瑙ｆ瀽鍚勭***.config閰嶇疆鐨凜onfigListener锛屾殏鏃朵笉閲囩敤姝ょ閰嶇疆鏂瑰紡
- *
- @Bean
- public ConfigListener getGlConfigListener(){
- return new ConfigListener() ;
- }
- /**
- * 澶栭儴鎻愪緵Listener
- * @param listener 澶栭儴鎻愪緵Listener
- * @return 娉ㄥ唽Bean
- @Bean
- public ServletListenerRegistrationBean<? extends ServletContextListener> regConfigListener(ConfigListener listener) {
- ServletListenerRegistrationBean<ConfigListener> listenerRegistrationBean = new ServletListenerRegistrationBean<>();
- listenerRegistrationBean.setListener(listener);
- listenerRegistrationBean.setOrder(order_config);
- return listenerRegistrationBean;
- }
- */
+
/**
* 鍐呴儴鎻愪緵listener锛岃listener鍦ㄧ郴缁熷惎鍔ㄦ椂锛屾牴鎹厤缃� 璁剧疆ID浜х敓鍣ㄧ殑鍚庣紑
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-operation/src/main/resources/application.yml b/pipIrr-platform/pipIrr-web/pipIrr-web-operation/src/main/resources/application.yml
index 4e23dc7..3294b13 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-operation/src/main/resources/application.yml
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-operation/src/main/resources/application.yml
@@ -14,5 +14,3 @@
context-parameters:
#GenerateIdSetSuffixListener涓簲鐢紝鍙栧�艰寖鍥存槸0-99
idSuffix: ${pipIrr.operation.idSuffix}
- #ConfigListener涓簲鐢�
- #configFileNames: config-global.xml,config-demo.xml
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/config/WebListenerConfiguration.java b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/config/WebListenerConfiguration.java
index a112c8f..a4b70b5 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/config/WebListenerConfiguration.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/config/WebListenerConfiguration.java
@@ -18,29 +18,8 @@
/**
* 鍚姩椤哄簭
*/
- //private static final int order_config = 0 ;
private static final int order_idSetSuffix = 1 ;
- //private static final int order_init = 2 ;
- /*
- * 瑙ｆ瀽鍚勭***.config閰嶇疆鐨凜onfigListener锛屾殏鏃朵笉閲囩敤姝ょ閰嶇疆鏂瑰紡
- *
- @Bean
- public ConfigListener getGlConfigListener(){
- return new ConfigListener() ;
- }
- /**
- * 澶栭儴鎻愪緵Listener
- * @param listener 澶栭儴鎻愪緵Listener
- * @return 娉ㄥ唽Bean
- @Bean
- public ServletListenerRegistrationBean<? extends ServletContextListener> regConfigListener(ConfigListener listener) {
- ServletListenerRegistrationBean<ConfigListener> listenerRegistrationBean = new ServletListenerRegistrationBean<>();
- listenerRegistrationBean.setListener(listener);
- listenerRegistrationBean.setOrder(order_config);
- return listenerRegistrationBean;
- }
- */
/**
* 鍐呴儴鎻愪緵listener锛岃listener鍦ㄧ郴缁熷惎鍔ㄦ椂锛屾牴鎹厤缃� 璁剧疆ID浜х敓鍣ㄧ殑鍚庣紑
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/resources/application.yml b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/resources/application.yml
index ceb5374..efaf3ed 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/resources/application.yml
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/resources/application.yml
@@ -14,5 +14,3 @@
context-parameters:
#GenerateIdSetSuffixListener涓簲鐢紝鍙栧�艰寖鍥存槸0-99
idSuffix: ${pipIrr.project.idSuffix}
- #ConfigListener涓簲鐢�
- #configFileNames: config-global.xml,config-demo.xml
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/config/WebListenerConfiguration.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/config/WebListenerConfiguration.java
index 11430f0..e7c40f5 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/config/WebListenerConfiguration.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/config/WebListenerConfiguration.java
@@ -18,29 +18,8 @@
/**
* 鍚姩椤哄簭
*/
- //private static final int order_config = 0 ;
private static final int order_idSetSuffix = 1 ;
- //private static final int order_init = 2 ;
- /*
- * 瑙ｆ瀽鍚勭***.config閰嶇疆鐨凜onfigListener锛屾殏鏃朵笉閲囩敤姝ょ閰嶇疆鏂瑰紡
- *
- @Bean
- public ConfigListener getGlConfigListener(){
- return new ConfigListener() ;
- }
- /**
- * 澶栭儴鎻愪緵Listener
- * @param listener 澶栭儴鎻愪緵Listener
- * @return 娉ㄥ唽Bean
- @Bean
- public ServletListenerRegistrationBean<? extends ServletContextListener> regConfigListener(ConfigListener listener) {
- ServletListenerRegistrationBean<ConfigListener> listenerRegistrationBean = new ServletListenerRegistrationBean<>();
- listenerRegistrationBean.setListener(listener);
- listenerRegistrationBean.setOrder(order_config);
- return listenerRegistrationBean;
- }
- */
/**
* 鍐呴儴鎻愪緵listener锛岃listener鍦ㄧ郴缁熷惎鍔ㄦ椂锛屾牴鎹厤缃� 璁剧疆ID浜х敓鍣ㄧ殑鍚庣紑
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/resources/application.yml b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/resources/application.yml
index b6c6612..a5977d1 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/resources/application.yml
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/resources/application.yml
@@ -14,5 +14,3 @@
context-parameters:
#GenerateIdSetSuffixListener涓簲鐢紝鍙栧�艰寖鍥存槸0-99
idSuffix: ${pipIrr.remote.idSuffix}
- #ConfigListener涓簲鐢�
- #configFileNames: config-global.xml,config-demo.xml
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/config/WebListenerConfiguration.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/config/WebListenerConfiguration.java
index 18da8b1..ff2e2ff 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/config/WebListenerConfiguration.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/config/WebListenerConfiguration.java
@@ -18,29 +18,7 @@
/**
* 鍚姩椤哄簭
*/
- //private static final int order_config = 0 ;
private static final int order_idSetSuffix = 1 ;
- //private static final int order_init = 2 ;
-
- /*
- * 瑙ｆ瀽鍚勭***.config閰嶇疆鐨凜onfigListener锛屾殏鏃朵笉閲囩敤姝ょ閰嶇疆鏂瑰紡
- *
- @Bean
- public ConfigListener getGlConfigListener(){
- return new ConfigListener() ;
- }
- /**
- * 澶栭儴鎻愪緵Listener
- * @param listener 澶栭儴鎻愪緵Listener
- * @return 娉ㄥ唽Bean
- @Bean
- public ServletListenerRegistrationBean<? extends ServletContextListener> regConfigListener(ConfigListener listener) {
- ServletListenerRegistrationBean<ConfigListener> listenerRegistrationBean = new ServletListenerRegistrationBean<>();
- listenerRegistrationBean.setListener(listener);
- listenerRegistrationBean.setOrder(order_config);
- return listenerRegistrationBean;
- }
- */
/**
* 鍐呴儴鎻愪緵listener锛岃listener鍦ㄧ郴缁熷惎鍔ㄦ椂锛屾牴鎹厤缃� 璁剧疆ID浜х敓鍣ㄧ殑鍚庣紑
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/resources/application.yml b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/resources/application.yml
index 20b24f8..a69e2e6 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/resources/application.yml
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/resources/application.yml
@@ -14,8 +14,7 @@
context-parameters:
#GenerateIdSetSuffixListener涓簲鐢紝鍙栧�艰寖鍥存槸0-99
idSuffix: ${pipIrr.sell.idSuffix}
- #ConfigListener涓簲鐢�
- #configFileNames: config-global.xml,config-demo.xml
+
#闃块噷鐭俊鏈嶅姟
aliyun:
sms:
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/config/WebListenerConfiguration.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/config/WebListenerConfiguration.java
deleted file mode 100644
index 41a4699..0000000
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/config/WebListenerConfiguration.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.dy.sso.config;
-
-import com.dy.common.webListener.ConfigListener;
-import jakarta.servlet.ServletContextListener;
-import org.springframework.boot.web.servlet.ServletListenerRegistrationBean;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-@SuppressWarnings("unchecked")//涓嶅姞缂栬緫鏃惰鍛婏細鈥滀娇鐢ㄤ簡鏈粡妫�鏌ユ垨涓嶅畨鍏ㄧ殑鎿嶄綔銆傗��
-public class WebListenerConfiguration {
-
- /**
- * 鍚姩椤哄簭
- */
- private static final int order_config = 1 ;
- private static final int order_sso = 2 ;
-
- @Bean
- public ConfigListener getGlConfigListener(){
- return new ConfigListener() ;
- }
-
- /**
- * 澶栭儴鎻愪緵Listener
- * @param listener 澶栭儴鎻愪緵Listener
- * @return 娉ㄥ唽Bean
- */
- @Bean
- public ServletListenerRegistrationBean<? extends ServletContextListener> regConfigListener(ConfigListener listener) {
- ServletListenerRegistrationBean<ConfigListener> listenerRegistrationBean = new ServletListenerRegistrationBean<>();
- listenerRegistrationBean.setListener(listener);
- listenerRegistrationBean.setOrder(order_config);
- return listenerRegistrationBean;
- }
-
- /**
- * 鍐呴儴鎻愪緵listener
- * @return 娉ㄥ唽Bean
- @Bean
- public ServletListenerRegistrationBean<? extends ServletContextListener> reqSsoListener() {
- ServletListenerRegistrationBean<SsoListener> listenerRegistrationBean = new ServletListenerRegistrationBean<>();
- SsoListener listener = new SsoListener();
- listenerRegistrationBean.setListener(listener);
- listenerRegistrationBean.setOrder(order_sso);
- return listenerRegistrationBean;
- }
- */
-}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/util/SsoListener.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/util/SsoListener.java
index 5f6339c..a785e69 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/util/SsoListener.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/util/SsoListener.java
@@ -17,6 +17,7 @@
} catch (InterruptedException e) {
e.printStackTrace();
} finally {
+ //鍒濆鍖栨満鏋�
super.init();
}
}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/resources/application.yml b/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/resources/application.yml
index 0b25e4e..7b19f19 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/resources/application.yml
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/resources/application.yml
@@ -14,5 +14,3 @@
context-parameters:
#GenerateIdSetSuffixListener涓簲鐢紝鍙栧�艰寖鍥存槸0-99
IdSuffix: ${pipIrr.sso.IdSuffix}
- #ConfigListener涓簲鐢�
- configFileNames: config-global.xml,config-sso.xml
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/config/WebListenerConfiguration.java b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/config/WebListenerConfiguration.java
index 3d7d4a4..acb16cb 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/config/WebListenerConfiguration.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/config/WebListenerConfiguration.java
@@ -18,29 +18,8 @@
/**
* 鍚姩椤哄簭
*/
- //private static final int order_config = 0 ;
private static final int order_idSetSuffix = 1 ;
- //private static final int order_init = 2 ;
- /*
- * 瑙ｆ瀽鍚勭***.config閰嶇疆鐨凜onfigListener锛屾殏鏃朵笉閲囩敤姝ょ閰嶇疆鏂瑰紡
- *
- @Bean
- public ConfigListener getGlConfigListener(){
- return new ConfigListener() ;
- }
- /**
- * 澶栭儴鎻愪緵Listener
- * @param listener 澶栭儴鎻愪緵Listener
- * @return 娉ㄥ唽Bean
- @Bean
- public ServletListenerRegistrationBean<? extends ServletContextListener> regConfigListener(ConfigListener listener) {
- ServletListenerRegistrationBean<ConfigListener> listenerRegistrationBean = new ServletListenerRegistrationBean<>();
- listenerRegistrationBean.setListener(listener);
- listenerRegistrationBean.setOrder(order_config);
- return listenerRegistrationBean;
- }
- */
/**
* 鍐呴儴鎻愪緵listener锛岃listener鍦ㄧ郴缁熷惎鍔ㄦ椂锛屾牴鎹厤缃� 璁剧疆ID浜х敓鍣ㄧ殑鍚庣紑
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/resources/application.yml b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/resources/application.yml
index 5e27163..3586b0f 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/resources/application.yml
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/resources/application.yml
@@ -14,5 +14,3 @@
context-parameters:
#GenerateIdSetSuffixListener涓簲鐢紝鍙栧�艰寖鍥存槸0-99
IdSuffix: ${pipIrr.statistics.IdSuffix}
- #ConfigListener涓簲鐢�
- configFileNames: config-global.xml
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/config/WebListenerConfiguration.java b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/config/WebListenerConfiguration.java
index d9b52a4..e20cefc 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/config/WebListenerConfiguration.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/config/WebListenerConfiguration.java
@@ -18,28 +18,7 @@
/**
* 鍚姩椤哄簭
*/
- //private static final int order_config = 0 ;
private static final int order_idSetSuffix = 1 ;
-
- /*
- * 瑙ｆ瀽鍚勭***.config閰嶇疆鐨凜onfigListener锛屾殏鏃朵笉閲囩敤姝ょ閰嶇疆鏂瑰紡
- *
- @Bean
- public ConfigListener getGlConfigListener(){
- return new ConfigListener() ;
- }
- /**
- * 澶栭儴鎻愪緵Listener
- * @param listener 澶栭儴鎻愪緵Listener
- * @return 娉ㄥ唽Bean
- @Bean
- public ServletListenerRegistrationBean<? extends ServletContextListener> regConfigListener(ConfigListener listener) {
- ServletListenerRegistrationBean<ConfigListener> listenerRegistrationBean = new ServletListenerRegistrationBean<>();
- listenerRegistrationBean.setListener(listener);
- listenerRegistrationBean.setOrder(order_config);
- return listenerRegistrationBean;
- }
- */
/**
* 鍐呴儴鎻愪緵listener锛岃listener鍦ㄧ郴缁熷惎鍔ㄦ椂锛屾牴鎹厤缃� 璁剧疆ID浜х敓鍣ㄧ殑鍚庣紑
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/resources/application.yml b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/resources/application.yml
index 4e95a57..d36ec30 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/resources/application.yml
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/resources/application.yml
@@ -14,8 +14,7 @@
context-parameters:
#GenerateIdSetSuffixListener涓簲鐢紝鍙栧�艰寖鍥存槸0-99
idSuffix: ${pipIrr.wechat.idSuffix}
- #ConfigListener涓簲鐢�
- #configFileNames: config-global.xml,config-demo.xml
+
#闃块噷鐭俊鏈嶅姟
aliyun:
sms:
--
Gitblit v1.8.0