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-admin/pom.xml |  118 ++++++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 81 insertions(+), 37 deletions(-)

diff --git a/ltkj-admin/pom.xml b/ltkj-admin/pom.xml
index 257cf12..1df69ce 100644
--- a/ltkj-admin/pom.xml
+++ b/ltkj-admin/pom.xml
@@ -30,6 +30,26 @@
     </repositories>
 
     <dependencies>
+
+        <dependency>
+            <groupId>org.joda</groupId>
+            <artifactId>joda-money</artifactId>
+            <version>1.0.2</version> <!-- 鏈�鏂扮増鏈彲鍦� Maven Central 鏌ヨ -->
+        </dependency>
+
+
+        <dependency>
+            <groupId>com.oracle.database.jdbc</groupId>
+            <artifactId>ojdbc8</artifactId>
+            <version>19.8.0.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.oracle.database.jdbc</groupId>
+            <artifactId>orai18n</artifactId>
+            <version>12.1.0.2.0</version>
+        </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter</artifactId>
@@ -93,6 +113,13 @@
             <artifactId>sqljdbc4</artifactId>
             <version>4.0</version>
         </dependency>
+
+<!--        <dependency>-->
+<!--            <groupId>com.microsoft.sqlserver</groupId>-->
+<!--            <artifactId>mssql-jdbc</artifactId>-->
+<!--            <version>6.4.0.jre8</version> &lt;!&ndash; 浣跨敤鏈�鏂扮増鏈� &ndash;&gt;-->
+<!--        </dependency>-->
+
 
         <!-- Mysql椹卞姩鍖� -->
         <dependency>
@@ -180,46 +207,52 @@
             <artifactId>weixin-java-miniapp</artifactId>
             <version>4.2.0</version>
         </dependency>
+
+        <dependency>
+            <groupId>org.seleniumhq.selenium</groupId>
+            <artifactId>selenium-java</artifactId>
+            <version>3.141.59</version>
+        </dependency>
     </dependencies>
 
 
-<!--
-        <build>
-            <plugins>
-                &lt;!&ndash; maven鎵撳寘鎻掍欢&ndash;&gt;
-                <plugin>
-                    <groupId>org.springframework.boot</groupId>
-                    <artifactId>spring-boot-maven-plugin</artifactId>
-                </plugin>
-                <plugin>
-                    <groupId>org.springframework.boot</groupId>
-                    <artifactId>spring-boot-maven-plugin</artifactId>
-                    <version>2.1.1.RELEASE</version>
-                    <configuration>
-                        <fork>true</fork> &lt;!&ndash; 濡傛灉娌℃湁璇ラ厤缃紝devtools涓嶄細鐢熸晥 &ndash;&gt;
-                    </configuration>
-                    <executions>
-                        <execution>
-                            <goals>
-                                <goal>repackage</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-war-plugin</artifactId>
-                    <version>3.2.2</version>
-                    <configuration>
-                        <failOnMissingWebXml>false</failOnMissingWebXml>
-    &lt;!&ndash;                    <warName>${project.artifactId}</warName>&ndash;&gt;
-                        <warName>ltkj-admin</warName>
-                    </configuration>
-                </plugin>
-            </plugins>
-            <finalName>ltkj-admin</finalName>
-        </build>
--->
+    <!--
+            <build>
+                <plugins>
+                    &lt;!&ndash; maven鎵撳寘鎻掍欢&ndash;&gt;
+                    <plugin>
+                        <groupId>org.springframework.boot</groupId>
+                        <artifactId>spring-boot-maven-plugin</artifactId>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.springframework.boot</groupId>
+                        <artifactId>spring-boot-maven-plugin</artifactId>
+                        <version>2.1.1.RELEASE</version>
+                        <configuration>
+                            <fork>true</fork> &lt;!&ndash; 濡傛灉娌℃湁璇ラ厤缃紝devtools涓嶄細鐢熸晥 &ndash;&gt;
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>repackage</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-war-plugin</artifactId>
+                        <version>3.2.2</version>
+                        <configuration>
+                            <failOnMissingWebXml>false</failOnMissingWebXml>
+        &lt;!&ndash;                    <warName>${project.artifactId}</warName>&ndash;&gt;
+                            <warName>ltkj-admin</warName>
+                        </configuration>
+                    </plugin>
+                </plugins>
+                <finalName>ltkj-admin</finalName>
+            </build>
+    -->
 
     <build>
         <plugins>
@@ -247,6 +280,17 @@
                     <warName>${project.artifactId}</warName>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>3.2.0</version>
+                <configuration>
+                    <excludes>
+                        <!-- 鎺掗櫎 Font 鏂囦欢澶� -->
+                        <exclude>**/Font/**</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
         </plugins>
         <finalName>${project.artifactId}</finalName>
     </build>

--
Gitblit v1.8.0