From ccd87b6ac99259a01b9099a4d570f6d9e7dbb506 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 30 五月 2025 14:48:54 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/zd-after into li

---
 ruoyi-admin/pom.xml |   53 +++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 49 insertions(+), 4 deletions(-)

diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index 5a17b7e..559a649 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -36,6 +36,32 @@
             <artifactId>mysql-connector-j</artifactId>
         </dependency>
 
+        <!--  flyway 鏁版嵁搴撹縼绉诲伐鍏� -->
+        <dependency>
+            <groupId>org.flywaydb</groupId>
+            <artifactId>flyway-core</artifactId>
+            <version>10.11.0</version> <!-- 鎴栨洿楂樼増鏈紝濡� 10.11.0 -->
+        </dependency>
+
+        <!--  mysql杩佺Щ  -->
+        <dependency>
+            <groupId>org.flywaydb</groupId>
+            <artifactId>flyway-mysql</artifactId>
+        </dependency>
+
+        <!--  pgsql杩佺Щ  -->
+        <dependency>
+            <groupId>org.flywaydb</groupId>
+            <artifactId>flyway-database-postgresql</artifactId>
+        </dependency>
+
+
+        <dependency>
+            <groupId>org.flywaydb</groupId>
+            <artifactId>flyway-maven-plugin</artifactId>
+            <version>10.11.0</version>
+        </dependency>
+
         <!-- 鏍稿績妯″潡-->
         <dependency>
             <groupId>com.ruoyi</groupId>
@@ -48,10 +74,29 @@
             <artifactId>ruoyi-quartz</artifactId>
         </dependency>
 
-        <!-- 浠g爜鐢熸垚-->
+        <!-- postgresql椹卞姩鍖� -->
         <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-generator</artifactId>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
+        </dependency>
+
+        <!-- FreeMarker 妯℃澘寮曟搸 -->
+        <dependency>
+            <groupId>org.freemarker</groupId>
+            <artifactId>freemarker</artifactId>
+            <version>2.3.31</version> <!-- 鍙牴鎹渶瑕佽皟鏁寸増鏈� -->
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.velocity</groupId>
+            <artifactId>velocity-engine-core</artifactId>
+            <version>2.3</version>
+        </dependency>
+
+        <!-- minio渚濊禆okhttp 涓嶇劧鎶ラ敊 -->
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
         </dependency>
 
     </dependencies>
@@ -81,7 +126,7 @@
                     <failOnMissingWebXml>false</failOnMissingWebXml>
                     <warName>${project.artifactId}</warName>
                 </configuration>   
-           </plugin>   
+           </plugin>
         </plugins>
         <finalName>${project.artifactId}</finalName>
     </build>

--
Gitblit v1.9.3