c-hongqw1/zhgh_hdc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

jetty换tomcat

Browse Source
This commit is contained in:
c-zhangr1
2026-09-23 17:31:27 +08:00
parent 5c48127726
commit e85d44e5aa
10577 changed files with 133550 additions and 1521697 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pom.xml
+55 -8
View File
@@ -6,7 +6,7 @@
<version>5.6.0-plus</version>
<properties>
<nutzboot.version>2.6.0-SNAPSHOT</nutzboot.version>
<jetty.version>9.4.58.v20250814</jetty.version>
<tomcat.version>9.0.121</tomcat.version>
<nutz.version>1.r.70-SNAPSHOT</nutz.version>
<mysql-connector-java.version>8.0.28</mysql-connector-java.version>
<jaxb-api.version>2.3.1</jaxb-api.version>
@@ -32,6 +32,13 @@
<groupId>net.sourceforge.htmlunit</groupId>
<artifactId>htmlunit</artifactId>
<version>2.70.0</version>
<exclusions>
<!-- 当前仅使用 HtmlUnit 抓取并渲染新闻页面，不使用其 WebSocket 客户端，避免传递引入 Jetty。 -->
<exclusion>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-client</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- 可选：解决部分 JS 兼容性问题 -->
<dependency>
@@ -152,8 +159,22 @@
</dependency>
<dependency>
<groupId>org.nutz</groupId>
<artifactId>nutzboot-starter-jetty</artifactId>
<artifactId>nutzboot-starter-tomcat</artifactId>
<version>${nutzboot.version}</version>
<exclusions>
<exclusion>
<groupId>org.gandon.tomcat</groupId>
<artifactId>juli-to-slf4j</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-websocket</artifactId>
</dependency>
<dependency>
<groupId>org.nutz</groupId>
<artifactId>nutz-plugins-websocket</artifactId>
</dependency>
<dependency>
<groupId>org.nutz</groupId>
@@ -432,13 +453,39 @@
</dependencies>
<dependencyManagement>
<dependencies>
<!-- 优先统一服务端与 HtmlUnit 引入的 Jetty、WebSocket 组件版本，避免混用。 -->
<!-- Servlet API 由 Tomcat 提供，防止旧 API 混入可执行 JAR。 -->
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-bom</artifactId>
<version>${jetty.version}</version>
<type>pom</type>
<scope>import</scope>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>4.0.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.websocket</groupId>
<artifactId>javax.websocket-api</artifactId>
<version>1.1</version>
<scope>provided</scope>
</dependency>
<!-- 显式覆盖导入的 NutzBoot BOM，避免回退到其默认 Tomcat 8.5。 -->
<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-websocket</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-jasper</artifactId>
<version>${tomcat.version}</version>
</dependency>
<dependency>
<groupId>org.nutz</groupId>