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 d5b1f6fe97e8b9bf0406bcc437c06e435fdedb16..c414045f56d6135849c4311bb5c68fb7602a6296 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 20ef455797aa0628b66be48ef925357fd4a3d9b9..59e02a5227f70a8826be175abc912d5d542a26db 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; }