From 94797a2d2b815fe7a4e8d884059a34e1d9bc74f3 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期一, 27 五月 2024 15:14:16 +0800
Subject: [PATCH] fix 修复 oss未使用租户 拼接租户id null问题

---
 pom.xml |   35 +++++++++--------------------------
 1 files changed, 9 insertions(+), 26 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8c49660..a0912de 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,8 +13,8 @@
     <description>RuoYi-Vue-Plus澶氱鎴风鐞嗙郴缁�</description>
 
     <properties>
-        <revision>5.2.0-SNAPSHOT</revision>
-        <spring-boot.version>3.2.5</spring-boot.version>
+        <revision>5.2.0-BETA</revision>
+        <spring-boot.version>3.2.6</spring-boot.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>17</java.version>
@@ -34,8 +34,7 @@
         <lock4j.version>2.2.7</lock4j.version>
         <dynamic-ds.version>4.3.0</dynamic-ds.version>
         <alibaba-ttl.version>2.14.4</alibaba-ttl.version>
-        <powerjob.version>4.3.6</powerjob.version>
-        <easyretry.version>3.2.0</easyretry.version>
+        <snailjob.version>1.0.0-beta2</snailjob.version>
         <mapstruct-plus.version>1.3.6</mapstruct-plus.version>
         <mapstruct-plus.lombok.version>0.2.0</mapstruct-plus.lombok.version>
         <lombok.version>1.18.32</lombok.version>
@@ -297,33 +296,16 @@
                 <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>
-
-            <!--  EasyRetry Client -->
+            <!-- SnailJob Client -->
             <dependency>
                 <groupId>com.aizuda</groupId>
-                <artifactId>easy-retry-client-starter</artifactId>
-                <version>${easyretry.version}</version>
+                <artifactId>snail-job-client-starter</artifactId>
+                <version>${snailjob.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.aizuda</groupId>
-                <artifactId>easy-retry-client-core</artifactId>
-                <version>${easyretry.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.aizuda</groupId>
-                <artifactId>easy-retry-client-job-core</artifactId>
-                <version>${easyretry.version}</version>
+                <artifactId>snail-job-client-job-core</artifactId>
+                <version>${snailjob.version}</version>
             </dependency>
 
             <dependency>
@@ -448,6 +430,7 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>${maven-surefire-plugin.version}</version>
                 <configuration>
+                    <argLine>-Dfile.encoding=UTF-8</argLine>
                     <!-- 鏍规嵁鎵撳寘鐜鎵ц瀵瑰簲鐨凘Tag娴嬭瘯鏂规硶 -->
                     <groups>${profiles.active}</groups>
                     <!-- 鎺掗櫎鏍囩 -->

--
Gitblit v1.9.3