Merge branch 'dev' into dev_zj

zss

2025-03-06 fd7bc95a3c91fb7d90a921b0ff762fa6095fabd1

 pom.xml

@@ -27,7 +27,7 @@
        <fastjson.version>2.0.53</fastjson.version>
        <oshi.version>6.6.5</oshi.version>
        <commons.io.version>2.13.0</commons.io.version>
        <poi.version>4.1.2</poi.version>
        <poi.version>5.2.2</poi.version>
        <velocity.version>2.3</velocity.version>
        <jwt.version>0.9.1</jwt.version>
        <!-- override dependency version -->
@@ -44,12 +44,18 @@
        <okhttp.version>4.9.0</okhttp.version>
        <hutool.version>5.8.18</hutool.version>
        <easyexcel.version>3.3.2</easyexcel.version>
        <poi.tl.version>1.12.2</poi.tl.version>
        <amqp.version>3.2.6</amqp.version>
    </properties>

    <!-- 依赖声明 -->
    <dependencyManagement>
        <dependencies>

            <dependency>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-starter-amqp</artifactId>
                <version>${amqp.version}</version>
            </dependency>
            <!-- 覆盖SpringFramework的依赖配置-->
            <dependency>
                <groupId>org.springframework</groupId>
@@ -199,13 +205,6 @@
                <version>${kaptcha.version}</version>
            </dependency>

            <!-- 定时任务-->
            <dependency>
                <groupId>com.ruoyi</groupId>
                <artifactId>ruoyi-quartz</artifactId>
                <version>${ruoyi.version}</version>
            </dependency>

            <!-- 代码生成-->
            <dependency>
                <groupId>com.ruoyi</groupId>
@@ -234,6 +233,62 @@
                <version>${ruoyi.version}</version>
            </dependency>

            <!--基础模块-->
            <dependency>
                <groupId>com.ruoyi</groupId>
                <artifactId>basic-server</artifactId>
                <version>${ruoyi.version}</version>
            </dependency>

            <!--业务模块-->
            <dependency>
                <groupId>com.ruoyi</groupId>
                <artifactId>inspect-server</artifactId>
                <version>${ruoyi.version}</version>
            </dependency>

            <!--绩效模块-->
            <dependency>
                <groupId>com.ruoyi</groupId>
                <artifactId>performance-server</artifactId>
                <version>${ruoyi.version}</version>
            </dependency>

            <!--cnas体系管理要求-->
            <dependency>
                <groupId>com.ruoyi</groupId>
                <artifactId>cnas-manage</artifactId>
                <version>${ruoyi.version}</version>
            </dependency>

            <!--cnas资源要求-->
            <dependency>
                <groupId>com.ruoyi</groupId>
                <artifactId>cnas-process</artifactId>
                <version>${ruoyi.version}</version>
            </dependency>

            <!--cnas标准物质-->
            <dependency>
                <groupId>com.ruoyi</groupId>
                <artifactId>cnas-require</artifactId>
                <version>${ruoyi.version}</version>
            </dependency>

            <!--cnas设备管理-->
            <dependency>
                <groupId>com.ruoyi</groupId>
                <artifactId>cnas-device</artifactId>
                <version>${ruoyi.version}</version>
            </dependency>

            <!--cnas人员-->
            <dependency>
                <groupId>com.ruoyi</groupId>
                <artifactId>cnas-personnel</artifactId>
                <version>${ruoyi.version}</version>
            </dependency>


            <!-- minio -->
            <dependency>
@@ -254,6 +309,14 @@
                <artifactId>okhttp</artifactId>
                <version>${okhttp.version}</version>
            </dependency>

            <!-- poi-tl包生成报告 -->
            <dependency>
                <groupId>com.deepoove</groupId>
                <artifactId>poi-tl</artifactId>
                <version>${poi.tl.version}</version>
            </dependency>

        </dependencies>
    </dependencyManagement>

@@ -339,6 +402,11 @@
        <module>basic-server</module>
        <module>inspect-server</module>
        <module>performance-server</module>
        <module>cnas-manage</module>
        <module>cnas-process</module>
        <module>cnas-require</module>
        <module>cnas-device</module>
        <module>cnas-personnel</module>
    </modules>
    <packaging>pom</packaging>