From 7fafaa53d1fab45dd458ebe7b86df39f78f5946a Mon Sep 17 00:00:00 2001 From: xuxiao Date: Thu, 23 Feb 2023 15:37:15 +0800 Subject: [PATCH] =?UTF-8?q?femas-admin=E6=95=B0=E6=8D=AE=E4=B8=AD=E5=8C=85?= =?UTF-8?q?=E5=90=AB=E6=B3=A8=E5=86=8C=E4=B8=AD=E5=BF=83=E7=9A=84=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E5=90=8D=E5=92=8C=E5=AF=86=E7=A0=81=EF=BC=8C=E5=AD=98?= =?UTF-8?q?=E5=9C=A8=E5=AE=89=E5=85=A8=E9=A3=8E=E9=99=A9=20fix=5Fissue#289?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/namespace/NamespaceMangerService.java | 2 +- .../service/registry/RegistryManagerService.java | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/femas-admin/src/main/java/com/tencent/tsf/femas/service/namespace/NamespaceMangerService.java b/femas-admin/src/main/java/com/tencent/tsf/femas/service/namespace/NamespaceMangerService.java index 023ad0eb..b986b449 100644 --- a/femas-admin/src/main/java/com/tencent/tsf/femas/service/namespace/NamespaceMangerService.java +++ b/femas-admin/src/main/java/com/tencent/tsf/femas/service/namespace/NamespaceMangerService.java @@ -124,7 +124,7 @@ public PageService namespaceToVo(PageService namespacePa NamespaceVo vo = NamespaceVo.build(ns, registryConfigs);; if(!CollectionUtil.isEmpty(ns.getRegistryId())){ for(String registryId : ns.getRegistryId()){ - RegistryConfig config = registryManagerService.getConfigById(registryId); + RegistryConfig config = registryManagerService.getSafetyConfigById(registryId); if(config != null){ registryConfigs.add(config); } diff --git a/femas-admin/src/main/java/com/tencent/tsf/femas/service/registry/RegistryManagerService.java b/femas-admin/src/main/java/com/tencent/tsf/femas/service/registry/RegistryManagerService.java index 6cde95ac..e64762a7 100644 --- a/femas-admin/src/main/java/com/tencent/tsf/femas/service/registry/RegistryManagerService.java +++ b/femas-admin/src/main/java/com/tencent/tsf/femas/service/registry/RegistryManagerService.java @@ -162,7 +162,7 @@ public Result deleteRegistryCluster(String registryId) { public Result describeRegistryCluster(String registryId) { RegistryInfo registryInfo = new RegistryInfo(); - RegistryConfig config = getConfigById(registryId); + RegistryConfig config = getSafetyConfigById(registryId); if (config == null) { return Result.success(); } @@ -291,7 +291,7 @@ public List describeServiceInstance(String namespaceId, String return instances; } - + //查询注册中心参数 public RegistryConfig getConfigById(String registryId) { RegistryConfig config = registryConfigMapCache.get(registryId); try { @@ -304,6 +304,16 @@ public RegistryConfig getConfigById(String registryId) { return config; } + //查询去掉nacos用户名和密码的注册中心参数 + public RegistryConfig getSafetyConfigById(String registryId) { + RegistryConfig config = getConfigById(registryId); + if (config != null) { + config.setUsername(""); + config.setPassword(""); + } + return config; + } + public boolean checkUrls(String urlsString) { if (StringUtils.isEmpty(urlsString)) { return false;