Merge remote-tracking branch 'origin/master'

zhaowenxuan

2025-06-27 0892d843cd394f383ff50f480f7f22f2ec3829bc

 ltkj-common/pom.xml

@@ -14,14 +14,46 @@
    <description>
        common通用工具
    </description>
    <repositories>
        <repository>
            <id>com.e-iceblue</id>
            <name>e-iceblue</name>
            <url>https://repo.e-iceblue.cn/repository/maven-public/</url>
        </repository>
    </repositories>
<!--    <repositories>-->
<!--        <repository>-->
<!--            <id>com.e-iceblue</id>-->
<!--            <name>e-iceblue</name>-->
<!--            <url>https://repo.e-iceblue.cn/repository/maven-public/</url>-->
<!--        </repository>-->
<!--    </repositories>-->
    <dependencies>

        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter</artifactId>
            <version>2.5.14</version>
        </dependency>

        <!--以下tduck-->
        <dependency>
            <groupId>com.aventrix.jnanoid</groupId>
            <artifactId>jnanoid</artifactId>
            <version>2.0.0</version>
        </dependency>
        <dependency>
            <groupId>com.fasterxml.jackson.datatype</groupId>
            <artifactId>jackson-datatype-jsr310</artifactId>
            <version>2.16.0</version>
        </dependency>
        <!-- ehcache缓存 -->
        <dependency>
            <groupId>net.sf.ehcache</groupId>
            <artifactId>ehcache</artifactId>
            <version>2.9.1</version><!--$NO-MVN-MAN-VER$ -->
        </dependency>
        <!--以上tduck-->


<!--        <dependency>-->
<!--            <groupId>e-iceblue</groupId>-->
<!--            <artifactId>spire.pdf</artifactId>-->
<!--            <version>5.4.0</version>-->
<!--        </dependency>-->
        <!-- mail-starter -->
        <dependency>
            <groupId>org.springframework.boot</groupId>
@@ -198,13 +230,13 @@
            <version>5.2.0</version>
        </dependency>


        <!--创建填充表单域-->
        <dependency>
            <groupId>e-iceblue</groupId>
            <artifactId>spire.pdf</artifactId>
            <version>5.4.0</version>
        </dependency>
    <!--20231123解决打包问题注释  在ltkj pom.xml中复制一份-->
<!--        &lt;!&ndash;创建填充表单域&ndash;&gt;-->
<!--        <dependency>-->
<!--            <groupId>e-iceblue</groupId>-->
<!--            <artifactId>spire.pdf</artifactId>-->
<!--            <version>5.4.0</version>-->
<!--        </dependency>-->

        <dependency>
            <groupId>com.itextpdf</groupId>
@@ -260,6 +292,12 @@
            <version>4.0.0</version>
        </dependency>
        <!-- WxJava微信开发工具 end-->

        <dependency>
            <groupId>org.redisson</groupId>
            <artifactId>redisson-spring-boot-starter</artifactId>
            <version>3.23.5</version>
        </dependency>
    </dependencies>

</project>