From 48aba34370ee1e95785d046ce49bd250b9728b5e Mon Sep 17 00:00:00 2001
From: zengqiao <zengqiao@didiglobal.com>
Date: Sun, 8 Nov 2020 20:07:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DTopic=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E4=B8=AD=E6=9C=8D=E5=8A=A1=E5=9C=B0=E5=9D=80=E4=B8=8D=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/api/versionone/normal/NormalTopicController.java  | 6 +-----
 .../kafka/manager/web/converters/TopicModelConverter.java | 8 ++++++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/kafka-manager-web/src/main/java/com/xiaojukeji/kafka/manager/web/api/versionone/normal/NormalTopicController.java b/kafka-manager-web/src/main/java/com/xiaojukeji/kafka/manager/web/api/versionone/normal/NormalTopicController.java
index d5b1f6fe..c414045f 100644
--- a/kafka-manager-web/src/main/java/com/xiaojukeji/kafka/manager/web/api/versionone/normal/NormalTopicController.java
+++ b/kafka-manager-web/src/main/java/com/xiaojukeji/kafka/manager/web/api/versionone/normal/NormalTopicController.java
@@ -18,7 +18,6 @@ import com.xiaojukeji.kafka.manager.service.cache.LogicalClusterMetadataManager;
 import com.xiaojukeji.kafka.manager.service.cache.PhysicalClusterMetadataManager;
 import com.xiaojukeji.kafka.manager.service.service.*;
 import com.xiaojukeji.kafka.manager.service.service.gateway.TopicConnectionService;
-import com.xiaojukeji.kafka.manager.service.utils.ConfigUtils;
 import com.xiaojukeji.kafka.manager.common.constant.ApiPrefix;
 import com.xiaojukeji.kafka.manager.web.converters.CommonModelConverter;
 import com.xiaojukeji.kafka.manager.web.converters.TopicModelConverter;
@@ -52,9 +51,6 @@ public class NormalTopicController {
     @Autowired
     private LogicalClusterMetadataManager logicalClusterMetadataManager;
 
-    @Autowired
-    private ConfigUtils configUtils;
-
     @Autowired
     private KafkaBillService kafkaBillService;
 
@@ -71,7 +67,7 @@ public class NormalTopicController {
         }
         return new Result<>(TopicModelConverter.convert2TopicBasicVO(
                 topicService.getTopicBasicDTO(physicalClusterId, topicName),
-                ""
+                clusterService.getById(physicalClusterId)
         ));
     }
 
diff --git a/kafka-manager-web/src/main/java/com/xiaojukeji/kafka/manager/web/converters/TopicModelConverter.java b/kafka-manager-web/src/main/java/com/xiaojukeji/kafka/manager/web/converters/TopicModelConverter.java
index 20ef4557..59e02a52 100644
--- a/kafka-manager-web/src/main/java/com/xiaojukeji/kafka/manager/web/converters/TopicModelConverter.java
+++ b/kafka-manager-web/src/main/java/com/xiaojukeji/kafka/manager/web/converters/TopicModelConverter.java
@@ -3,6 +3,7 @@ package com.xiaojukeji.kafka.manager.web.converters;
 import com.xiaojukeji.kafka.manager.common.entity.ao.topic.*;
 import com.xiaojukeji.kafka.manager.common.entity.metrics.BaseMetrics;
 import com.xiaojukeji.kafka.manager.common.entity.metrics.TopicMetrics;
+import com.xiaojukeji.kafka.manager.common.entity.pojo.ClusterDO;
 import com.xiaojukeji.kafka.manager.common.entity.vo.normal.TopicBusinessInfoVO;
 import com.xiaojukeji.kafka.manager.common.entity.vo.normal.topic.*;
 import com.xiaojukeji.kafka.manager.common.entity.vo.rd.TopicBrokerVO;
@@ -21,7 +22,7 @@ import java.util.List;
  * @date 2017/6/1.
  */
 public class TopicModelConverter {
-    public static TopicBasicVO convert2TopicBasicVO(TopicBasicDTO dto, String serviceDiscoveryAddress) {
+    public static TopicBasicVO convert2TopicBasicVO(TopicBasicDTO dto, ClusterDO clusterDO) {
         TopicBasicVO vo = new TopicBasicVO();
         vo.setClusterId(dto.getClusterId());
         vo.setAppId(dto.getAppId());
@@ -35,7 +36,10 @@ public class TopicModelConverter {
         vo.setScore(dto.getScore());
         vo.setTopicCodeC(dto.getTopicCodeC());
         vo.setDescription(dto.getDescription());
-        vo.setBootstrapServers(serviceDiscoveryAddress);
+        vo.setBootstrapServers("");
+        if (!ValidateUtils.isNull(clusterDO)) {
+            vo.setBootstrapServers(clusterDO.getBootstrapServers());
+        }
         return vo;
     }