From ba3d723bb6a06a4b7f02ec3723f15431ffce38e4 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Tue, 14 Nov 2023 17:36:40 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E5=8D=87=E7=BA=A7tomcat?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 laws-base/laws-base-core/pom.xml | 37 +++++++++++++++++++++++++++++++-
 pom.xml                          |  1 +
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/laws-base/laws-base-core/pom.xml b/laws-base/laws-base-core/pom.xml
index a487f46d..6d6b9da6 100644
--- a/laws-base/laws-base-core/pom.xml
+++ b/laws-base/laws-base-core/pom.xml
@@ -46,6 +46,20 @@
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
+			<exclusions>
+				<exclusion>
+					<artifactId>tomcat-embed-core</artifactId>
+					<groupId>org.apache.tomcat.embed</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>tomcat-embed-el</artifactId>
+					<groupId>org.apache.tomcat.embed</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>tomcat-embed-websocket</artifactId>
+					<groupId>org.apache.tomcat.embed</groupId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<!-- websocket -->
 		<dependency>
@@ -69,7 +83,28 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-validation</artifactId>
 		</dependency>
-
+		<!--	tomcat	-->
+		<dependency>
+			<groupId>org.apache.tomcat.embed</groupId>
+			<artifactId>tomcat-embed-core</artifactId>
+			<version>${tomcat.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.tomcat.embed</groupId>
+			<artifactId>tomcat-embed-el</artifactId>
+			<version>${tomcat.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.tomcat.embed</groupId>
+			<artifactId>tomcat-embed-websocket</artifactId>
+			<version>${tomcat.version}</version>
+			<exclusions>
+				<exclusion>
+					<artifactId>tomcat-embed-core</artifactId>
+					<groupId>org.apache.tomcat.embed</groupId>
+				</exclusion>
+			</exclusions>
+		</dependency>
 		<!-- commons -->
 		<dependency>
 			<groupId>commons-io</groupId>
diff --git a/pom.xml b/pom.xml
index 18cb29f1..968f6caa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,6 +46,7 @@
 		<qiniu-java-sdk.version>7.4.0</qiniu-java-sdk.version>
 		<log4j2.version>2.15.0</log4j2.version>
 		<activiti.version>6.0.0</activiti.version>
+		<tomcat.version>9.0.82</tomcat.version>
 	</properties>
 
 	<modules>