From 7a6660dd8d859eb0352474060218bc69469aa8f2 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期三, 05 七月 2023 12:56:53 +0800
Subject: [PATCH] !388 fix: 修复sqlserver中sql脚本问题 Merge pull request !388 from 我问这瓜保熟吗/5.X

---
 pom.xml |   29 ++++++++++++++---------------
 1 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/pom.xml b/pom.xml
index ae62e53..33fa3bd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
         <poi.version>5.2.3</poi.version>
         <easyexcel.version>3.3.1</easyexcel.version>
         <velocity.version>2.3</velocity.version>
-        <satoken.version>1.34.0</satoken.version>
+        <satoken.version>1.35.0.RC</satoken.version>
         <mybatis-plus.version>3.5.3.1</mybatis-plus.version>
         <p6spy.version>3.9.1</p6spy.version>
         <hutool.version>5.8.18</hutool.version>
@@ -32,7 +32,7 @@
         <spring-boot-admin.version>3.0.4</spring-boot-admin.version>
         <redisson.version>3.20.1</redisson.version>
         <lock4j.version>2.2.4</lock4j.version>
-        <dynamic-ds.version>3.6.1</dynamic-ds.version>
+        <dynamic-ds.version>4.0.0</dynamic-ds.version>
         <alibaba-ttl.version>2.14.2</alibaba-ttl.version>
         <powerjob.version>4.3.3</powerjob.version>
         <mapstruct-plus.version>1.3.1</mapstruct-plus.version>
@@ -201,7 +201,7 @@
             <!-- dynamic-datasource 澶氭暟鎹簮-->
             <dependency>
                 <groupId>com.baomidou</groupId>
-                <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
+                <artifactId>dynamic-datasource-spring-boot3-starter</artifactId>
                 <version>${dynamic-ds.version}</version>
             </dependency>
 
@@ -272,6 +272,17 @@
                 <version>${lock4j.version}</version>
             </dependency>
 
+            <!-- PowerJob -->
+            <dependency>
+                <groupId>tech.powerjob</groupId>
+                <artifactId>powerjob-worker-spring-boot-starter</artifactId>
+                <version>${powerjob.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>tech.powerjob</groupId>
+                <artifactId>powerjob-official-processors</artifactId>
+                <version>${powerjob.version}</version>
+            </dependency>
 
             <dependency>
                 <groupId>com.alibaba</groupId>
@@ -328,18 +339,6 @@
                 <groupId>org.dromara</groupId>
                 <artifactId>ruoyi-demo</artifactId>
                 <version>${revision}</version>
-            </dependency>
-
-            <!-- PowerJob -->
-            <dependency>
-                <groupId>tech.powerjob</groupId>
-                <artifactId>powerjob-worker-spring-boot-starter</artifactId>
-                <version>${powerjob.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>tech.powerjob</groupId>
-                <artifactId>powerjob-official-processors</artifactId>
-                <version>${powerjob.version}</version>
             </dependency>
 
         </dependencies>

--
Gitblit v1.9.3