From 2867cf7076a584a34e63174cec0a8b89cdd03e4c Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期五, 06 十一月 2026 13:42:55 +0800
Subject: [PATCH] Merge branch 'master' into smartor_ls_261103
---
ruoyi-admin/pom.xml | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index 9e1237c..86cb2e5 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -173,6 +173,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>
@@ -249,17 +259,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>
@@ -300,10 +310,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>
--
Gitblit v1.9.3