From 9dd10862b280b3fa39f2eaa8a5abc9705b8f4977 Mon Sep 17 00:00:00 2001 From: xiang Date: Mon, 6 Apr 2026 20:46:28 +0800 Subject: [PATCH] =?UTF-8?q?fix:nacos=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/xiang/app/HealthController.java | 26 ++++++++++++++ .../src/main/resources/application-local.yml | 36 +++++++++++++++++++ ...ation-test.yml => application-outside.yml} | 4 ++- .../src/main/resources/application-prod.yml | 4 ++- .../src/main/resources/application.yml | 2 +- 5 files changed, 69 insertions(+), 3 deletions(-) create mode 100644 xservice-quartz-admin/src/main/java/com/xiang/app/HealthController.java create mode 100644 xservice-quartz-admin/src/main/resources/application-local.yml rename xservice-quartz-admin/src/main/resources/{application-test.yml => application-outside.yml} (87%) diff --git a/xservice-quartz-admin/src/main/java/com/xiang/app/HealthController.java b/xservice-quartz-admin/src/main/java/com/xiang/app/HealthController.java new file mode 100644 index 0000000..5888456 --- /dev/null +++ b/xservice-quartz-admin/src/main/java/com/xiang/app/HealthController.java @@ -0,0 +1,26 @@ +package com.xiang.app; + +import com.google.common.collect.Maps; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.Map; + +@Slf4j +@RestController +public class HealthController { + + @Value("${spring.profiles.active}") + private String env; + + @GetMapping("/actuator/health") + public Map checkHealth() { + Map map = Maps.newHashMap(); + map.put("env", env); + map.put("status", "UP"); + log.info("cornucopia application health check success! listening in env:{}, now:{}", env, System.currentTimeMillis()); + return map; + } +} diff --git a/xservice-quartz-admin/src/main/resources/application-local.yml b/xservice-quartz-admin/src/main/resources/application-local.yml new file mode 100644 index 0000000..930d110 --- /dev/null +++ b/xservice-quartz-admin/src/main/resources/application-local.yml @@ -0,0 +1,36 @@ +spring: + cloud: + nacos: + discovery: + group: DEFAULT_GROUP + namespace: 6f603892-e9f7-4ca4-acbc-538fa09ebec0 + server-addr: http://192.168.1.10:8848 + # 是否启用健康检查 + register-enabled: true + username: nacos + password: nacos + datasource: + dynamic: + primary: master + datasource: + master: + url: jdbc:mysql://120.27.153.87:3306/xservice_quartz?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true + username: quartz + password: quartz@123 + driver-class-name: com.mysql.cj.jdbc.Driver + sshConnect: false + + redis: + host: r-bp1wt59a6nfyt4e3ltpd.redis.rds.aliyuncs.com + port: 6379 + password: Xiang0000 # 如果无密码可以省略 + database: 10 + timeout: 5000 + lettuce: + pool: + max-active: 8 + max-idle: 8 + min-idle: 0 + max-wait: 1000 +xxz-job: + appName: xservice-quartz-admin \ No newline at end of file diff --git a/xservice-quartz-admin/src/main/resources/application-test.yml b/xservice-quartz-admin/src/main/resources/application-outside.yml similarity index 87% rename from xservice-quartz-admin/src/main/resources/application-test.yml rename to xservice-quartz-admin/src/main/resources/application-outside.yml index 0685ca8..815fdc9 100644 --- a/xservice-quartz-admin/src/main/resources/application-test.yml +++ b/xservice-quartz-admin/src/main/resources/application-outside.yml @@ -4,7 +4,9 @@ spring: discovery: group: DEFAULT_GROUP namespace: 00131110-3ecb-4a35-8bbb-624edde1d937 - server-addr: general.xiangtech.xyz:8848 + server-addr: http://general.xiangtech.xyz:8848 + # 是否启用健康检查 + register-enabled: false username: nacos password: nacos datasource: diff --git a/xservice-quartz-admin/src/main/resources/application-prod.yml b/xservice-quartz-admin/src/main/resources/application-prod.yml index bdfe2ab..f6a353f 100644 --- a/xservice-quartz-admin/src/main/resources/application-prod.yml +++ b/xservice-quartz-admin/src/main/resources/application-prod.yml @@ -4,7 +4,9 @@ spring: discovery: group: DEFAULT_GROUP namespace: 6f603892-e9f7-4ca4-acbc-538fa09ebec0 - server-addr: general.xiangtech.xyz:8848 + server-addr: http://192.168.32.3:8848 + # 是否启用健康检查 + register-enabled: true username: nacos password: nacos datasource: diff --git a/xservice-quartz-admin/src/main/resources/application.yml b/xservice-quartz-admin/src/main/resources/application.yml index 27558fa..9a2fa1b 100644 --- a/xservice-quartz-admin/src/main/resources/application.yml +++ b/xservice-quartz-admin/src/main/resources/application.yml @@ -2,7 +2,7 @@ server: port: 30030 spring: profiles: - active: test + active: local application: name: xservice-quartz-admin main: