Merge remote-tracking branch 'origin/jtdev' into jtdev

xieb

2023-10-19 1dd5d8f8a616f5cf3caa7828d46989c7d3dcafc4

 skjcmanager/skjcmanager-common/src/main/java/cn/gistack/common/launch/LauncherServiceImpl.java

@@ -38,10 +38,12 @@
      // 通用注册
      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.nacos.username", LauncherConstant.NACOS_USERNAME);
      PropsUtil.setProperty(props, "spring.cloud.nacos.password", LauncherConstant.NACOS_PASSWORD);

      //自定义注册
      PropsUtil.setProperty(props, "spring.cloud.nacos.config.namespace", "zhongrijian");
      PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.namespace", "zhongrijian");
//      PropsUtil.setProperty(props, "spring.cloud.nacos.config.namespace", "guoshilong");
//      PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.namespace", "guoshilong");

      PropsUtil.setProperty(props, "spring.cloud.sentinel.transport.dashboard", LauncherConstant.sentinelAddr(profile));
      PropsUtil.setProperty(props, "spring.zipkin.base-url", LauncherConstant.zipkinAddr(profile));