Pārlūkot izejas kodu

!161 回退 'Pull Request !160 : 更新SnailJob版本到1.0.0-beta2'
Merge pull request !161 from 疯狂的狮子Li/revert-merge-160-dev

疯狂的狮子Li 2 gadi atpakaļ
vecāks
revīzija
cc6871288a

+ 1 - 1
config/nacos/ruoyi-job.yml

@@ -16,7 +16,7 @@ spring:
 snail-job:
 snail-job:
   enabled: true
   enabled: true
   # 需要在 SnailJob 后台组管理创建对应名称的组,然后创建任务的时候选择对应的组,才能正确分派任务
   # 需要在 SnailJob 后台组管理创建对应名称的组,然后创建任务的时候选择对应的组,才能正确分派任务
-  group: "ruoyi_group"
+  group-name: "ruoyi_group"
   #  SnailJob 接入验证令牌
   #  SnailJob 接入验证令牌
   token: "SJ_cKqBTPzCsWA3VyuCfFoccmuIEGXjr5KT"
   token: "SJ_cKqBTPzCsWA3VyuCfFoccmuIEGXjr5KT"
   server:
   server:

+ 1 - 1
pom.xml

@@ -33,7 +33,7 @@
         <hutool.version>5.8.27</hutool.version>
         <hutool.version>5.8.27</hutool.version>
         <redisson.version>3.29.0</redisson.version>
         <redisson.version>3.29.0</redisson.version>
         <lock4j.version>2.2.7</lock4j.version>
         <lock4j.version>2.2.7</lock4j.version>
-        <snailjob.version>1.0.0-beta2</snailjob.version>
+        <snailjob.version>1.0.0-beta1</snailjob.version>
         <satoken.version>1.38.0</satoken.version>
         <satoken.version>1.38.0</satoken.version>
         <lombok.version>1.18.32</lombok.version>
         <lombok.version>1.18.32</lombok.version>
         <logstash.version>7.4</logstash.version>
         <logstash.version>7.4</logstash.version>

+ 1 - 1
ruoyi-common/ruoyi-common-job/src/main/java/org/dromara/common/job/config/SnailJobConfig.java

@@ -32,7 +32,7 @@ import java.util.List;
 @EnableConfigurationProperties(SnailJobServerProperties.class)
 @EnableConfigurationProperties(SnailJobServerProperties.class)
 @ConditionalOnProperty(prefix = "snail-job", name = "enabled", havingValue = "true")
 @ConditionalOnProperty(prefix = "snail-job", name = "enabled", havingValue = "true")
 @EnableScheduling
 @EnableScheduling
-@EnableSnailJob(group = "${snail-job.group}")
+@EnableSnailJob(group = "${snail-job.group-name}")
 public class SnailJobConfig {
 public class SnailJobConfig {
 
 
     @Autowired
     @Autowired