From 2154033879f7bbfcde9bcebe508a369ef951a1ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Sat, 25 May 2024 02:05:34 +0000
Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E9=80=80=20'Pull=20Request=20!542=20:?=
 =?UTF-8?q?=20=E6=9B=B4=E6=96=B0SnailJob=E7=89=88=E6=9C=AC=E5=88=B01.0.0-b?=
 =?UTF-8?q?eta2'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                       | 2 +-
 ruoyi-admin/src/main/resources/application-dev.yml            | 4 ++--
 ruoyi-admin/src/main/resources/application-prod.yml           | 3 +--
 .../java/org/dromara/common/job/config/SnailJobConfig.java    | 2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index b57f2365f..4d04d3963 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +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>
-        <snailjob.version>1.0.0-beta2</snailjob.version>
+        <snailjob.version>1.0.0-beta1</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>
diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml
index 398af9c91..529a106bd 100644
--- a/ruoyi-admin/src/main/resources/application-dev.yml
+++ b/ruoyi-admin/src/main/resources/application-dev.yml
@@ -12,7 +12,7 @@ spring.boot.admin.client:
 snail-job:
   enabled: true
   # 需要在 SnailJob 后台组管理创建对应名称的组,然后创建任务的时候选择对应的组,才能正确分派任务
-  group: "ruoyi_group"
+  group-name: "ruoyi_group"
   # SnailJob 接入验证令牌 详见 script/sql/snail_job.sql `sj_group_config` 表
   token: "SJ_cKqBTPzCsWA3VyuCfFoccmuIEGXjr5KT"
   server:
@@ -21,6 +21,7 @@ snail-job:
   # 详见 script/sql/snail_job.sql `sj_namespace` 表
   namespace: ${spring.profiles.active}
 
+
 --- # 数据源配置
 spring:
   datasource:
@@ -101,7 +102,6 @@ spring.data:
     # 是否开启ssl
     ssl.enabled: false
 
---- # redisson 配置
 redisson:
   # redis key前缀
   keyPrefix:
diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/ruoyi-admin/src/main/resources/application-prod.yml
index 4dabb6823..0613bd7df 100644
--- a/ruoyi-admin/src/main/resources/application-prod.yml
+++ b/ruoyi-admin/src/main/resources/application-prod.yml
@@ -15,7 +15,7 @@ spring.boot.admin.client:
 snail-job:
   enabled: false
   # 需要在 SnailJob 后台组管理创建对应名称的组,然后创建任务的时候选择对应的组,才能正确分派任务
-  group: "ruoyi_group"
+  group-name: "ruoyi_group"
   # SnailJob 接入验证令牌 详见 script/sql/snail_job.sql `sj_group_config` 表
   token: "SJ_cKqBTPzCsWA3VyuCfFoccmuIEGXjr5KT"
   server:
@@ -104,7 +104,6 @@ spring.data:
     # 是否开启ssl
     ssl.enabled: false
 
----  # redisson 配置
 redisson:
   # redis key前缀
   keyPrefix:
diff --git a/ruoyi-common/ruoyi-common-job/src/main/java/org/dromara/common/job/config/SnailJobConfig.java b/ruoyi-common/ruoyi-common-job/src/main/java/org/dromara/common/job/config/SnailJobConfig.java
index e48fe7fb4..d671f0ed8 100644
--- a/ruoyi-common/ruoyi-common-job/src/main/java/org/dromara/common/job/config/SnailJobConfig.java
+++ b/ruoyi-common/ruoyi-common-job/src/main/java/org/dromara/common/job/config/SnailJobConfig.java
@@ -21,7 +21,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 @AutoConfiguration
 @ConditionalOnProperty(prefix = "snail-job", name = "enabled", havingValue = "true")
 @EnableScheduling
-@EnableSnailJob(group = "${snail-job.group}")
+@EnableSnailJob(group = "${snail-job.group-name}")
 public class SnailJobConfig {
 
     @EventListener(SnailClientStartingEvent.class)