From 1dd5d8f8a616f5cf3caa7828d46989c7d3dcafc4 Mon Sep 17 00:00:00 2001 From: xieb <vip_xiaobin810@163.com> Date: Thu, 19 Oct 2023 15:01:43 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev --- skjcmanager/skjcmanager-common/src/main/java/cn/gistack/common/launch/LauncherServiceImpl.java | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/skjcmanager/skjcmanager-common/src/main/java/cn/gistack/common/launch/LauncherServiceImpl.java b/skjcmanager/skjcmanager-common/src/main/java/cn/gistack/common/launch/LauncherServiceImpl.java index 7661a62..6cb5886 100644 --- a/skjcmanager/skjcmanager-common/src/main/java/cn/gistack/common/launch/LauncherServiceImpl.java +++ b/skjcmanager/skjcmanager-common/src/main/java/cn/gistack/common/launch/LauncherServiceImpl.java @@ -38,14 +38,15 @@ // 通用注册 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", "xiebin"); -// PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.namespace", "xiebin"); + //自定义注册 +// 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)); - //开启多数据源 PropsUtil.setProperty(props, "spring.datasource.dynamic.enabled", "false"); // 开启elk日志 -- Gitblit v1.9.3