Merge branch 'master' into smartor_ls_261103

陈昶聿

8 天以前 2867cf7076a584a34e63174cec0a8b89cdd03e4c

 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>