From ef9707bb6a53748f8d5ee2f2a00f6a5b0f1aa453 Mon Sep 17 00:00:00 2001 From: JiyangTang Date: Wed, 11 Oct 2023 19:59:03 +0800 Subject: [PATCH] config nacos --- .../schedule/EdgeNoticePowerJobProcessor.java | 28 +++++++++++++++++++ .../admin/schedule/NoticeSchedule.java | 4 +-- .../src/main/resources/bootstrap-local.yml | 6 ++-- .../src/main/resources/bootstrap-prod.yml | 6 ++-- .../src/main/resources/bootstrap-local.yml | 6 ++-- .../src/main/resources/bootstrap-prod.yml | 6 ++-- 6 files changed, 42 insertions(+), 14 deletions(-) create mode 100644 baogutang-admin/src/main/java/top/baogutang/admin/schedule/EdgeNoticePowerJobProcessor.java diff --git a/baogutang-admin/src/main/java/top/baogutang/admin/schedule/EdgeNoticePowerJobProcessor.java b/baogutang-admin/src/main/java/top/baogutang/admin/schedule/EdgeNoticePowerJobProcessor.java new file mode 100644 index 0000000..cbba2d4 --- /dev/null +++ b/baogutang-admin/src/main/java/top/baogutang/admin/schedule/EdgeNoticePowerJobProcessor.java @@ -0,0 +1,28 @@ +package top.baogutang.admin.schedule; +// +//import org.springframework.stereotype.Component; +//import tech.powerjob.worker.core.processor.ProcessResult; +//import tech.powerjob.worker.core.processor.TaskContext; +//import tech.powerjob.worker.core.processor.sdk.BasicProcessor; +// +//import javax.annotation.Resource; +// +///** +// * @description: edge公告job +// * @author: nikooh +// * @date: 2023/09/27 : 10:55 +// */ +//@Component +//public class EdgeNoticePowerJobProcessor implements BasicProcessor { +// +// @Resource +// private NoticeSchedule noticeSchedule; +// +// @Override +// public ProcessResult process(TaskContext taskContext) throws Exception { +// noticeSchedule.edgeNotice(); +// noticeSchedule.edgeXNotice(); +// return new ProcessResult(Boolean.TRUE, "执行成功"); +// } +// +//} diff --git a/baogutang-admin/src/main/java/top/baogutang/admin/schedule/NoticeSchedule.java b/baogutang-admin/src/main/java/top/baogutang/admin/schedule/NoticeSchedule.java index 4bfe1f0..98e6263 100644 --- a/baogutang-admin/src/main/java/top/baogutang/admin/schedule/NoticeSchedule.java +++ b/baogutang-admin/src/main/java/top/baogutang/admin/schedule/NoticeSchedule.java @@ -45,8 +45,8 @@ public class NoticeSchedule { @Resource private DingTalkMsgPushUtils dingTalkMsgPushUtils; - @Value("${dingtalk.baogutang.agentId}") - private String agentId; +// @Value("${dingtalk.baogutang.agentId}") +// private String agentId; private static final String EDGE_X_REQUEST_URL = "https://art-api.edge-x.cn/api/v1/art/announcements?pageNum=1&pageSize=1"; private static final String EDGE_REQUEST_URL = "https://art-api.heishiapp.com/api/v1/art/announcements?pageNum=1&pageSize=1"; diff --git a/baogutang-admin/src/main/resources/bootstrap-local.yml b/baogutang-admin/src/main/resources/bootstrap-local.yml index 152de4e..f1f4c45 100644 --- a/baogutang-admin/src/main/resources/bootstrap-local.yml +++ b/baogutang-admin/src/main/resources/bootstrap-local.yml @@ -4,10 +4,10 @@ spring: cloud: nacos: discovery: - server-addr: 42.51.4.235:8848 + server-addr: 222.186.131.30:8848 config: - server-addr: 42.51.4.235:8848 - namespace: adcc486c-d6fb-465a-a4f6-3fea7234433b + server-addr: 222.186.131.30:8848 + namespace: 1877a228-6bff-46b9-a442-829473c3adc7 file-extension: yml refresh-enabled: true group: DEFAULT_GROUP diff --git a/baogutang-admin/src/main/resources/bootstrap-prod.yml b/baogutang-admin/src/main/resources/bootstrap-prod.yml index c74d3b2..764cd0b 100644 --- a/baogutang-admin/src/main/resources/bootstrap-prod.yml +++ b/baogutang-admin/src/main/resources/bootstrap-prod.yml @@ -4,10 +4,10 @@ spring: cloud: nacos: discovery: - server-addr: 42.51.4.235:8848 + server-addr: 222.186.131.30:8848 config: - server-addr: 42.51.4.235:8848 - namespace: 50b370f0-6fc9-4e1d-9a19-df276cff9eac + server-addr: 222.186.131.30:8848 + namespace: fe5388cc-76bc-44d6-ba20-034f97c567e5 file-extension: yml refresh-enabled: true group: DEFAULT_GROUP diff --git a/baogutang-business/src/main/resources/bootstrap-local.yml b/baogutang-business/src/main/resources/bootstrap-local.yml index 034519c..b4ce353 100644 --- a/baogutang-business/src/main/resources/bootstrap-local.yml +++ b/baogutang-business/src/main/resources/bootstrap-local.yml @@ -4,10 +4,10 @@ spring: cloud: nacos: discovery: - server-addr: 42.51.4.235:8848 + server-addr: 222.186.131.30:8848 config: - server-addr: 42.51.4.235:8848 - namespace: adcc486c-d6fb-465a-a4f6-3fea7234433b + server-addr: 222.186.131.30:8848 + namespace: 1877a228-6bff-46b9-a442-829473c3adc7 file-extension: yml refresh-enabled: true group: DEFAULT_GROUP diff --git a/baogutang-business/src/main/resources/bootstrap-prod.yml b/baogutang-business/src/main/resources/bootstrap-prod.yml index 25bbba7..6875663 100644 --- a/baogutang-business/src/main/resources/bootstrap-prod.yml +++ b/baogutang-business/src/main/resources/bootstrap-prod.yml @@ -4,10 +4,10 @@ spring: cloud: nacos: discovery: - server-addr: 42.51.4.235:8848 + server-addr: 222.186.131.30:8848 config: - server-addr: 42.51.4.235:8848 - namespace: 50b370f0-6fc9-4e1d-9a19-df276cff9eac + server-addr: 222.186.131.30:8848 + namespace: fe5388cc-76bc-44d6-ba20-034f97c567e5 file-extension: yml refresh-enabled: true group: DEFAULT_GROUP