From 06893ffe4a33f25680908ed3ae9c026b10886133 Mon Sep 17 00:00:00 2001
From: opensnail <598092184@qq.com>
Date: Fri, 5 Jul 2024 17:12:43 +0800
Subject: [PATCH] =?UTF-8?q?fix(sj=5F1.1.0-beta2):=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E6=97=A0=E7=94=A8=E7=9A=84=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                           |  6 ++++++
 snail-job-client/snail-job-client-common/pom.xml  | 15 ++++++++++++++-
 .../snail-job-client-job-core/pom.xml             |  6 ------
 .../snail-job-client-retry-core/pom.xml           |  8 ++++----
 .../snail-job-common-client-api/pom.xml           |  5 -----
 snail-job-common/snail-job-common-core/pom.xml    |  5 -----
 .../snailjob/common/core/util/DingDingUtils.java  |  1 +
 .../snail-job-common-server-api/pom.xml           |  6 ------
 8 files changed, 25 insertions(+), 27 deletions(-)

diff --git a/pom.xml b/pom.xml
index c37ce8da..3e8fb461 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,6 +32,7 @@
         <log4j.version>1.2.17</log4j.version>
         <commons-logging.version>1.2</commons-logging.version>
         <jakarta-validation.version>3.0.2</jakarta-validation.version>
+        <guava.version>32.0.0-jre</guava.version>
     </properties>
 
     <modules>
@@ -149,6 +150,11 @@
                 <artifactId>guava-retrying</artifactId>
                 <version>${guava-retrying.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.google.guava</groupId>
+                <artifactId>guava</artifactId>
+                <version>${guava.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.jboss.logging</groupId>
                 <artifactId>jboss-logging</artifactId>
diff --git a/snail-job-client/snail-job-client-common/pom.xml b/snail-job-client/snail-job-client-common/pom.xml
index 0df44b44..76d4a030 100644
--- a/snail-job-client/snail-job-client-common/pom.xml
+++ b/snail-job-client/snail-job-client-common/pom.xml
@@ -56,8 +56,21 @@
         <dependency>
             <groupId>com.github.rholder</groupId>
             <artifactId>guava-retrying</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>guava</artifactId>
+                    <groupId>com.google.guava</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>jsr305</artifactId>
+                    <groupId>com.google.code.findbugs</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
         </dependency>
-
         <dependency>
             <groupId>com.aizuda</groupId>
             <artifactId>snail-job-common-log</artifactId>
diff --git a/snail-job-client/snail-job-client-job-core/pom.xml b/snail-job-client/snail-job-client-job-core/pom.xml
index 7e507ee4..520344c2 100644
--- a/snail-job-client/snail-job-client-job-core/pom.xml
+++ b/snail-job-client/snail-job-client-job-core/pom.xml
@@ -18,7 +18,6 @@
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <guava.version>32.0.0-jre</guava.version>
     </properties>
     <dependencies>
         <dependency>
@@ -50,11 +49,6 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>${guava.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-validation</artifactId>
         </dependency>
     </dependencies>
 
diff --git a/snail-job-client/snail-job-client-retry-core/pom.xml b/snail-job-client/snail-job-client-retry-core/pom.xml
index bf48385a..957cc47c 100644
--- a/snail-job-client/snail-job-client-retry-core/pom.xml
+++ b/snail-job-client/snail-job-client-retry-core/pom.xml
@@ -24,6 +24,10 @@
             <artifactId>spring-boot-starter-web</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-aop</artifactId>
@@ -58,10 +62,6 @@
             <scope>provided</scope>
             <optional>true</optional>
         </dependency>
-        <dependency>
-            <groupId>io.netty</groupId>
-            <artifactId>netty-all</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.aizuda</groupId>
             <artifactId>snail-job-common-server-api</artifactId>
diff --git a/snail-job-common/snail-job-common-client-api/pom.xml b/snail-job-common/snail-job-common-client-api/pom.xml
index f66d48b2..6d1a6590 100644
--- a/snail-job-common/snail-job-common-client-api/pom.xml
+++ b/snail-job-common/snail-job-common-client-api/pom.xml
@@ -21,11 +21,6 @@
     </properties>
 
     <dependencies>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-validation</artifactId>
-            <scope>provided</scope>
-        </dependency>
 
         <dependency>
             <groupId>org.projectlombok</groupId>
diff --git a/snail-job-common/snail-job-common-core/pom.xml b/snail-job-common/snail-job-common-core/pom.xml
index 89739616..14f1fd27 100644
--- a/snail-job-common/snail-job-common-core/pom.xml
+++ b/snail-job-common/snail-job-common-core/pom.xml
@@ -31,11 +31,6 @@
             <artifactId>lombok</artifactId>
             <optional>true</optional>
         </dependency>
-        <dependency>
-            <groupId>commons-configuration</groupId>
-            <artifactId>commons-configuration</artifactId>
-            <version>1.10</version>
-        </dependency>
         <dependency>
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-http</artifactId>
diff --git a/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/util/DingDingUtils.java b/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/util/DingDingUtils.java
index 6742f4b2..7aa2128a 100644
--- a/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/util/DingDingUtils.java
+++ b/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/util/DingDingUtils.java
@@ -54,6 +54,7 @@ public class DingDingUtils {
             return text;
         }
         StringBuilder sb = new StringBuilder(text);
+        sb.append(StrUtil.CRLF);
         ats.stream().filter(StrUtil::isNotBlank)
                 .forEach(at -> sb.append(MessageFormat.format(atLabel, at)));
         return sb.toString();
diff --git a/snail-job-common/snail-job-common-server-api/pom.xml b/snail-job-common/snail-job-common-server-api/pom.xml
index 4d61c607..e456ef96 100644
--- a/snail-job-common/snail-job-common-server-api/pom.xml
+++ b/snail-job-common/snail-job-common-server-api/pom.xml
@@ -30,12 +30,6 @@
             <groupId>com.aizuda</groupId>
             <artifactId>snail-job-common-core</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-validation</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
     </dependencies>
 
     <build>