From f8a8e0927f34262316dd974f0ce92527ce4ab680 Mon Sep 17 00:00:00 2001
From: duanliangtao <dlt0099>
Date: Fri, 22 Mar 2024 14:37:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dgateway?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet-commons/epmet-commons-tools/pom.xml | 11 +---
 code/smart-community/epmet-gateway/pom.xml    | 65 +++++++++++++++++--
 code/smart-community/pom.xml                  | 36 +++++-----
 3 files changed, 76 insertions(+), 36 deletions(-)

diff --git a/code/smart-community/epmet-commons/epmet-commons-tools/pom.xml b/code/smart-community/epmet-commons/epmet-commons-tools/pom.xml
index 425ebbf8..2deec7fe 100644
--- a/code/smart-community/epmet-commons/epmet-commons-tools/pom.xml
+++ b/code/smart-community/epmet-commons/epmet-commons-tools/pom.xml
@@ -29,15 +29,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.springframework.boot</groupId>
-                    <artifactId>spring-boot-starter-tomcat</artifactId>
-                </exclusion>
-            </exclusions>
-            <scope>provided</scope>
+            <groupId>com.tongweb.springboot</groupId>
+            <artifactId>tongweb-spring-boot-starter-2.x</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
diff --git a/code/smart-community/epmet-gateway/pom.xml b/code/smart-community/epmet-gateway/pom.xml
index 821ebefe..e1868c69 100644
--- a/code/smart-community/epmet-gateway/pom.xml
+++ b/code/smart-community/epmet-gateway/pom.xml
@@ -26,19 +26,34 @@
                     <artifactId>reactor-extra</artifactId>
                 </exclusion>
                 <exclusion>
-                    <groupId>io.projectreactor</groupId>
-                    <artifactId>reactor-core</artifactId>
+                    <groupId>io.projectreactor.netty</groupId>
+                    <artifactId>reactor-netty-http</artifactId>
                 </exclusion>
                 <exclusion>
-                    <groupId>org.springframework.boot</groupId>
-                    <artifactId>spring-boot-starter-webflux</artifactId>
+                    <groupId>io.projectreactor.netty</groupId>
+                    <artifactId>reactor-netty</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>io.projectreactor</groupId>
+                    <artifactId>reactor-core</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>com.tongweb.springboot</groupId>
-            <artifactId>tongweb-spring-boot-starter-2.x</artifactId>
-            <version>${tongWeb.version}</version>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-resolver-dns-native-macos</artifactId>
+            <classifier>osx-aarch_64</classifier>
+            <version>4.1.82.Final</version>
+        </dependency>
+        <dependency>
+            <groupId>com.tongweb</groupId>
+            <artifactId>tongweb-spring-boot-reactor-starter</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>io.netty</groupId>
+                    <artifactId>netty-resolver-dns-native-macos</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
 <!--        <dependency>-->
@@ -76,12 +91,24 @@
             <groupId>com.epmet</groupId>
             <artifactId>epmet-commons-tools</artifactId>
             <version>2.0.0</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.tongweb.springboot</groupId>
+                    <artifactId>tongweb-spring-boot-starter-2.x</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.epmet</groupId>
             <artifactId>epmet-common-clienttoken</artifactId>
             <version>2.0.0</version>
             <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.tongweb.springboot</groupId>
+                    <artifactId>tongweb-spring-boot-starter-2.x</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <!--用于外部应用认证的查询-->
@@ -89,22 +116,46 @@
             <groupId>com.epmet</groupId>
             <artifactId>common-service-client</artifactId>
             <version>2.0.0</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.tongweb.springboot</groupId>
+                    <artifactId>tongweb-spring-boot-starter-2.x</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.epmet</groupId>
             <artifactId>epmet-commons-openapi</artifactId>
             <version>2.0.0</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.tongweb.springboot</groupId>
+                    <artifactId>tongweb-spring-boot-starter-2.x</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.epmet</groupId>
             <artifactId>epmet-admin-client</artifactId>
             <version>2.0.0</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.tongweb.springboot</groupId>
+                    <artifactId>tongweb-spring-boot-starter-2.x</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.epmet</groupId>
             <artifactId>epmet-commons-security</artifactId>
             <version>2.0.0</version>
             <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.tongweb.springboot</groupId>
+                    <artifactId>tongweb-spring-boot-starter-2.x</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
     </dependencies>
 
diff --git a/code/smart-community/pom.xml b/code/smart-community/pom.xml
index be8e7f62..f1e39a7a 100644
--- a/code/smart-community/pom.xml
+++ b/code/smart-community/pom.xml
@@ -23,12 +23,12 @@
 	<modules>
 		<module>epmet-commons</module>
 		<module>epmet-gateway</module>
-		<module>epmet-auth</module>
+		<!--<module>epmet-auth</module>
 		<module>epmet-auth-client</module>
 		<module>epmet-admin</module>
 		<module>epmet-module</module>
 		<module>epmet-user</module>
-		<module>epmet-openapi</module>
+		<module>epmet-openapi</module>-->
 	</modules>
 
 	<properties>
@@ -55,6 +55,18 @@
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
+			<dependency>
+				<groupId>io.netty</groupId>
+				<artifactId>netty-bom</artifactId>
+				<version>4.1.85.Final</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+			<dependency>
+				<groupId>io.projectreactor</groupId>
+				<artifactId>reactor-core</artifactId>
+				<version>3.4.23</version>
+			</dependency>
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-dependencies</artifactId>
@@ -133,25 +145,9 @@
 
 	<dependencies>
 		<!-- 排除tomcat依赖 -->
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-web</artifactId>
-			<exclusions>
-				<exclusion>
-					<groupId>org.springframework.boot</groupId>
-					<artifactId>spring-boot-starter-tomcat</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.apache.tomcat.embed</groupId>
-					<artifactId>tomcat-embed-el</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
+
 		<!-- tongWeb -->
-		<dependency>
-			<groupId>com.tongweb.springboot</groupId>
-			<artifactId>tongweb-spring-boot-starter-2.x</artifactId>
-		</dependency>
+
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>