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

xieb

2023-04-23 b82f8f6f82f0d9348997abb77e5d72deac078fa2

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

@@ -39,17 +39,14 @@
      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.config.namespace", "guoshilong");
      PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.namespace", "guoshilong");
      //自定义命名空间
//      PropsUtil.setProperty(props, "spring.cloud.nacos.config.namespace", "xiebin");
//      PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.namespace", "xiebin");

      PropsUtil.setProperty(props, "spring.cloud.sentinel.transport.dashboard", LauncherConstant.sentinelAddr(profile));
      PropsUtil.setProperty(props, "spring.zipkin.base-url", LauncherConstant.zipkinAddr(profile));
      //开启多数据源
      PropsUtil.setProperty(props, "spring.datasource.dynamic.enabled", "false");

      //自定义命名空间
      PropsUtil.setProperty(props,"spring.cloud.nacos.config.namespace","guoshilong");
      PropsUtil.setProperty(props,"spring.cloud.nacos.discovery.namespace","guoshilong");

      // 开启elk日志
      // PropsUtil.setProperty(props, "blade.log.elk.destination", LauncherConstant.elkAddr(profile));