From 861a47ec31c39602794470f4759b70566145e86f Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期二, 03 十一月 2026 16:37:55 +0800
Subject: [PATCH] 【丽水】签出合并
---
smartor/pom.xml | 6 ---
ruoyi-admin/pom.xml | 22 +++++++----
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java | 1
pom.xml | 44 ++++++++++++++++++++++
ruoyi-common/pom.xml | 13 +++++-
.idea/misc.xml | 4 +-
6 files changed, 71 insertions(+), 19 deletions(-)
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 00118d8..9dc782b 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -8,5 +8,5 @@
</list>
</option>
</component>
- <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
-</project>
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="21" project-jdk-type="JavaSDK" />
+</project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 69365d2..c40e770 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,6 +24,8 @@
<kaptcha.version>2.3.3</kaptcha.version>
<pagehelper.boot.version>1.4.6</pagehelper.boot.version>
<fastjson.version>2.0.23</fastjson.version>
+ <!-- Lombok 1.18.22 is incompatible with JDK 21+ (JCTree$JCImport.qualid removed) -->
+ <lombok.version>1.18.36</lombok.version>
<oshi.version>6.4.0</oshi.version>
<commons.io.version>2.11.0</commons.io.version>
<commons.fileupload.version>1.4</commons.fileupload.version>
@@ -31,6 +33,10 @@
<poi.version>4.1.2</poi.version>
<velocity.version>2.3</velocity.version>
<jwt.version>0.9.1</jwt.version>
+ <jws.version>1.1</jws.version>
+ <jaxws.version>2.3.1</jaxws.version>
+ <jaxb.impl.version>2.3.0</jaxb.impl.version>
+ <javassist.version>3.28.0-GA</javassist.version>
</properties>
<!-- 渚濊禆澹版槑 -->
@@ -46,6 +52,44 @@
<scope>import</scope>
</dependency>
+ <!-- 瑕嗙洊 Spring Boot BOM 涓殑 Lombok 鐗堟湰锛屽吋瀹� JDK 21+ -->
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <version>${lombok.version}</version>
+ </dependency>
+
+ <!-- JDK 11+ 宸茬Щ闄� Java EE 妯″潡锛屾樉寮忕鐞� JAX-WS/JWS API 鐗堟湰 -->
+ <dependency>
+ <groupId>javax.jws</groupId>
+ <artifactId>javax.jws-api</artifactId>
+ <version>${jws.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.ws</groupId>
+ <artifactId>jaxws-api</artifactId>
+ <version>${jaxws.version}</version>
+ </dependency>
+
+ <!-- 缁熶竴 JAXB 鐗堟湰锛岄伩鍏� CXF 3.1.6 寮曞叆鍦� JDK 9+ 涓� POM 闈炴硶鐨� 2.2.11 -->
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>${jaxb.impl.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-core</artifactId>
+ <version>${jaxb.impl.version}</version>
+ </dependency>
+
+ <!-- 缁熶竴 Javassist 鐗堟湰锛�3.20.0-GA 鐨� tools.jar systemPath 鍦� JDK 9+ 涓嬩細瀵艰嚧 POM 鏃犳晥 -->
+ <dependency>
+ <groupId>org.javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <version>${javassist.version}</version>
+ </dependency>
+
<!-- 闃块噷鏁版嵁搴撹繛鎺ユ睜 -->
<dependency>
<groupId>com.alibaba</groupId>
diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index 674fcad..67a4960 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -110,6 +110,16 @@
<artifactId>spring-boot-starter-web-services</artifactId>
</dependency>
+ <!-- JDK 11+ 宸茬Щ闄� Java EE 妯″潡锛屾湰妯″潡鐨� WebService 鐩存帴浣跨敤 JAX-WS/JWS API -->
+ <dependency>
+ <groupId>javax.jws</groupId>
+ <artifactId>javax.jws-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.ws</groupId>
+ <artifactId>jaxws-api</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
@@ -186,17 +196,17 @@
<groupId>com.oracle.database.jdbc</groupId>
<artifactId>ojdbc8</artifactId>
<version>19.3.0.0</version>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>42.6.0</version> <!-- 璇锋牴鎹渶瑕侀�夋嫨鏈�鏂扮増鏈� -->
</dependency>
- <!--oracle-->
+ <!-- 閫氱敤宸ュ叿锛堟湰妯″潡鐩存帴浣跨敤 ruoyi-common 涓殑绫伙級 -->
<dependency>
- <groupId>com.oracle.database.jdbc</groupId>
- <artifactId>ojdbc8</artifactId>
- <scope>runtime</scope>
+ <groupId>com.ruoyi</groupId>
+ <artifactId>ruoyi-common</artifactId>
</dependency>
</dependencies>
<build>
@@ -237,10 +247,6 @@
<repository>
<id>aliyun</id>
<url>https://maven.aliyun.com/repository/public</url>
- </repository>
- <repository>
- <id>jcenter</id>
- <url>https://jcenter.bintray.com/</url>
</repository>
</repositories>
</project>
diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml
index 77ed9e0..c2bdd3c 100644
--- a/ruoyi-common/pom.xml
+++ b/ruoyi-common/pom.xml
@@ -167,7 +167,17 @@
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
</dependency>
-
+
+ <!-- JDK 11+ 宸茬Щ闄� Java EE 妯″潡锛岃繖閲屾樉寮忓紩鍏� JAX-WS/JWS API -->
+ <dependency>
+ <groupId>javax.jws</groupId>
+ <artifactId>javax.jws-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.ws</groupId>
+ <artifactId>jaxws-api</artifactId>
+ </dependency>
+
<!-- AOP鏀寔 -->
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -176,7 +186,6 @@
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
- <version>1.18.26</version>
</dependency>
<dependency>
<groupId>com.squareup.okhttp3</groupId>
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java
index a9ec8b3..a7cb562 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java
@@ -7,7 +7,6 @@
import javax.servlet.http.HttpServletRequest;
import com.ruoyi.common.core.domain.entity.SysUser;
-import com.sun.org.apache.bcel.internal.generic.NEW;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
diff --git a/smartor/pom.xml b/smartor/pom.xml
index f257b5e..c2c3e08 100644
--- a/smartor/pom.xml
+++ b/smartor/pom.xml
@@ -89,12 +89,6 @@
<artifactId>nls-sdk-recognizer</artifactId>
<version>2.2.1</version>
</dependency>
- <dependency>
- <groupId>com.alibaba.nls</groupId>
- <artifactId>nls-sdk-recognizer</artifactId>
- <version>2.2.1</version>
- <scope>compile</scope>
- </dependency>
<dependency>
<groupId>com.alibaba.nls</groupId>
--
Gitblit v1.9.3