From 0892d843cd394f383ff50f480f7f22f2ec3829bc Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期五, 27 六月 2025 20:24:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ltkj-common/pom.xml |   66 ++++++++++++++++++++++++++-------
 1 files changed, 52 insertions(+), 14 deletions(-)

diff --git a/ltkj-common/pom.xml b/ltkj-common/pom.xml
index 1ec74ca..7c58bd2 100644
--- a/ltkj-common/pom.xml
+++ b/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瑙ｅ喅鎵撳寘闂娉ㄩ噴  鍦╨tkj 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>

--
Gitblit v1.8.0