Merge branch 'master' into smartor_ls_261103

陈昶聿

8 天以前 2867cf7076a584a34e63174cec0a8b89cdd03e4c

 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>