diff --git a/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java b/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java index 37029446..f55d6d5f 100644 --- a/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java +++ b/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java @@ -67,6 +67,21 @@ public interface LauncherConstant { */ String SENTINEL_TEST_ADDR = "172.30.0.58:8858"; + /** + * seata dev 地址 + */ + String SEATA_DEV_ADDR = "127.0.0.1:8091"; + + /** + * seata prod 地址 + */ + String SEATA_PROD_ADDR = "172.30.0.68:8091"; + + /** + * seata test 地址 + */ + String SEATA_TEST_ADDR = "172.30.0.68:8091"; + /** * zipkin dev 地址 */ @@ -75,12 +90,12 @@ public interface LauncherConstant { /** * zipkin prod 地址 */ - String ZIPKIN_PROD_ADDR = "http://172.30.0.58:9411"; + String ZIPKIN_PROD_ADDR = "http://172.30.0.71:9411"; /** * zipkin test 地址 */ - String ZIPKIN_TEST_ADDR = "http://172.30.0.58:9411"; + String ZIPKIN_TEST_ADDR = "http://172.30.0.71:9411"; /** * elk dev 地址 @@ -90,12 +105,12 @@ public interface LauncherConstant { /** * elk prod 地址 */ - String ELK_PROD_ADDR = "172.30.0.58:9000"; + String ELK_PROD_ADDR = "172.30.0.72:9000"; /** * elk test 地址 */ - String ELK_TEST_ADDR = "172.30.0.58:9000"; + String ELK_TEST_ADDR = "172.30.0.72:9000"; /** * seata file模式 @@ -161,6 +176,23 @@ public interface LauncherConstant { } } + /** + * 动态获取seata地址 + * + * @param profile 环境变量 + * @return addr + */ + static String seataAddr(String profile) { + switch (profile) { + case (AppConstant.PROD_CODE): + return SEATA_PROD_ADDR; + case (AppConstant.TEST_CODE): + return SEATA_TEST_ADDR; + default: + return SEATA_DEV_ADDR; + } + } + /** * 动态获取zipkin地址 * diff --git a/blade-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java b/blade-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java index 87c2855c..f33b59be 100644 --- a/blade-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java +++ b/blade-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java @@ -35,6 +35,7 @@ public class LauncherServiceImpl implements LauncherService { @Override public void launcher(SpringApplicationBuilder builder, String appName, String profile, boolean isLocalDev) { Properties props = System.getProperties(); + // 通用注册 PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.server-addr", LauncherConstant.nacosAddr(profile)); PropsUtil.setProperty(props, "spring.cloud.nacos.config.server-addr", LauncherConstant.nacosAddr(profile)); PropsUtil.setProperty(props, "spring.cloud.sentinel.transport.dashboard", LauncherConstant.sentinelAddr(profile)); @@ -43,6 +44,8 @@ public class LauncherServiceImpl implements LauncherService { // 开启elk日志 // PropsUtil.setProperty(props, "blade.log.elk.destination", LauncherConstant.elkAddr(profile)); + // seata注册地址 + // PropsUtil.setProperty(props, "seata.service.grouplist.default", LauncherConstant.seataAddr(profile)); // seata注册group格式 // PropsUtil.setProperty(props, "seata.tx-service-group", LauncherConstant.seataServiceGroup(appName)); // seata配置服务group diff --git a/script/docker/app/deploy.sh b/script/docker/app/deploy.sh index 285b4de9..9a49605f 100644 --- a/script/docker/app/deploy.sh +++ b/script/docker/app/deploy.sh @@ -39,7 +39,7 @@ mount(){ #启动基础模块 base(){ - docker-compose up -d nacos sentinel web-nginx blade-nginx blade-redis + docker-compose up -d nacos sentinel seata-server web-nginx blade-nginx blade-redis } #启动监控模块 diff --git a/script/docker/app/docker-compose.yml b/script/docker/app/docker-compose.yml index 5a614b6d..68a2e5f4 100644 --- a/script/docker/app/docker-compose.yml +++ b/script/docker/app/docker-compose.yml @@ -27,6 +27,19 @@ services: blade_net: ipv4_address: 172.30.0.58 + seata-server: + image: seataio/seata-server:1.1.0 + hostname: "seata-server" + ports: + - 8091:8091 + environment: + - TZ=Asia/Shanghai + - SEATA_PORT=8091 + - STORE_MODE=file + networks: + blade_net: + ipv4_address: 172.30.0.68 + blade-nginx: image: nginx:stable-alpine-perl hostname: "blade-nginx"