smartor.git - Gitblit

陈昶聿

10 天以前 861a47ec31c39602794470f4759b70566145e86f

【丽水】签出合并

已修改6个文件

	.idea/misc.xml	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pom.xml	44 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-admin/pom.xml	22 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-common/pom.xml	13 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	smartor/pom.xml	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 .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>

 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>

 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>

 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>

 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;

 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>

			@@ -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>

			@@ -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>

			@@ -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>

			@@ -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>

			@@ -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;

			@@ -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>