diff --git a/xs-server/src/main/java/com/xiang/HealthController.java b/xs-server/src/main/java/com/xiang/HealthController.java new file mode 100644 index 0000000..0e3f343 --- /dev/null +++ b/xs-server/src/main/java/com/xiang/HealthController.java @@ -0,0 +1,26 @@ +package com.xiang; + +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/xs-server/src/main/resources/application-local.yml b/xs-server/src/main/resources/application-local.yml index 2588992..de5746f 100644 --- a/xs-server/src/main/resources/application-local.yml +++ b/xs-server/src/main/resources/application-local.yml @@ -9,9 +9,11 @@ spring: cloud: nacos: discovery: - server-addr: general.xiangtech.xyz:8848 - namespace: 00131110-3ecb-4a35-8bbb-624edde1d937 group: DEFAULT_GROUP + namespace: 6f603892-e9f7-4ca4-acbc-538fa09ebec0 + server-addr: http://192.168.1.10:8848 + # 是否启用健康检查 + register-enabled: true username: nacos password: nacos gateway: diff --git a/xs-server/src/main/resources/application-outside.yml b/xs-server/src/main/resources/application-outside.yml new file mode 100644 index 0000000..6685c47 --- /dev/null +++ b/xs-server/src/main/resources/application-outside.yml @@ -0,0 +1,54 @@ +server: + port: 38010 + +spring: + application: + name: xservice-gateway + main: + web-application-type: reactive # 强制使用 WebFlux + cloud: + nacos: + discovery: + group: DEFAULT_GROUP + namespace: 00131110-3ecb-4a35-8bbb-624edde1d937 + server-addr: http://general.xiangtech.xyz:8848 + # 是否启用健康检查 + register-enabled: false + username: nacos + password: nacos + gateway: + discovery: + locator: + enabled: true # 开启 nacos 自动路由 + routes: + - id: xservice-auth-center + uri: lb://xservice-auth-center + predicates: + - Path=/api-auth/** + filters: + - StripPrefix=1 + - id: xservice-common-center + uri: lb://xservice-common-center + predicates: + - Path=/api-common/** + filters: + - StripPrefix=1 + - id: xservice-stock-center + uri: lb://xservice-stock-center + predicates: + - Path=/api-stock/** + filters: + - StripPrefix=1 + + 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 \ No newline at end of file diff --git a/xs-server/src/main/resources/application-prod.yml b/xs-server/src/main/resources/application-prod.yml index e36600a..b2bfc09 100644 --- a/xs-server/src/main/resources/application-prod.yml +++ b/xs-server/src/main/resources/application-prod.yml @@ -9,9 +9,11 @@ spring: cloud: nacos: discovery: - server-addr: general.xiangtech.xyz:8848 - namespace: 6f603892-e9f7-4ca4-acbc-538fa09ebec0 group: DEFAULT_GROUP + namespace: 6f603892-e9f7-4ca4-acbc-538fa09ebec0 + server-addr: http://192.168.32.3:8848 + # 是否启用健康检查 + register-enabled: true username: nacos password: nacos gateway: