diff --git a/pom.xml b/pom.xml
index 014941fde..a3ad41e80 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@
2.2.7
4.3.0
2.14.4
- 1.0.0-beta2
+ 1.0.0-beta3
1.3.6
0.2.0
1.18.32
diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml
index 529a106bd..398af9c91 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-name: "ruoyi_group"
+ group: "ruoyi_group"
# SnailJob 接入验证令牌 详见 script/sql/snail_job.sql `sj_group_config` 表
token: "SJ_cKqBTPzCsWA3VyuCfFoccmuIEGXjr5KT"
server:
@@ -21,7 +21,6 @@ snail-job:
# 详见 script/sql/snail_job.sql `sj_namespace` 表
namespace: ${spring.profiles.active}
-
--- # 数据源配置
spring:
datasource:
@@ -102,6 +101,7 @@ 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 0613bd7df..4dabb6823 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-name: "ruoyi_group"
+ group: "ruoyi_group"
# SnailJob 接入验证令牌 详见 script/sql/snail_job.sql `sj_group_config` 表
token: "SJ_cKqBTPzCsWA3VyuCfFoccmuIEGXjr5KT"
server:
@@ -104,6 +104,7 @@ 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 d671f0ed8..cba375348 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-name}")
+@EnableSnailJob
public class SnailJobConfig {
@EventListener(SnailClientStartingEvent.class)