!543 回退 'Pull Request !542 : 更新SnailJob版本到1.0.0-beta2'

Merge pull request !543 from 疯狂的狮子Li/revert-merge-542-dev

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>

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:

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:

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)