Skip to content

Commit 7ac5124

Browse files
committed
fix: 修复 SnailJob 1.8.0 配置错误引起的启用/禁用任务无效的问题
Closes #IDJJPV
1 parent 3bee4f2 commit 7ac5124

3 files changed

Lines changed: 43 additions & 27 deletions

File tree

continew-extension/continew-extension-schedule-server/src/main/java/top/continew/admin/extension/scheduling/ScheduleServerApplication.java

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,13 @@
1919
import cn.hutool.core.net.NetUtil;
2020
import cn.hutool.core.util.URLUtil;
2121
import cn.hutool.extra.spring.SpringUtil;
22+
import com.aizuda.snailjob.common.core.util.SnailJobVersion;
2223
import lombok.RequiredArgsConstructor;
2324
import lombok.extern.slf4j.Slf4j;
2425
import org.springframework.boot.ApplicationArguments;
2526
import org.springframework.boot.ApplicationRunner;
2627
import org.springframework.boot.SpringApplication;
28+
import org.springframework.boot.SpringBootVersion;
2729
import org.springframework.boot.autoconfigure.SpringBootApplication;
2830
import org.springframework.boot.autoconfigure.web.ServerProperties;
2931

@@ -50,10 +52,14 @@ public void run(ApplicationArguments args) {
5052
Integer port = serverProperties.getPort();
5153
String contextPath = serverProperties.getServlet().getContextPath();
5254
String baseUrl = URLUtil.normalize("%s:%s%s".formatted(hostAddress, port, contextPath));
53-
log.info("----------------------------------------------");
54-
log.info("{} service started successfully.", SpringUtil.getApplicationName());
55-
log.info("访问地址:{}", baseUrl);
56-
log.info("在线文档:https://snailjob.opensnail.com");
57-
log.info("----------------------------------------------");
55+
log.info("------------------------------------------------------");
56+
log.info("{} started successfully.", SpringUtil.getApplicationName());
57+
log.info("Snail Job: v{} (Spring Boot: v{})", SnailJobVersion.getVersion(), SpringBootVersion.getVersion());
58+
log.info("服务地址: {}", baseUrl);
59+
log.info("服务文档: https://snailjob.opensnail.com");
60+
log.info("注意: 此服务为 Snail Job 服务端 (为方便本地开发使用而特意提供)");
61+
log.info("注意: 实际生产环境,部署 Snail Job 服务端可根据官方文档进行操作");
62+
log.info("注意: 此服务非 ContiNew Admin 服务端!!!");
63+
log.info("------------------------------------------------------");
5864
}
5965
}

continew-server/src/main/resources/config/application-dev.yml

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -257,16 +257,6 @@ sa-token.extension:
257257
--- ### Snail Job 配置
258258
snail-job:
259259
enabled: false
260-
# 客户端地址(默认:自动推断。必须确保服务端可以访问到,在服务端无法调度客户端时需要手动配置)
261-
#host: 127.0.0.1
262-
# 客户端端口(默认:17889)
263-
port: 17889
264-
# 命名空间
265-
namespace: ${SCHEDULE_NAMESPACE:764d604ec6fc45f68cd92514c40e9e1a}
266-
# 接入组名
267-
group: ${SCHEDULE_GROUP:continew-admin}
268-
# 接入组 token
269-
token: ${SCHEDULE_TOKEN:SJ_Wyz3dmsdbDOkDujOTSSoBjGQP1BMsVnj}
270260
## 服务端配置(任务调度中心)
271261
server:
272262
# 服务端地址
@@ -280,4 +270,19 @@ snail-job:
280270
# 用户名
281271
username: ${SCHEDULE_USERNAME:admin}
282272
# 密码
283-
password: ${SCHEDULE_PASSWORD:admin}
273+
password: ${SCHEDULE_PASSWORD:admin}
274+
## OpenAPI 配置
275+
openapi:
276+
# 服务端 Web 端口(默认:8080,如果你部署的服务端改动了端口,这里也需要对应改动)
277+
# continew-extension/continew-extension-schedule-server
278+
port: 8001
279+
# 客户端地址(默认:自动推断。必须确保服务端可以访问到,在服务端无法调度客户端时需要手动配置)
280+
#host: 127.0.0.1
281+
# 客户端端口(默认:17889)
282+
port: 17889
283+
# 命名空间
284+
namespace: ${SCHEDULE_NAMESPACE:764d604ec6fc45f68cd92514c40e9e1a}
285+
# 接入组名
286+
group: ${SCHEDULE_GROUP:continew-admin}
287+
# 接入组 token
288+
token: ${SCHEDULE_TOKEN:SJ_Wyz3dmsdbDOkDujOTSSoBjGQP1BMsVnj}

continew-server/src/main/resources/config/application-prod.yml

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -258,16 +258,6 @@ sa-token.extension:
258258
--- ### Snail Job 配置
259259
snail-job:
260260
enabled: true
261-
# 客户端地址(默认:自动推断。必须确保服务端可以访问到,在服务端无法调度客户端时需要手动配置)
262-
#host: 127.0.0.1
263-
# 客户端端口(默认:17889)
264-
port: 17889
265-
# 命名空间
266-
namespace: ${SCHEDULE_NAMESPACE:764d604ec6fc45f68cd92514c40e9e1a}
267-
# 接入组名
268-
group: ${SCHEDULE_GROUP:continew-admin}
269-
# 接入组 token
270-
token: ${SCHEDULE_TOKEN:SJ_Wyz3dmsdbDOkDujOTSSoBjGQP1BMsVnj}
271261
## 服务端配置(任务调度中心)
272262
server:
273263
# 服务端地址
@@ -281,4 +271,19 @@ snail-job:
281271
# 用户名
282272
username: ${SCHEDULE_USERNAME:admin}
283273
# 密码
284-
password: ${SCHEDULE_PASSWORD:admin}
274+
password: ${SCHEDULE_PASSWORD:admin}
275+
## OpenAPI 配置
276+
openapi:
277+
# 服务端 Web 端口(默认:8080,如果你部署的服务端改动了端口,这里也需要对应改动)
278+
# continew-extension/continew-extension-schedule-server
279+
port: 18001
280+
# 客户端地址(默认:自动推断。必须确保服务端可以访问到,在服务端无法调度客户端时需要手动配置)
281+
#host: 127.0.0.1
282+
# 客户端端口(默认:17889)
283+
port: 17889
284+
# 命名空间
285+
namespace: ${SCHEDULE_NAMESPACE:764d604ec6fc45f68cd92514c40e9e1a}
286+
# 接入组名
287+
group: ${SCHEDULE_GROUP:continew-admin}
288+
# 接入组 token
289+
token: ${SCHEDULE_TOKEN:SJ_Wyz3dmsdbDOkDujOTSSoBjGQP1BMsVnj}

0 commit comments

Comments
 (0)