Merge branch 'master-stander' into master-jiayan

fwq

2024-09-29 9e4fb13fec8bf2732f4567e7e72eeb9fd94c840c

 pom.xml

@@ -6,7 +6,7 @@

    <groupId>com.hx.gitee</groupId>
    <artifactId>hx-parent</artifactId>
    <version>stander</version>
    <version>jiayan</version>
    <packaging>pom</packaging>

    <parent>
@@ -16,6 +16,11 @@
        <relativePath/> <!-- lookup parent from repository -->
    </parent>

    <modules>
        <module>hx_common</module>
        <module>hx_auto</module>
        <module>hx-redisson</module>
    </modules>

    <!-- 依赖版本统一管理 -->
    <properties>
@@ -389,6 +394,12 @@
                <groupId>com.fadada.api</groupId>
                <artifactId>fasc-openapi-java-sdk</artifactId>
                <version>${fadada.version}</version>
                <exclusions>
                    <exclusion>
                        <groupId>org.slf4j</groupId>
                        <artifactId>slf4j-log4j12</artifactId>
                    </exclusion>
                </exclusions>
            </dependency>

            <dependency>
@@ -512,6 +523,41 @@
                <version>1.3.0</version>
            </dependency>

            <dependency>
                <groupId>org.junit.jupiter</groupId>
                <artifactId>junit-jupiter-api</artifactId>
                <version>RELEASE</version>
            </dependency>

            <dependency>
                <groupId>com.itextpdf</groupId>
                <artifactId>itextpdf</artifactId>
                <version>5.5.13</version>
            </dependency>

            <dependency>
                <groupId>com.itextpdf</groupId>
                <artifactId>itext-asian</artifactId>
                <version>5.2.0</version>
            </dependency>

            <dependency>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-starter-data-mongodb</artifactId>
                <version>2.6.2</version>
                <!--排除使用logback日志-->
                <exclusions>
                    <exclusion>
                        <artifactId>logback-classic</artifactId>
                        <groupId>ch.qos.logback</groupId>
                    </exclusion>
                    <exclusion>
                        <groupId>org.springframework.boot</groupId>
                        <artifactId>spring-boot-starter-logging</artifactId>
                    </exclusion>
                </exclusions>
            </dependency>

        </dependencies>
    </dependencyManagement>