From 49f101308f903a784235c09192de63c8c385e2a0 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期六, 25 五月 2024 10:05:56 +0800
Subject: [PATCH] !543 回退 'Pull Request !542 : 更新SnailJob版本到1.0.0-beta2' Merge pull request !543 from 疯狂的狮子Li/revert-merge-542-dev
---
ruoyi-admin/src/main/resources/application-prod.yml | 3 +--
ruoyi-common/ruoyi-common-job/src/main/java/org/dromara/common/job/config/SnailJobConfig.java | 2 +-
pom.xml | 2 +-
ruoyi-admin/src/main/resources/application-dev.yml | 4 ++--
4 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/pom.xml b/pom.xml
index b57f236..4d04d39 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 398af9c..529a106 100644
--- a/ruoyi-admin/src/main/resources/application-dev.yml
+++ b/ruoyi-admin/src/main/resources/application-dev.yml
@@ -12,7 +12,7 @@
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:
@@ -20,6 +20,7 @@
port: 1788
# 璇﹁ script/sql/snail_job.sql `sj_namespace` 琛�
namespace: ${spring.profiles.active}
+
--- # 鏁版嵁婧愰厤缃�
spring:
@@ -101,7 +102,6 @@
# 鏄惁寮�鍚痵sl
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 4dabb68..0613bd7 100644
--- a/ruoyi-admin/src/main/resources/application-prod.yml
+++ b/ruoyi-admin/src/main/resources/application-prod.yml
@@ -15,7 +15,7 @@
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 @@
# 鏄惁寮�鍚痵sl
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 e48fe7f..d671f0e 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 @@
@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)
--
Gitblit v1.9.3