build dependencies version lock

1、测试代码，开源用户尽量不要使用；
2、包含Kafka-HA的相关功能，在v2.8.0_e的基础上，补充按照clientId切换的功能；
3、基于v2.8.0_e拉的分支；

README.md

@@ -1,20 +1,21 @@
 
 ---
-![KnowStreaing](https://user-images.githubusercontent.com/71620349/183546097-71451983-d00e-4ad4-afb0-43fb597c69a9.png)
 
-**一站式`Apache Kafka`管控平台**
+![logikm_logo](https://user-images.githubusercontent.com/71620349/125024570-9e07a100-e0b3-11eb-8ebc-22e73e056771.png)
 
-`LogiKM开源至今备受关注，考虑到开源项目应该更贴合Apache Kafka未来发展方向，经项目组慎重考虑，我们将其品牌升级成Know Streaming，新的大版本更新马上就绪，感谢大家一如既往的支持！也欢迎Kafka爱好者一起共建社区`
+**一站式`Apache Kafka`集群指标监控与运维管控平台**
 
-阅读本README文档，您可以了解到滴滴Know Streaming的用户群体、产品定位等信息，并通过体验地址，快速体验Kafka集群指标监控与运维管控的全流程。
+`LogiKM开源至今备受关注，考虑到开源项目应该更贴合Apache Kafka未来发展方向，经项目组慎重考虑，预计22年下半年将其品牌升级成Know Streaming，届时项目名称和Logo也将统一更新，感谢大家一如既往的支持，敬请期待！`
+
+阅读本README文档，您可以了解到滴滴Logi-KafkaManager的用户群体、产品定位等信息，并通过体验地址，快速体验Kafka集群指标监控与运维管控的全流程。
 
 
 ## 1 产品简介
-滴滴Know Streaming脱胎于滴滴内部多年的Kafka运营实践经验，是面向Kafka用户、Kafka运维人员打造的共享多租户Kafka云平台。专注于Kafka运维管控、监控告警、资源治理等核心场景，经历过大规模集群、海量大数据的考验。内部满意度高达90%的同时，还与多家知名企业达成商业化合作。
+滴滴Logi-KafkaManager脱胎于滴滴内部多年的Kafka运营实践经验，是面向Kafka用户、Kafka运维人员打造的共享多租户Kafka云平台。专注于Kafka运维管控、监控告警、资源治理等核心场景，经历过大规模集群、海量大数据的考验。内部满意度高达90%的同时，还与多家知名企业达成商业化合作。
 
 ### 1.1 快速体验地址
 
-- 体验地址（新的体验地址马上就来） http://117.51.150.133:8080  账号密码 admin/admin
+- 体验地址 http://117.51.150.133:8080  账号密码 admin/admin
 
 ### 1.2 体验地图
 相比较于同类产品的用户视角单一（大多为管理员视角），滴滴Logi-KafkaManager建立了基于分角色、多场景视角的体验地图。分别是：**用户体验地图、运维体验地图、运营体验地图**
@@ -44,7 +45,7 @@
 - 高 效 的 问 题 定 位  ：监控多项核心指标，统计不同分位数据，提供种类丰富的指标监控报表，帮助用户、运维人员快速高效定位问题
 - 便 捷 的 集 群 运 维  ：按照Region定义集群资源划分单位，将逻辑集群根据保障等级划分。在方便资源隔离、提高扩展能力的同时，实现对服务端的强管控
 - 专 业 的 资 源 治 理  ：基于滴滴内部多年运营实践，沉淀资源治理方法，建立健康分体系。针对Topic分区热点、分区不足等高频常见问题，实现资源治理专家化
-- 友 好 的 运 维 生 态  ：与Prometheus、Grafana、滴滴夜莺监控告警系统打通，集成指标分析、监控告警、集群部署、集群升级等能力。形成运维生态，凝练专家服务，使运维更高效
+- 友 好 的 运 维 生 态  ：与滴滴夜莺监控告警系统打通，集成监控告警、集群部署、集群升级等能力。形成运维生态，凝练专家服务，使运维更高效
 
 ### 1.4 滴滴Logi-KafkaManager架构图
 
@@ -54,29 +55,29 @@
 ## 2 相关文档
 
 ### 2.1 产品文档
-- [滴滴Know Streaming 安装手册](docs/install_guide/install_guide_cn.md)
+- [滴滴LogiKM 安装手册](docs/install_guide/install_guide_cn.md)
-- [滴滴Know Streaming 接入集群](docs/user_guide/add_cluster/add_cluster.md)
+- [滴滴LogiKM 接入集群](docs/user_guide/add_cluster/add_cluster.md)
-- [滴滴Know Streaming 用户使用手册](docs/user_guide/user_guide_cn.md)
+- [滴滴LogiKM 用户使用手册](docs/user_guide/user_guide_cn.md)
-- [滴滴Know Streaming FAQ](docs/user_guide/faq.md)
+- [滴滴LogiKM FAQ](docs/user_guide/faq.md)
 
 ### 2.2 社区文章
 - [滴滴云官网产品介绍](https://www.didiyun.com/production/logi-KafkaManager.html)
 - [7年沉淀之作--滴滴Logi日志服务套件](https://mp.weixin.qq.com/s/-KQp-Qo3WKEOc9wIR2iFnw)
-- [滴滴Know Streaming 一站式Kafka管控平台](https://mp.weixin.qq.com/s/9qSZIkqCnU6u9nLMvOOjIQ)
+- [滴滴LogiKM 一站式Kafka监控与管控平台](https://mp.weixin.qq.com/s/9qSZIkqCnU6u9nLMvOOjIQ)
-- [滴滴Know Streaming 开源之路](https://xie.infoq.cn/article/0223091a99e697412073c0d64)
+- [滴滴LogiKM 开源之路](https://xie.infoq.cn/article/0223091a99e697412073c0d64)
-- [滴滴Know Streaming 系列视频教程](https://space.bilibili.com/442531657/channel/seriesdetail?sid=571649)
+- [滴滴LogiKM 系列视频教程](https://space.bilibili.com/442531657/channel/seriesdetail?sid=571649)
 - [kafka最强最全知识图谱](https://www.szzdzhp.com/kafka/)
-- [滴滴Know Streaming新用户入门系列文章专栏 --石臻臻](https://www.szzdzhp.com/categories/LogIKM/)
+- [滴滴LogiKM新用户入门系列文章专栏 --石臻臻](https://www.szzdzhp.com/categories/LogIKM/)
-- [kafka实践（十五）：滴滴开源Kafka管控平台 Know Streaming研究--A叶子叶来](https://blog.csdn.net/yezonggang/article/details/113106244)
+- [kafka实践（十五）：滴滴开源Kafka管控平台 LogiKM研究--A叶子叶来](https://blog.csdn.net/yezonggang/article/details/113106244)
-- [基于云原生应用管理平台Rainbond安装 滴滴Know Streaming](https://www.rainbond.com/docs/opensource-app/logikm/?channel=logikm)
+- [基于云原生应用管理平台Rainbond安装 滴滴LogiKM](https://www.rainbond.com/docs/opensource-app/logikm/?channel=logikm)
 
-## 3 Know Streaming开源用户交流群
+## 3 滴滴Logi开源用户交流群
 
 ![image](https://user-images.githubusercontent.com/5287750/111266722-e531d800-8665-11eb-9242-3484da5a3099.png)  
 
 想跟各个大佬交流Kafka Es 等中间件/大数据相关技术请 加微信进群。
 
-微信加群：添加<font color=red>mike_zhangliang</font>、<font color=red>PenceXie</font>的微信号备注Know Streaming加群或关注公众号 云原生可观测性 回复 "Know Streaming加群"
+微信加群：添加<font color=red>mike_zhangliang</font>、<font color=red>danke-x</font>的微信号备注Logi加群或关注公众号 云原生可观测性 回复 "Logi加群"
 
 ## 4 知识星球
 
@@ -113,9 +114,4 @@ PS:提问请尽量把问题一次性描述清楚，并告知环境信息情况
 
 ## 6 协议
 
-`Know Streaming`基于`Apache-2.0`协议进行分发和使用，更多信息参见[协议文件](./LICENSE)
+`LogiKM`基于`Apache-2.0`协议进行分发和使用，更多信息参见[协议文件](./LICENSE)
-
-## 7 Star History
-
-[![Star History Chart](https://api.star-history.com/svg?repos=didi/KnowStreaming&type=Date)](https://star-history.com/#didi/KnowStreaming&Date)
-

distribution/conf/create_mysql_table.sql

@@ -592,3 +592,6 @@ CREATE TABLE `work_order` (
   `gmt_modify` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间',
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='工单表';
+
+
+ALTER TABLE `topic_connections` ADD COLUMN `client_id` VARCHAR(1024) NOT NULL DEFAULT '' COMMENT '客户端ID' AFTER `client_version`;

docs/didi/Kafka主备切换流程简介.md

@@ -0,0 +1,97 @@
+
+---
+
+![kafka-manager-logo](../assets/images/common/logo_name.png)
+
+**一站式`Apache Kafka`集群指标监控与运维管控平台**
+
+--- 
+
+# Kafka主备切换流程简介
+
+## 1、客户端读写流程
+
+在介绍Kafka主备切换流程之前，我们先来了解一下客户端通过我们自研的网关的大致读写流程。
+
+![基于网关的生产消费流程](./assets/Kafka基于网关的生产消费流程.png)
+
+
+如上图所示，客户端读写流程大致为：
+1. 客户端：向网关请求Topic元信息；
+2. 网关：发现客户端使用的KafkaUser是A集群的KafkaUser，因此将Topic元信息请求转发到A集群；
+3. A集群：收到网关的Topic元信息，处理并返回给网关；
+4. 网关：将集群A返回的结果，返回给客户端；
+5. 客户端：从Topic元信息中，获取到Topic实际位于集群A，然后客户端会连接集群A进行生产消费；
+
+**备注：客户端为Kafka原生客户端，无任何定制。**
+
+---
+
+## 2、主备切换流程
+
+介绍完基于网关的客户端读写流程之后，我们再来看一下主备高可用版的Kafka，需要如何进行主备切换。
+
+### 2.1、大体流程
+
+![Kafka主备切换流程](./assets/Kafka主备切换流程.png)
+
+图有点多，总结起来就是：
+1. 先阻止客户端数据的读写；
+2. 等待主备数据同步完成；
+3. 调整主备集群数据同步方向；
+4. 调整配置，引导客户端到备集群进行读写；
+
+
+### 2.2、详细操作
+
+看完大体流程，我们再来看一下实际操作的命令。
+
+```bash
+1. 阻止用户生产和消费
+bin/kafka-configs.sh --zookeeper ${主集群A的ZK地址} --entity-type users --entity-name ${客户端使用的kafkaUser} --add-config didi.ha.active.cluster=None --alter
+
+
+2. 等待FetcherLag 和 Offset 同步
+无需操作，仅需检查主备Topic的Offset是否一致了。
+
+
+3. 取消备集群B向主集群A进行同步数据的配置
+bin/kafka-configs.sh --zookeeper ${备集群B的ZK地址} --entity-type ha-topics --entity-name ${Topic名称} --delete-config didi.ha.remote.cluster --alter
+
+
+4. 增加主集群A向备集群B进行同步数据的配置
+bin/kafka-configs.sh --zookeeper ${主集群A的ZK地址} --entity-type ha-topics --entity-name ${Topic名称} --add-config didi.ha.remote.cluster=${备集群B的集群ID} --alter
+
+
+5. 修改主集群A，备集群B，网关中，kafkaUser对应的集群，从而引导请求走向备集群
+bin/kafka-configs.sh --zookeeper ${主集群A的ZK地址} --entity-type users --entity-name ${客户端使用的kafkaUser} --add-config didi.ha.active.cluster=${备集群B的集群ID} --alter
+
+bin/kafka-configs.sh --zookeeper ${备集群B的ZK地址} --entity-type users --entity-name ${客户端使用的kafkaUser} --add-config didi.ha.active.cluster=${备集群B的集群ID} --alter
+
+bin/kafka-configs.sh --zookeeper ${网关的ZK地址} --entity-type users --entity-name ${客户端使用的kafkaUser} --add-config didi.ha.active.cluster=${备集群B的集群ID} --alter
+```
+
+---
+
+## 3、FAQ 
+
+**问题一：使用中，有没有什么需要注意的地方？**
+
+1. 主备切换是按照KafkaUser维度进行切换的，因此建议**不同服务之间，使用不同的KafkaUser**。这不仅有助于主备切换，也有助于做权限管控等。
+2. 在建立主备关系的过程中，如果主Topic的数据量比较大，建议逐步建立主备关系，避免一次性建立太多主备关系的Topic导致主集群需要被同步大量数据从而出现压力。
+ 
+
+**问题二：消费客户端如果重启之后，会不会导致变成从最旧或者最新的数据开始消费？**
+
+不会。主备集群，会相互同步__consumer_offsets这个Topic的数据，因此客户端在主集群的消费进度信息，也会被同步到备集群，客户端在备集群进行消费时，也会从上次提交在主集群Topic的位置开始消费。
+ 
+
+**问题三：如果是类似Flink任务，是自己维护消费进度的程序，在主备切换之后，会不会存在数据丢失或者重复消费的情况？**
+
+如果Flink自己管理好了消费进度，那么就不会。因为主备集群之间的数据同步就和一个集群内的副本同步一样，备集群会将主集群Topic中的Offset信息等都同步过来，因此不会。
+ 
+
+**问题四：可否做到不重启客户端？**
+
+即将开发完成的高可用版Kafka二期将具备该能力，敬请期待。
+ 

docs/didi/drawio/Kafka主备切换流程.drawio

@@ -0,0 +1,367 @@
+<mxfile host="65bd71144e">
+    <diagram id="bhaMuW99Q1BzDTtcfRXp" name="Page-1">
+        <mxGraphModel dx="1384" dy="785" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="1169" pageHeight="827" math="0" shadow="0">
+            <root>
+                <mxCell id="0"/>
+                <mxCell id="1" parent="0"/>
+                <mxCell id="81" value="1、主集群拒绝客户端的写入" style="rounded=0;whiteSpace=wrap;html=1;absoluteArcSize=1;arcSize=14;strokeWidth=1;fillColor=#FFFFFF;strokeColor=#d79b00;labelPosition=center;verticalLabelPosition=top;align=center;verticalAlign=bottom;fontSize=16;" vertex="1" parent="1">
+                    <mxGeometry x="630" y="70" width="490" height="380" as="geometry"/>
+                </mxCell>
+                <mxCell id="79" value="主备高可用集群稳定时的状态" style="rounded=0;whiteSpace=wrap;html=1;absoluteArcSize=1;arcSize=14;strokeWidth=1;fillColor=#FFFFFF;strokeColor=#d79b00;labelPosition=center;verticalLabelPosition=top;align=center;verticalAlign=bottom;fontSize=16;" vertex="1" parent="1">
+                    <mxGeometry x="30" y="70" width="490" height="380" as="geometry"/>
+                </mxCell>
+                <mxCell id="27" value="Kafka——主集群A" style="rounded=0;whiteSpace=wrap;html=1;absoluteArcSize=1;arcSize=14;strokeWidth=1;fillColor=#cdeb8b;strokeColor=#36393d;labelPosition=center;verticalLabelPosition=top;align=center;verticalAlign=bottom;" parent="1" vertex="1">
+                    <mxGeometry x="200" y="100" width="160" height="80" as="geometry"/>
+                </mxCell>
+                <mxCell id="32" value="Zookeeper" style="rounded=0;whiteSpace=wrap;html=1;absoluteArcSize=1;arcSize=14;strokeWidth=1;fillColor=#dae8fc;strokeColor=#6c8ebf;" parent="1" vertex="1">
+                    <mxGeometry x="210" y="110" width="140" height="20" as="geometry"/>
+                </mxCell>
+                <mxCell id="33" value="Kafka-Brokers" style="rounded=0;whiteSpace=wrap;html=1;absoluteArcSize=1;arcSize=14;strokeWidth=1;fillColor=#ffe6cc;strokeColor=#d79b00;" parent="1" vertex="1">
+                    <mxGeometry x="210" y="150" width="140" height="20" as="geometry"/>
+                </mxCell>
+                <mxCell id="36" value="Kafka网关" style="rounded=0;whiteSpace=wrap;html=1;absoluteArcSize=1;arcSize=14;strokeWidth=1;fillColor=#cdeb8b;strokeColor=#36393d;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top;" parent="1" vertex="1">
+                    <mxGeometry x="200" y="220" width="160" height="80" as="geometry"/>
+                </mxCell>
+                <mxCell id="37" value="Zookeeper" style="rounded=0;whiteSpace=wrap;html=1;absoluteArcSize=1;arcSize=14;strokeWidth=1;fillColor=#dae8fc;strokeColor=#6c8ebf;" parent="1" vertex="1">
+                    <mxGeometry x="210" y="230" width="140" height="20" as="geometry"/>
+                </mxCell>
+                <mxCell id="38" value="Kafka-Gateways" style="rounded=0;whiteSpace=wrap;html=1;absoluteArcSize=1;arcSize=14;strokeWidth=1;fillColor=#ffe6cc;strokeColor=#d79b00;" parent="1" vertex="1">
+                    <mxGeometry x="210" y="270" width="140" height="20" as="geometry"/>
+                </mxCell>
+                <mxCell id="63" style="edgeStyle=orthogonalEdgeStyle;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=1;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="39" target="27">
+                    <mxGeometry relative="1" as="geometry">
+                        <Array as="points">
+                            <mxPoint x="440" y="380"/>
+                            <mxPoint x="440" y="140"/>
+                        </Array>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="64" value="备集群B 不断向 主集群A &lt;br&gt;发送Fetch请求，&lt;br&gt;从而同步主集群A的数据" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="63">
+                    <mxGeometry x="-0.05" y="-4" relative="1" as="geometry">
+                        <mxPoint x="6" y="-10" as="offset"/>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="39" value="Kafka——备集群B" style="rounded=0;whiteSpace=wrap;html=1;absoluteArcSize=1;arcSize=14;strokeWidth=1;fillColor=#cdeb8b;strokeColor=#36393d;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top;" parent="1" vertex="1">
+                    <mxGeometry x="200" y="340" width="160" height="80" as="geometry"/>
+                </mxCell>
+                <mxCell id="40" value="Zookeeper" style="rounded=0;whiteSpace=wrap;html=1;absoluteArcSize=1;arcSize=14;strokeWidth=1;fillColor=#dae8fc;strokeColor=#6c8ebf;" parent="1" vertex="1">
+                    <mxGeometry x="210" y="350" width="140" height="20" as="geometry"/>
+                </mxCell>
+                <mxCell id="41" value="Kafka-Brokers" style="rounded=0;whiteSpace=wrap;html=1;absoluteArcSize=1;arcSize=14;strokeWidth=1;fillColor=#ffe6cc;strokeColor=#d79b00;" parent="1" vertex="1">
+                    <mxGeometry x="210" y="390" width="140" height="20" as="geometry"/>
+                </mxCell>
+                <mxCell id="57" style="html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;strokeColor=default;startArrow=classic;startFill=1;" parent="1" source="42" target="27" edge="1">
+                    <mxGeometry relative="1" as="geometry"/>
+                </mxCell>
+                <mxCell id="58" value="对主集群进行读写" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="57" vertex="1" connectable="0">
+                    <mxGeometry x="-0.0724" y="1" relative="1" as="geometry">
+                        <mxPoint x="-6" as="offset"/>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="42" value="Kafka-Client" style="rounded=0;whiteSpace=wrap;html=1;absoluteArcSize=1;arcSize=14;strokeWidth=1;fillColor=#ffe6cc;strokeColor=#d79b00;" parent="1" vertex="1">
+                    <mxGeometry x="40" y="240" width="120" height="40" as="geometry"/>
+                </mxCell>
+                <mxCell id="65" value="Kafka——主集群A" style="rounded=0;whiteSpace=wrap;html=1;absoluteArcSize=1;arcSize=14;strokeWidth=1;fillColor=#cdeb8b;strokeColor=#36393d;labelPosition=center;verticalLabelPosition=top;align=center;verticalAlign=bottom;" vertex="1" parent="1">
+                    <mxGeometry x="800" y="100" width="160" height="80" as="geometry"/>
+                </mxCell>
+                <mxCell id="66" value="Zookeeper(修改ZK)" style="rounded=0;whiteSpace=wrap;html=1;absoluteArcSize=1;arcSize=14;strokeWidth=1;fillColor=#FF3333;strokeColor=#6c8ebf;" vertex="1" parent="1">
+                    <mxGeometry x="810" y="110" width="140" height="20" as="geometry"/>
+                </mxCell>
+                <mxCell id="67" value="Kafka-Brokers" style="rounded=0;whiteSpace=wrap;html=1;absoluteArcSize=1;arcSize=14;strokeWidth=1;fillColor=#ffe6cc;strokeColor=#d79b00;" vertex="1" parent="1">
+                    <mxGeometry x="810" y="150" width="140" height="20" as="geometry"/>
+                </mxCell>
+                <mxCell id="68" value="Kafka网关" style="rounded=0;whiteSpace=wrap;html=1;absoluteArcSize=1;arcSize=14;strokeWidth=1;fillColor=#cdeb8b;strokeColor=#36393d;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top;" vertex="1" parent="1">
+                    <mxGeometry x="800" y="220" width="160" height="80" as="geometry"/>
+                </mxCell>
+                <mxCell id="69" value="Zookeeper" style="rounded=0;whiteSpace=wrap;html=1;absoluteArcSize=1;arcSize=14;strokeWidth=1;fillColor=#dae8fc;strokeColor=#6c8ebf;" vertex="1" parent="1">
+                    <mxGeometry x="810" y="230" width="140" height="20" as="geometry"/>
+                </mxCell>
+                <mxCell id="70" value="Kafka-Gateways" style="rounded=0;whiteSpace=wrap;html=1;absoluteArcSize=1;arcSize=14;strokeWidth=1;fillColor=#ffe6cc;strokeColor=#d79b00;" vertex="1" parent="1">
+                    <mxGeometry x="810" y="270" width="140" height="20" as="geometry"/>
+                </mxCell>
+                <mxCell id="71" style="edgeStyle=orthogonalEdgeStyle;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=1;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="73" target="65">
+                    <mxGeometry relative="1" as="geometry">
+                        <Array as="points">
+                            <mxPoint x="1040" y="380"/>
+                            <mxPoint x="1040" y="140"/>
+                        </Array>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="72" value="备集群B 不断向 主集群A&lt;br&gt;发送Fetch请求，&lt;br&gt;从而同步主集群A的数据" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="71">
+                    <mxGeometry x="-0.05" y="-4" relative="1" as="geometry">
+                        <mxPoint x="6" y="-10" as="offset"/>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="73" value="Kafka——备集群B" style="rounded=0;whiteSpace=wrap;html=1;absoluteArcSize=1;arcSize=14;strokeWidth=1;fillColor=#cdeb8b;strokeColor=#36393d;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top;" vertex="1" parent="1">
+                    <mxGeometry x="800" y="340" width="160" height="80" as="geometry"/>
+                </mxCell>
+                <mxCell id="74" value="Zookeeper" style="rounded=0;whiteSpace=wrap;html=1;absoluteArcSize=1;arcSize=14;strokeWidth=1;fillColor=#dae8fc;strokeColor=#6c8ebf;" vertex="1" parent="1">
+                    <mxGeometry x="810" y="350" width="140" height="20" as="geometry"/>
+                </mxCell>
+                <mxCell id="75" value="Kafka-Brokers" style="rounded=0;whiteSpace=wrap;html=1;absoluteArcSize=1;arcSize=14;strokeWidth=1;fillColor=#ffe6cc;strokeColor=#d79b00;" vertex="1" parent="1">
+                    <mxGeometry x="810" y="390" width="140" height="20" as="geometry"/>
+                </mxCell>
+                <mxCell id="76" style="html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;strokeColor=#FF3333;startArrow=none;startFill=0;strokeWidth=3;endArrow=none;endFill=0;dashed=1;" edge="1" parent="1" source="78" target="65">
+                    <mxGeometry relative="1" as="geometry"/>
+                </mxCell>
+                <mxCell id="77" value="对主集群进行读写会出现失败" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];fontColor=#FF3333;fontSize=13;" vertex="1" connectable="0" parent="76">
+                    <mxGeometry x="-0.0724" y="1" relative="1" as="geometry">
+                        <mxPoint x="-6" as="offset"/>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="78" value="Kafka-Client" style="rounded=0;whiteSpace=wrap;html=1;absoluteArcSize=1;arcSize=14;strokeWidth=1;fillColor=#ffe6cc;strokeColor=#d79b00;" vertex="1" parent="1">
+                    <mxGeometry x="640" y="240" width="120" height="40" as="geometry"/>
+                </mxCell>
+                <mxCell id="82" value="2、等待主备同步完成，避免丢数据" style="rounded=0;whiteSpace=wrap;html=1;absoluteArcSize=1;arcSize=14;strokeWidth=1;fillColor=#FFFFFF;strokeColor=#d79b00;labelPosition=center;verticalLabelPosition=top;align=center;verticalAlign=bottom;fontSize=16;" vertex="1" parent="1">
+                    <mxGeometry x="630" y="590" width="490" height="380" as="geometry"/>
+                </mxCell>
+                <mxCell id="83" value="Kafka——主集群A" style="rounded=0;whiteSpace=wrap;html=1;absoluteArcSize=1;arcSize=14;strokeWidth=1;fillColor=#cdeb8b;strokeColor=#36393d;labelPosition=center;verticalLabelPosition=top;align=center;verticalAlign=bottom;" vertex="1" parent="1">
+                    <mxGeometry x="800" y="620" width="160" height="80" as="geometry"/>
+                </mxCell>
+                <mxCell id="84" value="Zookeeper" style="rounded=0;whiteSpace=wrap;html=1;absoluteArcSize=1;arcSize=14;strokeWidth=1;fillColor=#dae8fc;strokeColor=#6c8ebf;" vertex="1" parent="1">
+                    <mxGeometry x="810" y="630" width="140" height="20" as="geometry"/>
+                </mxCell>
+                <mxCell id="85" value="Kafka-Brokers" style="rounded=0;whiteSpace=wrap;html=1;absoluteArcSize=1;arcSize=14;strokeWidth=1;fillColor=#ffe6cc;strokeColor=#d79b00;" vertex="1" parent="1">
+                    <mxGeometry x="810" y="670" width="140" height="20" as="geometry"/>
+                </mxCell>
+                <mxCell id="86" value="Kafka网关" style="rounded=0;whiteSpace=wrap;html=1;absoluteArcSize=1;arcSize=14;strokeWidth=1;fillColor=#cdeb8b;strokeColor=#36393d;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top;" vertex="1" parent="1">
+                    <mxGeometry x="800" y="740" width="160" height="80" as="geometry"/>
+                </mxCell>
+                <mxCell id="87" value="Zookeeper" style="rounded=0;whiteSpace=wrap;html=1;absoluteArcSize=1;arcSize=14;strokeWidth=1;fillColor=#dae8fc;strokeColor=#6c8ebf;" vertex="1" parent="1">
+                    <mxGeometry x="810" y="750" width="140" height="20" as="geometry"/>
+                </mxCell>
+                <mxCell id="88" value="Kafka-Gateways" style="rounded=0;whiteSpace=wrap;html=1;absoluteArcSize=1;arcSize=14;strokeWidth=1;fillColor=#ffe6cc;strokeColor=#d79b00;" vertex="1" parent="1">
+                    <mxGeometry x="810" y="790" width="140" height="20" as="geometry"/>
+                </mxCell>
+                <mxCell id="89" style="edgeStyle=orthogonalEdgeStyle;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=1;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="91" target="83">
+                    <mxGeometry relative="1" as="geometry">
+                        <Array as="points">
+                            <mxPoint x="1040" y="900"/>
+                            <mxPoint x="1040" y="660"/>
+                        </Array>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="90" value="备集群B 不断向 主集群A&lt;br&gt;发送Fetch请求，&lt;br&gt;从而同步主集群A的&lt;br&gt;指定Topic的数据" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="89">
+                    <mxGeometry x="-0.05" y="-4" relative="1" as="geometry">
+                        <mxPoint x="6" y="-10" as="offset"/>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="91" value="Kafka——备集群B" style="rounded=0;whiteSpace=wrap;html=1;absoluteArcSize=1;arcSize=14;strokeWidth=1;fillColor=#cdeb8b;strokeColor=#36393d;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top;" vertex="1" parent="1">
+                    <mxGeometry x="800" y="860" width="160" height="80" as="geometry"/>
+                </mxCell>
+                <mxCell id="92" value="Zookeeper" style="rounded=0;whiteSpace=wrap;html=1;absoluteArcSize=1;arcSize=14;strokeWidth=1;fillColor=#dae8fc;strokeColor=#6c8ebf;" vertex="1" parent="1">
+                    <mxGeometry x="810" y="870" width="140" height="20" as="geometry"/>
+                </mxCell>
+                <mxCell id="93" value="Kafka-Brokers" style="rounded=0;whiteSpace=wrap;html=1;absoluteArcSize=1;arcSize=14;strokeWidth=1;fillColor=#ffe6cc;strokeColor=#d79b00;" vertex="1" parent="1">
+                    <mxGeometry x="810" y="910" width="140" height="20" as="geometry"/>
+                </mxCell>
+                <mxCell id="94" style="html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;strokeColor=#FF3333;startArrow=none;startFill=0;strokeWidth=3;endArrow=none;endFill=0;dashed=1;" edge="1" parent="1" source="96" target="83">
+                    <mxGeometry relative="1" as="geometry"/>
+                </mxCell>
+                <mxCell id="95" value="对主集群进行读写会出现失败" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];fontColor=#FF3333;fontSize=13;" vertex="1" connectable="0" parent="94">
+                    <mxGeometry x="-0.0724" y="1" relative="1" as="geometry">
+                        <mxPoint x="-6" as="offset"/>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="96" value="Kafka-Client" style="rounded=0;whiteSpace=wrap;html=1;absoluteArcSize=1;arcSize=14;strokeWidth=1;fillColor=#ffe6cc;strokeColor=#d79b00;" vertex="1" parent="1">
+                    <mxGeometry x="640" y="760" width="120" height="40" as="geometry"/>
+                </mxCell>
+                <mxCell id="97" value="3、Topic粒度数据同步方向调整，由主集群A向备集群B同步数据" style="rounded=0;whiteSpace=wrap;html=1;absoluteArcSize=1;arcSize=14;strokeWidth=1;fillColor=#FFFFFF;strokeColor=#d79b00;labelPosition=center;verticalLabelPosition=top;align=center;verticalAlign=bottom;fontSize=16;" vertex="1" parent="1">
+                    <mxGeometry x="30" y="590" width="490" height="380" as="geometry"/>
+                </mxCell>
+                <mxCell id="98" value="Kafka——主集群A" style="rounded=0;whiteSpace=wrap;html=1;absoluteArcSize=1;arcSize=14;strokeWidth=1;fillColor=#cdeb8b;strokeColor=#36393d;labelPosition=center;verticalLabelPosition=top;align=center;verticalAlign=bottom;" vertex="1" parent="1">
+                    <mxGeometry x="200" y="620" width="160" height="80" as="geometry"/>
+                </mxCell>
+                <mxCell id="99" value="Zookeeper" style="rounded=0;whiteSpace=wrap;html=1;absoluteArcSize=1;arcSize=14;strokeWidth=1;fillColor=#dae8fc;strokeColor=#6c8ebf;" vertex="1" parent="1">
+                    <mxGeometry x="210" y="630" width="140" height="20" as="geometry"/>
+                </mxCell>
+                <mxCell id="100" value="Kafka-Brokers" style="rounded=0;whiteSpace=wrap;html=1;absoluteArcSize=1;arcSize=14;strokeWidth=1;fillColor=#ffe6cc;strokeColor=#d79b00;" vertex="1" parent="1">
+                    <mxGeometry x="210" y="670" width="140" height="20" as="geometry"/>
+                </mxCell>
+                <mxCell id="101" value="Kafka网关" style="rounded=0;whiteSpace=wrap;html=1;absoluteArcSize=1;arcSize=14;strokeWidth=1;fillColor=#cdeb8b;strokeColor=#36393d;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top;" vertex="1" parent="1">
+                    <mxGeometry x="200" y="740" width="160" height="80" as="geometry"/>
+                </mxCell>
+                <mxCell id="102" value="Zookeeper" style="rounded=0;whiteSpace=wrap;html=1;absoluteArcSize=1;arcSize=14;strokeWidth=1;fillColor=#dae8fc;strokeColor=#6c8ebf;" vertex="1" parent="1">
+                    <mxGeometry x="210" y="750" width="140" height="20" as="geometry"/>
+                </mxCell>
+                <mxCell id="103" value="Kafka-Gateways" style="rounded=0;whiteSpace=wrap;html=1;absoluteArcSize=1;arcSize=14;strokeWidth=1;fillColor=#ffe6cc;strokeColor=#d79b00;" vertex="1" parent="1">
+                    <mxGeometry x="210" y="790" width="140" height="20" as="geometry"/>
+                </mxCell>
+                <mxCell id="104" style="edgeStyle=orthogonalEdgeStyle;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=1;entryY=0.5;entryDx=0;entryDy=0;endArrow=none;endFill=0;strokeColor=#FF3333;strokeWidth=1;startArrow=classic;startFill=1;" edge="1" parent="1" source="106" target="98">
+                    <mxGeometry relative="1" as="geometry">
+                        <Array as="points">
+                            <mxPoint x="440" y="900"/>
+                            <mxPoint x="440" y="660"/>
+                        </Array>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="105" value="&lt;span style=&quot;font-size: 11px;&quot;&gt;主集群A 不断向 备集群B&lt;/span&gt;&lt;br style=&quot;font-size: 11px;&quot;&gt;&lt;span style=&quot;font-size: 11px;&quot;&gt;发送Fetch请求，&lt;/span&gt;&lt;br style=&quot;font-size: 11px;&quot;&gt;&lt;span style=&quot;font-size: 11px;&quot;&gt;从而同步备集群B的&lt;br&gt;指定Topic的数据&lt;/span&gt;" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];fontColor=#FF3333;fontSize=13;" vertex="1" connectable="0" parent="104">
+                    <mxGeometry x="-0.05" y="-4" relative="1" as="geometry">
+                        <mxPoint x="-4" y="-10" as="offset"/>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="106" value="Kafka——备集群B" style="rounded=0;whiteSpace=wrap;html=1;absoluteArcSize=1;arcSize=14;strokeWidth=1;fillColor=#cdeb8b;strokeColor=#36393d;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top;" vertex="1" parent="1">
+                    <mxGeometry x="200" y="860" width="160" height="80" as="geometry"/>
+                </mxCell>
+                <mxCell id="107" value="Zookeeper" style="rounded=0;whiteSpace=wrap;html=1;absoluteArcSize=1;arcSize=14;strokeWidth=1;fillColor=#dae8fc;strokeColor=#6c8ebf;" vertex="1" parent="1">
+                    <mxGeometry x="210" y="870" width="140" height="20" as="geometry"/>
+                </mxCell>
+                <mxCell id="108" value="Kafka-Brokers" style="rounded=0;whiteSpace=wrap;html=1;absoluteArcSize=1;arcSize=14;strokeWidth=1;fillColor=#ffe6cc;strokeColor=#d79b00;" vertex="1" parent="1">
+                    <mxGeometry x="210" y="910" width="140" height="20" as="geometry"/>
+                </mxCell>
+                <mxCell id="109" style="html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;strokeColor=#FF3333;startArrow=none;startFill=0;strokeWidth=3;endArrow=none;endFill=0;dashed=1;" edge="1" parent="1" source="111" target="98">
+                    <mxGeometry relative="1" as="geometry"/>
+                </mxCell>
+                <mxCell id="110" value="对主集群进行读写会出现失败" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];fontColor=#FF3333;fontSize=13;" vertex="1" connectable="0" parent="109">
+                    <mxGeometry x="-0.0724" y="1" relative="1" as="geometry">
+                        <mxPoint x="-6" as="offset"/>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="111" value="Kafka-Client" style="rounded=0;whiteSpace=wrap;html=1;absoluteArcSize=1;arcSize=14;strokeWidth=1;fillColor=#ffe6cc;strokeColor=#d79b00;" vertex="1" parent="1">
+                    <mxGeometry x="40" y="760" width="120" height="40" as="geometry"/>
+                </mxCell>
+                <mxCell id="127" value="4、修改ZK，使得客户端使用的KafkaUser对应的集群为备集群B" style="rounded=0;whiteSpace=wrap;html=1;absoluteArcSize=1;arcSize=14;strokeWidth=1;fillColor=#FFFFFF;strokeColor=#d79b00;labelPosition=center;verticalLabelPosition=top;align=center;verticalAlign=bottom;fontSize=16;" vertex="1" parent="1">
+                    <mxGeometry x="30" y="1110" width="490" height="380" as="geometry"/>
+                </mxCell>
+                <mxCell id="128" value="Kafka——主集群A" style="rounded=0;whiteSpace=wrap;html=1;absoluteArcSize=1;arcSize=14;strokeWidth=1;fillColor=#cdeb8b;strokeColor=#36393d;labelPosition=center;verticalLabelPosition=top;align=center;verticalAlign=bottom;" vertex="1" parent="1">
+                    <mxGeometry x="200" y="1140" width="160" height="80" as="geometry"/>
+                </mxCell>
+                <mxCell id="130" value="Kafka-Brokers" style="rounded=0;whiteSpace=wrap;html=1;absoluteArcSize=1;arcSize=14;strokeWidth=1;fillColor=#ffe6cc;strokeColor=#d79b00;" vertex="1" parent="1">
+                    <mxGeometry x="210" y="1190" width="140" height="20" as="geometry"/>
+                </mxCell>
+                <mxCell id="131" value="Kafka网关" style="rounded=0;whiteSpace=wrap;html=1;absoluteArcSize=1;arcSize=14;strokeWidth=1;fillColor=#cdeb8b;strokeColor=#36393d;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top;" vertex="1" parent="1">
+                    <mxGeometry x="200" y="1260" width="160" height="80" as="geometry"/>
+                </mxCell>
+                <mxCell id="132" value="Zookeeper(修改ZK)" style="rounded=0;whiteSpace=wrap;html=1;absoluteArcSize=1;arcSize=14;strokeWidth=1;fillColor=#FF3333;strokeColor=#6c8ebf;" vertex="1" parent="1">
+                    <mxGeometry x="210" y="1270" width="140" height="20" as="geometry"/>
+                </mxCell>
+                <mxCell id="133" value="Kafka-Gateways" style="rounded=0;whiteSpace=wrap;html=1;absoluteArcSize=1;arcSize=14;strokeWidth=1;fillColor=#ffe6cc;strokeColor=#d79b00;" vertex="1" parent="1">
+                    <mxGeometry x="210" y="1310" width="140" height="20" as="geometry"/>
+                </mxCell>
+                <mxCell id="134" style="edgeStyle=orthogonalEdgeStyle;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=1;entryY=0.5;entryDx=0;entryDy=0;endArrow=none;endFill=0;strokeColor=#000000;strokeWidth=1;startArrow=classic;startFill=1;" edge="1" parent="1" source="136" target="128">
+                    <mxGeometry relative="1" as="geometry">
+                        <Array as="points">
+                            <mxPoint x="440" y="1420"/>
+                            <mxPoint x="440" y="1180"/>
+                        </Array>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="135" value="&lt;span style=&quot;color: rgb(0 , 0 , 0) ; font-size: 11px&quot;&gt;主集群A 不断向 备集群B&lt;/span&gt;&lt;br style=&quot;color: rgb(0 , 0 , 0) ; font-size: 11px&quot;&gt;&lt;span style=&quot;color: rgb(0 , 0 , 0) ; font-size: 11px&quot;&gt;发送Fetch请求，&lt;/span&gt;&lt;br style=&quot;color: rgb(0 , 0 , 0) ; font-size: 11px&quot;&gt;&lt;span style=&quot;color: rgb(0 , 0 , 0) ; font-size: 11px&quot;&gt;从而同步备集群B的&lt;br&gt;指定Topic的数据&lt;/span&gt;" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];fontColor=#FF3333;fontSize=13;" vertex="1" connectable="0" parent="134">
+                    <mxGeometry x="-0.05" y="-4" relative="1" as="geometry">
+                        <mxPoint x="-4" y="-10" as="offset"/>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="136" value="Kafka——备集群B" style="rounded=0;whiteSpace=wrap;html=1;absoluteArcSize=1;arcSize=14;strokeWidth=1;fillColor=#cdeb8b;strokeColor=#36393d;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top;" vertex="1" parent="1">
+                    <mxGeometry x="200" y="1380" width="160" height="80" as="geometry"/>
+                </mxCell>
+                <mxCell id="138" value="Kafka-Brokers" style="rounded=0;whiteSpace=wrap;html=1;absoluteArcSize=1;arcSize=14;strokeWidth=1;fillColor=#ffe6cc;strokeColor=#d79b00;" vertex="1" parent="1">
+                    <mxGeometry x="210" y="1430" width="140" height="20" as="geometry"/>
+                </mxCell>
+                <mxCell id="139" style="html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;strokeColor=#FF3333;startArrow=none;startFill=0;strokeWidth=3;endArrow=none;endFill=0;dashed=1;" edge="1" parent="1" source="141" target="128">
+                    <mxGeometry relative="1" as="geometry"/>
+                </mxCell>
+                <mxCell id="140" value="对主集群进行读写会出现失败" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];fontColor=#FF3333;fontSize=13;" vertex="1" connectable="0" parent="139">
+                    <mxGeometry x="-0.0724" y="1" relative="1" as="geometry">
+                        <mxPoint x="-6" as="offset"/>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="141" value="Kafka-Client" style="rounded=0;whiteSpace=wrap;html=1;absoluteArcSize=1;arcSize=14;strokeWidth=1;fillColor=#ffe6cc;strokeColor=#d79b00;" vertex="1" parent="1">
+                    <mxGeometry x="40" y="1280" width="120" height="40" as="geometry"/>
+                </mxCell>
+                <mxCell id="142" value="5、重启客户端，网关将请求转向集群B" style="rounded=0;whiteSpace=wrap;html=1;absoluteArcSize=1;arcSize=14;strokeWidth=1;fillColor=#FFFFFF;strokeColor=#d79b00;labelPosition=center;verticalLabelPosition=top;align=center;verticalAlign=bottom;fontSize=16;" vertex="1" parent="1">
+                    <mxGeometry x="630" y="1110" width="490" height="380" as="geometry"/>
+                </mxCell>
+                <mxCell id="143" value="Kafka——主集群A" style="rounded=0;whiteSpace=wrap;html=1;absoluteArcSize=1;arcSize=14;strokeWidth=1;fillColor=#cdeb8b;strokeColor=#36393d;labelPosition=center;verticalLabelPosition=top;align=center;verticalAlign=bottom;" vertex="1" parent="1">
+                    <mxGeometry x="800" y="1140" width="160" height="80" as="geometry"/>
+                </mxCell>
+                <mxCell id="144" value="Zookeeper" style="rounded=0;whiteSpace=wrap;html=1;absoluteArcSize=1;arcSize=14;strokeWidth=1;fillColor=#dae8fc;strokeColor=#6c8ebf;" vertex="1" parent="1">
+                    <mxGeometry x="810" y="1150" width="140" height="20" as="geometry"/>
+                </mxCell>
+                <mxCell id="145" value="Kafka-Brokers" style="rounded=0;whiteSpace=wrap;html=1;absoluteArcSize=1;arcSize=14;strokeWidth=1;fillColor=#ffe6cc;strokeColor=#d79b00;" vertex="1" parent="1">
+                    <mxGeometry x="810" y="1190" width="140" height="20" as="geometry"/>
+                </mxCell>
+                <mxCell id="146" value="Kafka网关" style="rounded=0;whiteSpace=wrap;html=1;absoluteArcSize=1;arcSize=14;strokeWidth=1;fillColor=#cdeb8b;strokeColor=#36393d;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top;" vertex="1" parent="1">
+                    <mxGeometry x="800" y="1260" width="160" height="80" as="geometry"/>
+                </mxCell>
+                <mxCell id="148" value="Kafka-Gateways" style="rounded=0;whiteSpace=wrap;html=1;absoluteArcSize=1;arcSize=14;strokeWidth=1;fillColor=#ffe6cc;strokeColor=#d79b00;" vertex="1" parent="1">
+                    <mxGeometry x="810" y="1310" width="140" height="20" as="geometry"/>
+                </mxCell>
+                <mxCell id="149" style="edgeStyle=orthogonalEdgeStyle;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=1;entryY=0.5;entryDx=0;entryDy=0;endArrow=none;endFill=0;strokeColor=#000000;strokeWidth=1;startArrow=classic;startFill=1;" edge="1" parent="1" source="151" target="143">
+                    <mxGeometry relative="1" as="geometry">
+                        <Array as="points">
+                            <mxPoint x="1040" y="1420"/>
+                            <mxPoint x="1040" y="1180"/>
+                        </Array>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="150" value="&lt;span style=&quot;color: rgb(0 , 0 , 0) ; font-size: 11px&quot;&gt;主集群A 不断向 备集群B&lt;/span&gt;&lt;br style=&quot;color: rgb(0 , 0 , 0) ; font-size: 11px&quot;&gt;&lt;span style=&quot;color: rgb(0 , 0 , 0) ; font-size: 11px&quot;&gt;发送Fetch请求，&lt;/span&gt;&lt;br style=&quot;color: rgb(0 , 0 , 0) ; font-size: 11px&quot;&gt;&lt;span style=&quot;color: rgb(0 , 0 , 0) ; font-size: 11px&quot;&gt;从而同步备集群B的&lt;br&gt;指定Topic的数据&lt;/span&gt;" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];fontColor=#FF3333;fontSize=13;" vertex="1" connectable="0" parent="149">
+                    <mxGeometry x="-0.05" y="-4" relative="1" as="geometry">
+                        <mxPoint x="-4" y="-10" as="offset"/>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="151" value="Kafka——备集群B" style="rounded=0;whiteSpace=wrap;html=1;absoluteArcSize=1;arcSize=14;strokeWidth=1;fillColor=#cdeb8b;strokeColor=#36393d;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top;" vertex="1" parent="1">
+                    <mxGeometry x="800" y="1380" width="160" height="80" as="geometry"/>
+                </mxCell>
+                <mxCell id="152" value="Zookeeper" style="rounded=0;whiteSpace=wrap;html=1;absoluteArcSize=1;arcSize=14;strokeWidth=1;fillColor=#dae8fc;strokeColor=#6c8ebf;" vertex="1" parent="1">
+                    <mxGeometry x="810" y="1390" width="140" height="20" as="geometry"/>
+                </mxCell>
+                <mxCell id="153" value="Kafka-Brokers" style="rounded=0;whiteSpace=wrap;html=1;absoluteArcSize=1;arcSize=14;strokeWidth=1;fillColor=#ffe6cc;strokeColor=#d79b00;" vertex="1" parent="1">
+                    <mxGeometry x="810" y="1430" width="140" height="20" as="geometry"/>
+                </mxCell>
+                <mxCell id="156" value="Kafka-Client" style="rounded=0;whiteSpace=wrap;html=1;absoluteArcSize=1;arcSize=14;strokeWidth=1;fillColor=#ffe6cc;strokeColor=#d79b00;" vertex="1" parent="1">
+                    <mxGeometry x="640" y="1280" width="120" height="40" as="geometry"/>
+                </mxCell>
+                <mxCell id="157" style="html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;strokeColor=default;startArrow=classic;startFill=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;" edge="1" parent="1" source="156" target="151">
+                    <mxGeometry relative="1" as="geometry">
+                        <mxPoint x="529.9966666666667" y="1400" as="sourcePoint"/>
+                        <mxPoint x="613.3299999999999" y="1300" as="targetPoint"/>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="158" value="对B集群进行读写" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="157">
+                    <mxGeometry x="-0.0724" y="1" relative="1" as="geometry">
+                        <mxPoint x="-6" as="offset"/>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="159" value="Zookeeper(修改ZK)" style="rounded=0;whiteSpace=wrap;html=1;absoluteArcSize=1;arcSize=14;strokeWidth=1;fillColor=#FF3333;strokeColor=#6c8ebf;" vertex="1" parent="1">
+                    <mxGeometry x="210" y="1150" width="140" height="20" as="geometry"/>
+                </mxCell>
+                <mxCell id="160" value="Zookeeper(修改ZK)" style="rounded=0;whiteSpace=wrap;html=1;absoluteArcSize=1;arcSize=14;strokeWidth=1;fillColor=#FF3333;strokeColor=#6c8ebf;" vertex="1" parent="1">
+                    <mxGeometry x="210" y="1390" width="140" height="20" as="geometry"/>
+                </mxCell>
+                <mxCell id="161" value="Zookeeper" style="rounded=0;whiteSpace=wrap;html=1;absoluteArcSize=1;arcSize=14;strokeWidth=1;fillColor=#dae8fc;strokeColor=#6c8ebf;" vertex="1" parent="1">
+                    <mxGeometry x="810" y="1270" width="140" height="20" as="geometry"/>
+                </mxCell>
+                <mxCell id="162" value="" style="shape=flexArrow;endArrow=classic;html=1;fontSize=13;fontColor=#FF3333;strokeColor=#000000;strokeWidth=1;fillColor=#9999FF;" edge="1" parent="1">
+                    <mxGeometry width="50" height="50" relative="1" as="geometry">
+                        <mxPoint x="550" y="259.5" as="sourcePoint"/>
+                        <mxPoint x="600" y="259.5" as="targetPoint"/>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="163" value="" style="shape=flexArrow;endArrow=classic;html=1;fontSize=13;fontColor=#FF3333;strokeColor=#000000;strokeWidth=1;fillColor=#9999FF;" edge="1" parent="1">
+                    <mxGeometry width="50" height="50" relative="1" as="geometry">
+                        <mxPoint x="879.5" y="490" as="sourcePoint"/>
+                        <mxPoint x="879.5" y="540" as="targetPoint"/>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="164" value="" style="shape=flexArrow;endArrow=classic;html=1;fontSize=13;fontColor=#FF3333;strokeColor=#000000;strokeWidth=1;fillColor=#9999FF;" edge="1" parent="1">
+                    <mxGeometry width="50" height="50" relative="1" as="geometry">
+                        <mxPoint x="274.5" y="1010" as="sourcePoint"/>
+                        <mxPoint x="274.5" y="1060" as="targetPoint"/>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="165" value="" style="shape=flexArrow;endArrow=classic;html=1;fontSize=13;fontColor=#FF3333;strokeColor=#000000;strokeWidth=1;fillColor=#9999FF;" edge="1" parent="1">
+                    <mxGeometry width="50" height="50" relative="1" as="geometry">
+                        <mxPoint x="550" y="1309" as="sourcePoint"/>
+                        <mxPoint x="600" y="1309" as="targetPoint"/>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="167" value="" style="shape=flexArrow;endArrow=classic;html=1;fontSize=13;fontColor=#FF3333;strokeColor=#000000;strokeWidth=1;fillColor=#9999FF;" edge="1" parent="1">
+                    <mxGeometry width="50" height="50" relative="1" as="geometry">
+                        <mxPoint x="606" y="779.5" as="sourcePoint"/>
+                        <mxPoint x="550" y="779.5" as="targetPoint"/>
+                    </mxGeometry>
+                </mxCell>
+            </root>
+        </mxGraphModel>
+    </diagram>
+</mxfile>

docs/didi/drawio/Kafka基于网关的生产消费流程.drawio

@@ -0,0 +1,95 @@
+<mxfile host="65bd71144e">
+    <diagram id="bhaMuW99Q1BzDTtcfRXp" name="Page-1">
+        <mxGraphModel dx="1344" dy="785" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="1169" pageHeight="827" math="0" shadow="0">
+            <root>
+                <mxCell id="0"/>
+                <mxCell id="1" parent="0"/>
+                <mxCell id="27" value="Kafka集群--A" style="rounded=0;whiteSpace=wrap;html=1;absoluteArcSize=1;arcSize=14;strokeWidth=1;fillColor=#cdeb8b;strokeColor=#36393d;labelPosition=center;verticalLabelPosition=top;align=center;verticalAlign=bottom;" vertex="1" parent="1">
+                    <mxGeometry x="320" y="40" width="160" height="80" as="geometry"/>
+                </mxCell>
+                <mxCell id="32" value="Zookeeper" style="rounded=0;whiteSpace=wrap;html=1;absoluteArcSize=1;arcSize=14;strokeWidth=1;fillColor=#dae8fc;strokeColor=#6c8ebf;" vertex="1" parent="1">
+                    <mxGeometry x="330" y="50" width="140" height="20" as="geometry"/>
+                </mxCell>
+                <mxCell id="33" value="Kafka-Brokers" style="rounded=0;whiteSpace=wrap;html=1;absoluteArcSize=1;arcSize=14;strokeWidth=1;fillColor=#ffe6cc;strokeColor=#d79b00;" vertex="1" parent="1">
+                    <mxGeometry x="330" y="90" width="140" height="20" as="geometry"/>
+                </mxCell>
+                <mxCell id="47" style="edgeStyle=orthogonalEdgeStyle;html=1;entryX=1;entryY=0.25;entryDx=0;entryDy=0;exitX=1;exitY=0.75;exitDx=0;exitDy=0;" edge="1" parent="1" source="36" target="27">
+                    <mxGeometry relative="1" as="geometry">
+                        <Array as="points">
+                            <mxPoint x="560" y="260"/>
+                            <mxPoint x="560" y="60"/>
+                        </Array>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="51" value="2、网关发现是A集群的KafkaUser，&lt;br&gt;网关将请求转发到A集群" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="47">
+                    <mxGeometry x="-0.0444" y="-1" relative="1" as="geometry">
+                        <mxPoint x="49" y="72" as="offset"/>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="55" style="edgeStyle=orthogonalEdgeStyle;html=1;exitX=0;exitY=0.5;exitDx=0;exitDy=0;entryX=1;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="36" target="42">
+                    <mxGeometry relative="1" as="geometry"/>
+                </mxCell>
+                <mxCell id="56" value="4、网关返回Topic元信息" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="55">
+                    <mxGeometry x="0.2125" relative="1" as="geometry">
+                        <mxPoint x="17" y="-10" as="offset"/>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="36" value="Kafka网关" style="rounded=0;whiteSpace=wrap;html=1;absoluteArcSize=1;arcSize=14;strokeWidth=1;fillColor=#cdeb8b;strokeColor=#36393d;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top;" vertex="1" parent="1">
+                    <mxGeometry x="320" y="200" width="160" height="80" as="geometry"/>
+                </mxCell>
+                <mxCell id="37" value="Zookeeper" style="rounded=0;whiteSpace=wrap;html=1;absoluteArcSize=1;arcSize=14;strokeWidth=1;fillColor=#dae8fc;strokeColor=#6c8ebf;" vertex="1" parent="1">
+                    <mxGeometry x="330" y="210" width="140" height="20" as="geometry"/>
+                </mxCell>
+                <mxCell id="38" value="Kafka-Gateways" style="rounded=0;whiteSpace=wrap;html=1;absoluteArcSize=1;arcSize=14;strokeWidth=1;fillColor=#ffe6cc;strokeColor=#d79b00;" vertex="1" parent="1">
+                    <mxGeometry x="330" y="250" width="140" height="20" as="geometry"/>
+                </mxCell>
+                <mxCell id="39" value="Kafka集群--B" style="rounded=0;whiteSpace=wrap;html=1;absoluteArcSize=1;arcSize=14;strokeWidth=1;fillColor=#cdeb8b;strokeColor=#36393d;labelPosition=center;verticalLabelPosition=bottom;align=center;verticalAlign=top;" vertex="1" parent="1">
+                    <mxGeometry x="320" y="360" width="160" height="80" as="geometry"/>
+                </mxCell>
+                <mxCell id="40" value="Zookeeper" style="rounded=0;whiteSpace=wrap;html=1;absoluteArcSize=1;arcSize=14;strokeWidth=1;fillColor=#dae8fc;strokeColor=#6c8ebf;" vertex="1" parent="1">
+                    <mxGeometry x="330" y="370" width="140" height="20" as="geometry"/>
+                </mxCell>
+                <mxCell id="41" value="Kafka-Brokers" style="rounded=0;whiteSpace=wrap;html=1;absoluteArcSize=1;arcSize=14;strokeWidth=1;fillColor=#ffe6cc;strokeColor=#d79b00;" vertex="1" parent="1">
+                    <mxGeometry x="330" y="410" width="140" height="20" as="geometry"/>
+                </mxCell>
+                <mxCell id="57" style="html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;strokeColor=default;startArrow=classic;startFill=1;" edge="1" parent="1" source="42" target="27">
+                    <mxGeometry relative="1" as="geometry"/>
+                </mxCell>
+                <mxCell id="58" value="5、通过Topic元信息，&lt;br&gt;客户端直接访问A集群进行生产消费" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="57">
+                    <mxGeometry x="-0.0724" y="1" relative="1" as="geometry">
+                        <mxPoint x="-6" as="offset"/>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="42" value="Kafka-Client" style="rounded=0;whiteSpace=wrap;html=1;absoluteArcSize=1;arcSize=14;strokeWidth=1;fillColor=#ffe6cc;strokeColor=#d79b00;" vertex="1" parent="1">
+                    <mxGeometry x="40" y="220" width="120" height="40" as="geometry"/>
+                </mxCell>
+                <mxCell id="48" style="html=1;entryX=0;entryY=0.75;entryDx=0;entryDy=0;exitX=0.5;exitY=1;exitDx=0;exitDy=0;edgeStyle=orthogonalEdgeStyle;" edge="1" parent="1" source="42" target="36">
+                    <mxGeometry relative="1" as="geometry">
+                        <mxPoint x="490" y="250" as="sourcePoint"/>
+                        <mxPoint x="490" y="90" as="targetPoint"/>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="50" value="1、请求Topic元信息" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="48">
+                    <mxGeometry x="-0.3373" y="-1" relative="1" as="geometry">
+                        <mxPoint x="17" y="7" as="offset"/>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="49" style="edgeStyle=orthogonalEdgeStyle;html=1;entryX=1;entryY=0.25;entryDx=0;entryDy=0;exitX=1;exitY=0.75;exitDx=0;exitDy=0;" edge="1" parent="1" source="27" target="36">
+                    <mxGeometry relative="1" as="geometry">
+                        <mxPoint x="640" y="60" as="sourcePoint"/>
+                        <mxPoint x="490" y="70" as="targetPoint"/>
+                        <Array as="points">
+                            <mxPoint x="520" y="100"/>
+                            <mxPoint x="520" y="220"/>
+                        </Array>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="52" value="3、A集群返回&lt;br&gt;Topic元信息给网关" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="49">
+                    <mxGeometry x="-0.03" y="-1" relative="1" as="geometry">
+                        <mxPoint x="-19" y="3" as="offset"/>
+                    </mxGeometry>
+                </mxCell>
+            </root>
+        </mxGraphModel>
+    </diagram>
+</mxfile>

kafka-manager-common/pom.xml

@@ -112,5 +112,15 @@
             <artifactId>lombok</artifactId>
             <scope>compile</scope>
         </dependency>
+
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.hibernate.validator</groupId>
+            <artifactId>hibernate-validator</artifactId>
+        </dependency>
     </dependencies>
 </project>

kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/bizenum/JobLogBizTypEnum.java

@@ -0,0 +1,21 @@
+package com.xiaojukeji.kafka.manager.common.bizenum;
+
+import lombok.Getter;
+
+@Getter
+public enum JobLogBizTypEnum {
+    HA_SWITCH_JOB_LOG(100, "HA-主备切换日志"),
+
+    UNKNOWN(-1, "unknown"),
+
+        ;
+
+    JobLogBizTypEnum(int code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
+
+    private final int code;
+
+    private final String msg;
+}

kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/bizenum/TaskActionEnum.java

@@ -1,11 +1,11 @@
-package com.xiaojukeji.kafka.manager.kcm.common.bizenum;
+package com.xiaojukeji.kafka.manager.common.bizenum;
 
 /**
  * 任务动作
  * @author zengqiao
  * @date 20/4/26
  */
-public enum ClusterTaskActionEnum {
+public enum TaskActionEnum {
     UNKNOWN("unknown"),
 
     START("start"),
@@ -17,13 +17,15 @@ public enum ClusterTaskActionEnum {
     REDO("redo"),
     KILL("kill"),
 
+    FORCE("force"),
+
     ROLLBACK("rollback"),
 
     ;
 
-    private String action;
+    private final String action;
 
-    ClusterTaskActionEnum(String action) {
+    TaskActionEnum(String action) {
         this.action = action;
     }
 

kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/bizenum/TaskStatusEnum.java

@@ -1,10 +1,13 @@
 package com.xiaojukeji.kafka.manager.common.bizenum;
 
+import lombok.Getter;
+
 /**
  * 任务状态
  * @author zengqiao
  * @date 2017/6/29.
  */
+@Getter
 public enum TaskStatusEnum {
     UNKNOWN(    -1, "未知"),
 
@@ -15,6 +18,7 @@ public enum TaskStatusEnum {
 
         RUNNING(    30, "运行中"),
             KILLING(    31, "杀死中"),
+            RUNNING_IN_TIMEOUT(    32, "超时运行中"),
 
         BLOCKED(    40, "暂停"),
 
@@ -30,31 +34,15 @@ public enum TaskStatusEnum {
 
     ;
 
-    private Integer code;
+    private final Integer code;
 
-    private String message;
+    private final String message;
 
     TaskStatusEnum(Integer code, String message) {
         this.code = code;
         this.message = message;
     }
 
-    public Integer getCode() {
-        return code;
-    }
-
-    public String getMessage() {
-        return message;
-    }
-
-    @Override
-    public String toString() {
-        return "TaskStatusEnum{" +
-                "code=" + code +
-                ", message='" + message + '\'' +
-                '}';
-    }
-
     public static Boolean isFinished(Integer code) {
         return code >= FINISHED.getCode();
     }

kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/bizenum/TopicAuthorityEnum.java

@@ -17,9 +17,9 @@ public enum TopicAuthorityEnum {
     OWNER(4, "可管理"),
     ;
 
-    private Integer code;
+    private final Integer code;
 
-    private String message;
+    private final String message;
 
     TopicAuthorityEnum(Integer code, String message) {
         this.code = code;
@@ -34,6 +34,16 @@ public enum TopicAuthorityEnum {
         return message;
     }
 
+    public static String getMsgByCode(Integer code) {
+        for (TopicAuthorityEnum authorityEnum: TopicAuthorityEnum.values()) {
+            if (authorityEnum.getCode().equals(code)) {
+                return authorityEnum.message;
+            }
+        }
+
+        return DENY.message;
+    }
+
     @Override
     public String toString() {
         return "TopicAuthorityEnum{" +

kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/bizenum/gateway/GatewayConfigKeyEnum.java

@@ -10,12 +10,11 @@ public enum GatewayConfigKeyEnum {
     SD_APP_RATE("SD_APP_RATE", "SD_APP_RATE"),
     SD_IP_RATE("SD_IP_RATE", "SD_IP_RATE"),
     SD_SP_RATE("SD_SP_RATE", "SD_SP_RATE"),
-
     ;
 
-    private String configType;
+    private final String configType;
 
-    private String configName;
+    private final String configName;
 
     GatewayConfigKeyEnum(String configType, String configName) {
         this.configType = configType;

kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/bizenum/ha/HaRelationTypeEnum.java

@@ -0,0 +1,27 @@
+package com.xiaojukeji.kafka.manager.common.bizenum.ha;
+
+import lombok.Getter;
+
+/**
+ * @author zengqiao
+ * @date 20/7/28
+ */
+@Getter
+public enum HaRelationTypeEnum {
+    UNKNOWN(-1, "非高可用"),
+
+    STANDBY(0, "备"),
+
+    ACTIVE(1, "主"),
+
+    MUTUAL_BACKUP(2 , "互备");
+
+    private final int code;
+
+    private final String msg;
+
+    HaRelationTypeEnum(int code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
+}

kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/bizenum/ha/HaResTypeEnum.java

@@ -0,0 +1,29 @@
+package com.xiaojukeji.kafka.manager.common.bizenum.ha;
+
+import lombok.Getter;
+
+/**
+ * @author zengqiao
+ * @date 20/7/28
+ */
+@Getter
+public enum HaResTypeEnum {
+    CLUSTER(0, "Cluster"),
+
+    TOPIC(1, "Topic"),
+
+    KAFKA_USER(2, "KafkaUser"),
+
+    KAFKA_USER_AND_CLIENT(3, "KafkaUserAndClient"),
+
+    ;
+
+    private final int code;
+
+    private final String msg;
+
+    HaResTypeEnum(int code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
+}

kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/bizenum/ha/HaStatusEnum.java

@@ -0,0 +1,75 @@
+package com.xiaojukeji.kafka.manager.common.bizenum.ha;
+
+/**
+ * @author zengqiao
+ * @date 20/7/28
+ */
+public enum HaStatusEnum {
+    UNKNOWN(-1, "未知状态"),
+
+    STABLE(HaStatusEnum.STABLE_CODE, "稳定状态"),
+
+//    SWITCHING(HaStatusEnum.SWITCHING_CODE, "切换中"),
+        SWITCHING_PREPARE(
+                HaStatusEnum.SWITCHING_PREPARE_CODE,
+                "主备切换--源集群[%s]--预处理(阻止当前主Topic写入)"),
+
+        SWITCHING_WAITING_IN_SYNC(
+                HaStatusEnum.SWITCHING_WAITING_IN_SYNC_CODE,
+                "主备切换--目标集群[%s]--等待主与备Topic数据同步完成"),
+
+        SWITCHING_CLOSE_OLD_STANDBY_TOPIC_FETCH(
+                HaStatusEnum.SWITCHING_CLOSE_OLD_STANDBY_TOPIC_FETCH_CODE,
+                "主备切换--目标集群[%s]--关闭旧的备Topic的副本同步"),
+        SWITCHING_OPEN_NEW_STANDBY_TOPIC_FETCH(
+                HaStatusEnum.SWITCHING_OPEN_NEW_STANDBY_TOPIC_FETCH_CODE,
+                "主备切换--源集群[%s]--开启新的备Topic的副本同步"),
+
+        SWITCHING_CLOSEOUT(
+                HaStatusEnum.SWITCHING_CLOSEOUT_CODE,
+                "主备切换--目标集群[%s]--收尾(允许新的主Topic写入)"),
+
+    ;
+
+    public static final int UNKNOWN_CODE = -1;
+    public static final int STABLE_CODE = 0;
+
+    public static final int SWITCHING_CODE = 100;
+    public static final int SWITCHING_PREPARE_CODE = 101;
+
+    public static final int SWITCHING_WAITING_IN_SYNC_CODE = 102;
+    public static final int SWITCHING_CLOSE_OLD_STANDBY_TOPIC_FETCH_CODE = 103;
+    public static final int SWITCHING_OPEN_NEW_STANDBY_TOPIC_FETCH_CODE = 104;
+
+    public static final int SWITCHING_CLOSEOUT_CODE = 105;
+
+
+    private final int code;
+
+    private final String msg;
+
+    public int getCode() {
+        return code;
+    }
+
+    public String getMsg(String clusterName) {
+        if (this.code == UNKNOWN_CODE || this.code == STABLE_CODE) {
+            return this.msg;
+        }
+        return String.format(msg, clusterName);
+    }
+
+    HaStatusEnum(int code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
+
+    public static Integer calProgress(Integer status) {
+        if (status == null || status == HaStatusEnum.STABLE_CODE || status == UNKNOWN_CODE) {
+            return 100;
+        }
+
+        // 最小进度为 1%
+        return Math.max(1, (status - 101) * 100 / 5);
+    }
+}

kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/bizenum/ha/job/HaJobActionEnum.java

@@ -0,0 +1,44 @@
+package com.xiaojukeji.kafka.manager.common.bizenum.ha.job;
+
+public enum HaJobActionEnum {
+    /**
+     *
+     */
+    START(1,"start"),
+
+    STOP(2, "stop"),
+
+    CANCEL(3,"cancel"),
+
+    CONTINUE(4,"continue"),
+
+    UNKNOWN(-1, "unknown");
+
+    HaJobActionEnum(int status, String value) {
+        this.status = status;
+        this.value = value;
+    }
+
+    private final int status;
+
+    private final String value;
+
+    public int getStatus() {
+        return status;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public static HaJobActionEnum valueOfStatus(int status) {
+        for (HaJobActionEnum statusEnum : HaJobActionEnum.values()) {
+            if (status == statusEnum.getStatus()) {
+                return statusEnum;
+            }
+        }
+
+        return HaJobActionEnum.UNKNOWN;
+    }
+
+}

kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/bizenum/ha/job/HaJobStatusEnum.java

@@ -0,0 +1,75 @@
+package com.xiaojukeji.kafka.manager.common.bizenum.ha.job;
+
+import com.xiaojukeji.kafka.manager.common.bizenum.TaskStatusEnum;
+
+public enum HaJobStatusEnum {
+    /**执行中*/
+    RUNNING(TaskStatusEnum.RUNNING),
+    RUNNING_IN_TIMEOUT(TaskStatusEnum.RUNNING_IN_TIMEOUT),
+
+    SUCCESS(TaskStatusEnum.SUCCEED),
+
+    FAILED(TaskStatusEnum.FAILED),
+
+    UNKNOWN(TaskStatusEnum.UNKNOWN);
+
+    HaJobStatusEnum(TaskStatusEnum taskStatusEnum) {
+        this.status = taskStatusEnum.getCode();
+        this.value = taskStatusEnum.getMessage();
+    }
+
+    private final int status;
+
+    private final String value;
+
+    public int getStatus() {
+        return status;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public static HaJobStatusEnum valueOfStatus(int status) {
+        for (HaJobStatusEnum statusEnum : HaJobStatusEnum.values()) {
+            if (status == statusEnum.getStatus()) {
+                return statusEnum;
+            }
+        }
+
+        return HaJobStatusEnum.UNKNOWN;
+    }
+
+    public static HaJobStatusEnum getStatusBySubStatus(int totalJobNum,
+                                                       int successJobNu,
+                                                       int failedJobNu,
+                                                       int runningJobNu,
+                                                       int runningInTimeoutJobNu,
+                                                       int unknownJobNu) {
+        if (unknownJobNu > 0) {
+            return UNKNOWN;
+        }
+
+        if((failedJobNu + runningJobNu + runningInTimeoutJobNu + unknownJobNu) == 0) {
+            return SUCCESS;
+        }
+
+        if((runningJobNu + runningInTimeoutJobNu + unknownJobNu) == 0 && failedJobNu > 0) {
+            return FAILED;
+        }
+
+        if (runningInTimeoutJobNu > 0) {
+            return RUNNING_IN_TIMEOUT;
+        }
+
+        return RUNNING;
+    }
+
+    public static boolean isRunning(Integer jobStatus) {
+        return jobStatus != null && (RUNNING.status == jobStatus || RUNNING_IN_TIMEOUT.status == jobStatus);
+    }
+
+    public static boolean isFinished(Integer jobStatus) {
+        return jobStatus != null && (SUCCESS.status == jobStatus || FAILED.status == jobStatus);
+    }
+}

kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/constant/ConfigConstant.java

@@ -31,6 +31,10 @@ public class ConfigConstant {
 
     public static final String KAFKA_CLUSTER_DO_CONFIG_KEY = "KAFKA_CLUSTER_DO_CONFIG";
 
+    public static final String HA_SWITCH_JOB_TIMEOUT_UNIT_SEC_CONFIG_PREFIX = "HA_SWITCH_JOB_TIMEOUT_UNIT_SEC_CONFIG_CLUSTER";
+
+    public static final String HA_CONNECTION_ACTIVE_TIME_UNIT_MIN = "HA_CONNECTION_ACTIVE_TIME_UNIT_MIN";
+
     private ConfigConstant() {
     }
 }

kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/constant/KafkaConstant.java

@@ -21,6 +21,32 @@ public class KafkaConstant {
 
     public static final String INTERNAL_KEY = "INTERNAL";
 
+    public static final String BOOTSTRAP_SERVERS = "bootstrap.servers";
+
+
+    /**
+     * HA
+     */
+
+    public static final String DIDI_KAFKA_ENABLE = "didi.kafka.enable";
+
+    public static final String DIDI_HA_REMOTE_CLUSTER = "didi.ha.remote.cluster";
+
+    // TODO 平台来管理配置，不需要底层来管理，因此可以删除该配置
+    public static final String DIDI_HA_SYNC_TOPIC_CONFIGS_ENABLED = "didi.ha.sync.topic.configs.enabled";
+
+    public static final String DIDI_HA_ACTIVE_CLUSTER = "didi.ha.active.cluster";
+
+    public static final String DIDI_HA_REMOTE_TOPIC = "didi.ha.remote.topic";
+
+    public static final String SECURITY_PROTOCOL = "security.protocol";
+
+    public static final String SASL_MECHANISM = "sasl.mechanism";
+
+    public static final String SASL_JAAS_CONFIG = "sasl.jaas.config";
+
+    public static final String NONE = "None";
+
     private KafkaConstant() {
     }
 }

kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/constant/MsgConstant.java

@@ -0,0 +1,96 @@
+package com.xiaojukeji.kafka.manager.common.constant;
+
+/**
+ * 信息模版Constant
+ * @author zengqiao
+ * @date 22/03/03
+ */
+public class MsgConstant {
+    private MsgConstant() {
+    }
+
+    /**************************************************** Cluster ****************************************************/
+
+    public static String getClusterBizStr(Long clusterPhyId, String clusterName){
+        return String.format("集群ID:[%d] 集群名称:[%s]", clusterPhyId, clusterName);
+    }
+
+    public static String getClusterPhyNotExist(Long clusterPhyId) {
+        return String.format("集群ID:[%d] 不存在或者未加载", clusterPhyId);
+    }
+
+
+
+    /**************************************************** Broker ****************************************************/
+
+    public static String getBrokerNotExist(Long clusterPhyId, Integer brokerId) {
+        return String.format("集群ID:[%d] brokerId:[%d] 不存在或未存活", clusterPhyId, brokerId);
+    }
+
+    public static String getBrokerBizStr(Long clusterPhyId, Integer brokerId) {
+        return String.format("集群ID:[%d] brokerId:[%d]", clusterPhyId, brokerId);
+    }
+
+
+    /**************************************************** Topic ****************************************************/
+
+    public static String getTopicNotExist(Long clusterPhyId, String topicName) {
+        return String.format("集群ID:[%d] Topic名称:[%s] 不存在", clusterPhyId, topicName);
+    }
+
+    public static String getTopicBizStr(Long clusterPhyId, String topicName) {
+        return String.format("集群ID:[%d] Topic名称:[%s]", clusterPhyId, topicName);
+    }
+
+    public static String getTopicExtend(Long existPartitionNum, Long totalPartitionNum,String expandParam){
+        return  String.format("新增分区, 从:[%d] 增加到:[%d], 详细参数信息:[%s]", existPartitionNum,totalPartitionNum,expandParam);
+    }
+
+    public static String getClusterTopicKey(Long clusterPhyId, String topicName) {
+        return String.format("%d@%s", clusterPhyId, topicName);
+    }
+
+    /**************************************************** Partition ****************************************************/
+
+    public static String getPartitionNotExist(Long clusterPhyId, String topicName) {
+        return String.format("集群ID:[%d] Topic名称:[%s] 存在非法的分区ID", clusterPhyId, topicName);
+    }
+
+    public static String getPartitionNotExist(Long clusterPhyId, String topicName, Integer partitionId) {
+        return String.format("集群ID:[%d] Topic名称:[%s] 分区Id:[%d] 不存在", clusterPhyId, topicName, partitionId);
+    }
+
+    /**************************************************** KafkaUser ****************************************************/
+
+    public static String getKafkaUserBizStr(Long clusterPhyId, String kafkaUser) {
+        return String.format("集群ID:[%d] kafkaUser:[%s]", clusterPhyId, kafkaUser);
+    }
+
+    public static String getKafkaUserNotExist(Long clusterPhyId, String kafkaUser) {
+        return String.format("集群ID:[%d] kafkaUser:[%s] 不存在", clusterPhyId, kafkaUser);
+    }
+
+    public static String getKafkaUserDuplicate(Long clusterPhyId, String kafkaUser) {
+        return String.format("集群ID:[%d] kafkaUser:[%s] 已存在", clusterPhyId, kafkaUser);
+    }
+
+    /**************************************************** ha-Cluster ****************************************************/
+
+    public static String getActiveClusterDuplicate(Long clusterPhyId, String clusterName) {
+        return String.format("集群ID:[%d] 主集群:[%s] 已存在", clusterPhyId, clusterName);
+    }
+
+    /**************************************************** reassign ****************************************************/
+
+    public static String getReassignJobBizStr(Long jobId, Long clusterPhyId) {
+        return String.format("任务Id:[%d] 集群ID:[%s]", jobId, clusterPhyId);
+    }
+
+    public static String getJobIdCanNotNull() {
+        return "jobId不允许为空";
+    }
+
+    public static String getJobNotExist(Long jobId) {
+        return String.format("jobId:[%d] 不存在", jobId);
+    }
+}

kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/BaseResult.java

@@ -0,0 +1,28 @@
+package com.xiaojukeji.kafka.manager.common.entity;
+
+import com.xiaojukeji.kafka.manager.common.constant.Constant;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.ToString;
+
+import java.io.Serializable;
+
+@Data
+@ToString
+public class BaseResult implements Serializable {
+    private static final long serialVersionUID = -5771016784021901099L;
+
+    @ApiModelProperty(value = "信息", example = "成功")
+    protected String message;
+
+    @ApiModelProperty(value = "状态", example = "0")
+    protected int code;
+
+    public boolean successful() {
+        return !this.failed();
+    }
+
+    public boolean failed() {
+        return !Constant.SUCCESS.equals(code);
+    }
+}

kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/Result.java

@@ -1,21 +1,23 @@
 package com.xiaojukeji.kafka.manager.common.entity;
 
-import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.ApiModel;
-import com.xiaojukeji.kafka.manager.common.constant.Constant;
+import io.swagger.annotations.ApiModelProperty;
-
+import lombok.Data;
-import java.io.Serializable;
 
 /**
  * @author huangyiminghappy@163.com
  * @date 2019-07-08
  */
-public class Result<T> implements Serializable {
+@Data
-    private static final long serialVersionUID = -2772975319944108658L;
+@ApiModel(description = "调用结果")
+public class Result<T> extends BaseResult {
+    @ApiModelProperty(value = "数据")
+    protected T data;
 
-    private T data;
+    public Result() {
-    private String message;
+        this.code = ResultStatus.SUCCESS.getCode();
-    private String tips;
+        this.message = ResultStatus.SUCCESS.getMessage();
-    private int code;
+    }
 
     public Result(T data) {
         this.data = data;
@@ -23,10 +25,6 @@ public class Result<T> implements Serializable {
         this.message = ResultStatus.SUCCESS.getMessage();
     }
 
-    public Result() {
-        this(null);
-    }
-
     public Result(Integer code, String message) {
         this.message = message;
         this.code = code;
@@ -38,48 +36,31 @@ public class Result<T> implements Serializable {
         this.code = code;
     }
 
-    public T getData()
+    public static <T> Result<T> build(boolean succ) {
-    {
+        if (succ) {
-        return (T)this.data;
+            return buildSuc();
+        }
+        return buildFail();
     }
 
-    public void setData(T data)
+    public static <T> Result<T> buildFail() {
-    {
+        Result<T> result = new Result<>();
-        this.data = data;
+        result.setCode(ResultStatus.FAIL.getCode());
+        result.setMessage(ResultStatus.FAIL.getMessage());
+        return result;
     }
 
-    public String getMessage()
+    public static <T> Result<T> build(boolean succ, T data) {
-    {
+        Result<T> result = new Result<>();
-        return this.message;
+        if (succ) {
+            result.setCode(ResultStatus.SUCCESS.getCode());
+            result.setMessage(ResultStatus.SUCCESS.getMessage());
+            result.setData(data);
+        } else {
+            result.setCode(ResultStatus.FAIL.getCode());
+            result.setMessage(ResultStatus.FAIL.getMessage());
         }
-
+        return result;
-    public void setMessage(String message)
-    {
-        this.message = message;
-    }
-
-    public String getTips() {
-        return tips;
-    }
-
-    public void setTips(String tips) {
-        this.tips = tips;
-    }
-
-    public int getCode()
-    {
-        return this.code;
-    }
-
-    public void setCode(int code)
-    {
-        this.code = code;
-    }
-
-    @Override
-    public String toString()
-    {
-        return JSON.toJSONString(this);
     }
 
     public static <T> Result<T> buildSuc() {
@@ -97,14 +78,6 @@ public class Result<T> implements Serializable {
         return result;
     }
 
-    public static <T> Result<T> buildGatewayFailure(String message) {
-        Result<T> result = new Result<>();
-        result.setCode(ResultStatus.GATEWAY_INVALID_REQUEST.getCode());
-        result.setMessage(message);
-        result.setData(null);
-        return result;
-    }
-
     public static <T> Result<T> buildFailure(String message) {
         Result<T> result = new Result<>();
         result.setCode(ResultStatus.FAIL.getCode());
@@ -113,10 +86,34 @@ public class Result<T> implements Serializable {
         return result;
     }
 
-    public static <T> Result<T> buildFrom(ResultStatus resultStatus) {
+    public static <T> Result<T> buildFailure(String message,  T data) {
         Result<T> result = new Result<>();
-        result.setCode(resultStatus.getCode());
+        result.setCode(ResultStatus.FAIL.getCode());
-        result.setMessage(resultStatus.getMessage());
+        result.setMessage(message);
+        result.setData(data);
+        return result;
+    }
+
+    public static <T> Result<T> buildFailure(ResultStatus rs) {
+        Result<T> result = new Result<>();
+        result.setCode(rs.getCode());
+        result.setMessage(rs.getMessage());
+        result.setData(null);
+        return result;
+    }
+
+    public static <T> Result<T> buildGatewayFailure(String message) {
+        Result<T> result = new Result<>();
+        result.setCode(ResultStatus.GATEWAY_INVALID_REQUEST.getCode());
+        result.setMessage(message);
+        result.setData(null);
+        return result;
+    }
+
+    public static <T> Result<T> buildFrom(ResultStatus rs) {
+        Result<T> result = new Result<>();
+        result.setCode(rs.getCode());
+        result.setMessage(rs.getMessage());
         return result;
     }
 
@@ -128,8 +125,46 @@ public class Result<T> implements Serializable {
         return result;
     }
 
-    public boolean failed() {
+    public static <T> Result<T> buildFromRSAndMsg(ResultStatus resultStatus, String message) {
-        return !Constant.SUCCESS.equals(code);
+        Result<T> result = new Result<>();
+        result.setCode(resultStatus.getCode());
+        result.setMessage(message);
+        result.setData(null);
+        return result;
     }
 
+    public static <T> Result<T> buildFromRSAndData(ResultStatus rs, T data) {
+        Result<T> result = new Result<>();
+        result.setCode(rs.getCode());
+        result.setMessage(rs.getMessage());
+        result.setData(data);
+        return result;
+    }
+
+    public static <T, U> Result<T> buildFromIgnoreData(Result<U> anotherResult) {
+        Result<T> result = new Result<>();
+        result.setCode(anotherResult.getCode());
+        result.setMessage(anotherResult.getMessage());
+        return result;
+    }
+
+    public static <T> Result<T> buildParamIllegal(String msg) {
+        Result<T> result = new Result<>();
+        result.setCode(ResultStatus.PARAM_ILLEGAL.getCode());
+        result.setMessage(ResultStatus.PARAM_ILLEGAL.getMessage() + ":" + msg + "，请检查后再提交！");
+        return result;
+    }
+
+    public boolean hasData(){
+        return !failed() && this.data != null;
+    }
+
+    @Override
+    public String toString() {
+        return "Result{" +
+                "message='" + message + '\'' +
+                ", code=" + code +
+                ", data=" + data +
+                '}';
+    }
 }

kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/ResultStatus.java

@@ -23,6 +23,8 @@ public enum ResultStatus {
     API_CALL_EXCEED_LIMIT(1403, "api call exceed limit"),
     USER_WITHOUT_AUTHORITY(1404, "user without authority"),
     CHANGE_ZOOKEEPER_FORBIDDEN(1405, "change zookeeper forbidden"),
+    HA_CLUSTER_DELETE_FORBIDDEN(1409, "先删除主topic，才能删除该集群"),
+    HA_TOPIC_DELETE_FORBIDDEN(1410, "先解除高可用关系，才能删除该topic"),
 
 
     APP_OFFLINE_FORBIDDEN(1406, "先下线topic，才能下线应用～"),
@@ -76,6 +78,8 @@ public enum ResultStatus {
     QUOTA_NOT_EXIST(7113, "quota not exist, please check clusterId, topicName and appId"),
     CONSUMER_GROUP_NOT_EXIST(7114, "consumerGroup not exist"),
     TOPIC_BIZ_DATA_NOT_EXIST(7115, "topic biz data not exist, please sync topic to db"),
+    SD_ZK_NOT_EXIST(7116, "SD_ZK未配置"),
+
 
     // 资源已存在
     RESOURCE_ALREADY_EXISTED(7200, "资源已经存在"),
@@ -88,6 +92,7 @@ public enum ResultStatus {
     RESOURCE_ALREADY_USED(7400, "资源早已被使用"),
 
 
+
     /**
      * 因为外部系统的问题, 操作时引起的错误, [8000, 9000)
      * ------------------------------------------------------------------------------------------
@@ -98,6 +103,7 @@ public enum ResultStatus {
     ZOOKEEPER_READ_FAILED(8021, "zookeeper read failed"),
     ZOOKEEPER_WRITE_FAILED(8022, "zookeeper write failed"),
     ZOOKEEPER_DELETE_FAILED(8023, "zookeeper delete failed"),
+    ZOOKEEPER_OPERATE_FAILED(8024, "zookeeper operate failed"),
 
     // 调用集群任务里面的agent失败
     CALL_CLUSTER_TASK_AGENT_FAILED(8030, " call cluster task agent failed"),

kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/ao/ClusterDetailDTO.java

@@ -1,11 +1,14 @@
 package com.xiaojukeji.kafka.manager.common.entity.ao;
 
+import lombok.Data;
+
 import java.util.Date;
 
 /**
  * @author zengqiao
  * @date 20/4/23
  */
+@Data
 public class ClusterDetailDTO {
     private Long clusterId;
 
@@ -41,141 +44,9 @@ public class ClusterDetailDTO {
 
     private Integer regionNum;
 
-    public Long getClusterId() {
+    private Integer haRelation;
-        return clusterId;
-    }
 
-    public void setClusterId(Long clusterId) {
+    private String mutualBackupClusterName;
-        this.clusterId = clusterId;
-    }
-
-    public String getClusterName() {
-        return clusterName;
-    }
-
-    public void setClusterName(String clusterName) {
-        this.clusterName = clusterName;
-    }
-
-    public String getZookeeper() {
-        return zookeeper;
-    }
-
-    public void setZookeeper(String zookeeper) {
-        this.zookeeper = zookeeper;
-    }
-
-    public String getBootstrapServers() {
-        return bootstrapServers;
-    }
-
-    public void setBootstrapServers(String bootstrapServers) {
-        this.bootstrapServers = bootstrapServers;
-    }
-
-    public String getKafkaVersion() {
-        return kafkaVersion;
-    }
-
-    public void setKafkaVersion(String kafkaVersion) {
-        this.kafkaVersion = kafkaVersion;
-    }
-
-    public String getIdc() {
-        return idc;
-    }
-
-    public void setIdc(String idc) {
-        this.idc = idc;
-    }
-
-    public Integer getMode() {
-        return mode;
-    }
-
-    public void setMode(Integer mode) {
-        this.mode = mode;
-    }
-
-    public String getSecurityProperties() {
-        return securityProperties;
-    }
-
-    public void setSecurityProperties(String securityProperties) {
-        this.securityProperties = securityProperties;
-    }
-
-    public String getJmxProperties() {
-        return jmxProperties;
-    }
-
-    public void setJmxProperties(String jmxProperties) {
-        this.jmxProperties = jmxProperties;
-    }
-
-    public Integer getStatus() {
-        return status;
-    }
-
-    public void setStatus(Integer status) {
-        this.status = status;
-    }
-
-    public Date getGmtCreate() {
-        return gmtCreate;
-    }
-
-    public void setGmtCreate(Date gmtCreate) {
-        this.gmtCreate = gmtCreate;
-    }
-
-    public Date getGmtModify() {
-        return gmtModify;
-    }
-
-    public void setGmtModify(Date gmtModify) {
-        this.gmtModify = gmtModify;
-    }
-
-    public Integer getBrokerNum() {
-        return brokerNum;
-    }
-
-    public void setBrokerNum(Integer brokerNum) {
-        this.brokerNum = brokerNum;
-    }
-
-    public Integer getTopicNum() {
-        return topicNum;
-    }
-
-    public void setTopicNum(Integer topicNum) {
-        this.topicNum = topicNum;
-    }
-
-    public Integer getConsumerGroupNum() {
-        return consumerGroupNum;
-    }
-
-    public void setConsumerGroupNum(Integer consumerGroupNum) {
-        this.consumerGroupNum = consumerGroupNum;
-    }
-
-    public Integer getControllerId() {
-        return controllerId;
-    }
-
-    public void setControllerId(Integer controllerId) {
-        this.controllerId = controllerId;
-    }
-
-    public Integer getRegionNum() {
-        return regionNum;
-    }
-
-    public void setRegionNum(Integer regionNum) {
-        this.regionNum = regionNum;
-    }
 
     @Override
     public String toString() {
@@ -197,6 +68,8 @@ public class ClusterDetailDTO {
                 ", consumerGroupNum=" + consumerGroupNum +
                 ", controllerId=" + controllerId +
                 ", regionNum=" + regionNum +
+                ", haRelation=" + haRelation +
+                ", mutualBackupClusterName='" + mutualBackupClusterName + '\'' +
                 '}';
     }
 }

kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/ao/RdTopicBasic.java

@@ -1,5 +1,7 @@
 package com.xiaojukeji.kafka.manager.common.entity.ao;
 
+import lombok.Data;
+
 import java.util.List;
 import java.util.Properties;
 
@@ -7,6 +9,7 @@ import java.util.Properties;
  * @author zengqiao
  * @date 20/6/10
  */
+@Data
 public class RdTopicBasic {
     private Long clusterId;
 
@@ -26,77 +29,7 @@ public class RdTopicBasic {
 
     private List<String> regionNameList;
 
-    public Long getClusterId() {
+    private Integer haRelation;
-        return clusterId;
-    }
-
-    public void setClusterId(Long clusterId) {
-        this.clusterId = clusterId;
-    }
-
-    public String getClusterName() {
-        return clusterName;
-    }
-
-    public void setClusterName(String clusterName) {
-        this.clusterName = clusterName;
-    }
-
-    public String getTopicName() {
-        return topicName;
-    }
-
-    public void setTopicName(String topicName) {
-        this.topicName = topicName;
-    }
-
-    public Long getRetentionTime() {
-        return retentionTime;
-    }
-
-    public void setRetentionTime(Long retentionTime) {
-        this.retentionTime = retentionTime;
-    }
-
-    public String getAppId() {
-        return appId;
-    }
-
-    public void setAppId(String appId) {
-        this.appId = appId;
-    }
-
-    public String getAppName() {
-        return appName;
-    }
-
-    public void setAppName(String appName) {
-        this.appName = appName;
-    }
-
-    public Properties getProperties() {
-        return properties;
-    }
-
-    public void setProperties(Properties properties) {
-        this.properties = properties;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public List<String> getRegionNameList() {
-        return regionNameList;
-    }
-
-    public void setRegionNameList(List<String> regionNameList) {
-        this.regionNameList = regionNameList;
-    }
 
     @Override
     public String toString() {
@@ -109,7 +42,8 @@ public class RdTopicBasic {
                 ", appName='" + appName + '\'' +
                 ", properties=" + properties +
                 ", description='" + description + '\'' +
-                ", regionNameList='" + regionNameList + '\'' +
+                ", regionNameList=" + regionNameList +
+                ", haRelation=" + haRelation +
                 '}';
     }
 }

kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/ao/ha/HaSwitchTopic.java

@@ -0,0 +1,54 @@
+package com.xiaojukeji.kafka.manager.common.entity.ao.ha;
+
+import com.xiaojukeji.kafka.manager.common.bizenum.ha.HaStatusEnum;
+import lombok.Data;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Data
+public class HaSwitchTopic {
+    /**
+     * 是否完成
+     */
+    private boolean finished;
+
+    /**
+     * 每一个Topic的状态
+     */
+    private Map<String, Integer> activeTopicSwitchStatusMap;
+
+    public HaSwitchTopic(boolean finished) {
+        this.finished = finished;
+        this.activeTopicSwitchStatusMap = new HashMap<>();
+    }
+
+    public void addHaSwitchTopic(HaSwitchTopic haSwitchTopic) {
+        this.finished &= haSwitchTopic.finished;
+    }
+
+    public boolean isFinished() {
+        return this.finished;
+    }
+
+    public void addActiveTopicStatus(String activeTopicName, Integer status) {
+        activeTopicSwitchStatusMap.put(activeTopicName, status);
+    }
+
+    public boolean isActiveTopicSwitchFinished(String activeTopicName) {
+        Integer status = activeTopicSwitchStatusMap.get(activeTopicName);
+        if (status == null) {
+            return false;
+        }
+
+        return status.equals(HaStatusEnum.STABLE.getCode());
+    }
+
+    @Override
+    public String toString() {
+        return "HaSwitchTopic{" +
+                "finished=" + finished +
+                ", activeTopicSwitchStatusMap=" + activeTopicSwitchStatusMap +
+                '}';
+    }
+}

kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/ao/ha/job/HaJobDetail.java

@@ -0,0 +1,28 @@
+package com.xiaojukeji.kafka.manager.common.entity.ao.ha.job;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel(description = "Job详情")
+public class HaJobDetail {
+    @ApiModelProperty(value = "Topic名称")
+    private String topicName;
+
+    @ApiModelProperty(value="主集群ID")
+    private Long activeClusterPhyId;
+
+    @ApiModelProperty(value="备集群ID")
+    private Long standbyClusterPhyId;
+
+    @ApiModelProperty(value="Lag和")
+    private Long sumLag;
+
+    @ApiModelProperty(value="状态")
+    private Integer status;
+}

kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/ao/ha/job/HaJobLog.java

@@ -0,0 +1,16 @@
+package com.xiaojukeji.kafka.manager.common.entity.ao.ha.job;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel(description = "Job日志")
+public class HaJobLog {
+    @ApiModelProperty(value = "日志信息")
+    private String log;
+}

kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/ao/ha/job/HaJobState.java

@@ -0,0 +1,70 @@
+package com.xiaojukeji.kafka.manager.common.entity.ao.ha.job;
+
+import com.xiaojukeji.kafka.manager.common.bizenum.ha.job.HaJobStatusEnum;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@NoArgsConstructor
+public class HaJobState {
+
+    /**
+     * @see com.xiaojukeji.kafka.manager.common.bizenum.ha.job.HaJobStatusEnum
+     */
+    private int status;
+
+    private int total;
+
+    private int success;
+
+    private int failed;
+
+    private int doing;
+    private int doingInTimeout;
+
+    private int unknown;
+
+    private Integer progress;
+
+    /**
+     * 按照状态，直接进行聚合
+     */
+    public HaJobState(List<Integer> jobStatusList, Integer progress) {
+        this.total = jobStatusList.size();
+        this.success = 0;
+        this.failed = 0;
+        this.doing = 0;
+        this.doingInTimeout = 0;
+        this.unknown = 0;
+        for (Integer jobStatus: jobStatusList) {
+            if (HaJobStatusEnum.SUCCESS.getStatus() == jobStatus) {
+                success += 1;
+            } else if (HaJobStatusEnum.FAILED.getStatus() == jobStatus) {
+                failed += 1;
+            } else if (HaJobStatusEnum.RUNNING.getStatus() == jobStatus) {
+                doing += 1;
+            } else if (HaJobStatusEnum.RUNNING_IN_TIMEOUT.getStatus() == jobStatus) {
+                doingInTimeout += 1;
+            } else {
+                unknown += 1;
+            }
+        }
+
+        this.status = HaJobStatusEnum.getStatusBySubStatus(this.total, this.success, this.failed, this.doing, this.doingInTimeout, this.unknown).getStatus();
+
+        this.progress = progress;
+    }
+
+    public HaJobState(Integer doingSize, Integer progress) {
+        this.total = doingSize;
+        this.success = 0;
+        this.failed = 0;
+        this.doing = doingSize;
+        this.doingInTimeout = 0;
+        this.unknown = 0;
+
+        this.progress = progress;
+    }
+}

kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/ao/ha/job/HaSubJobExtendData.java

@@ -0,0 +1,12 @@
+package com.xiaojukeji.kafka.manager.common.entity.ao.ha.job;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class HaSubJobExtendData {
+    private Long sumLag;
+}

kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/ao/topic/TopicBasicDTO.java

@@ -1,11 +1,14 @@
 package com.xiaojukeji.kafka.manager.common.entity.ao.topic;
 
+import lombok.Data;
+
 import java.util.List;
 
 /**
  * @author arthur
  * @date 2018/09/03
  */
+@Data
 public class TopicBasicDTO {
     private Long clusterId;
 
@@ -39,133 +42,7 @@ public class TopicBasicDTO {
 
     private Long retentionBytes;
 
-    public Long getClusterId() {
+    private Integer haRelation;
-        return clusterId;
-    }
-
-    public void setClusterId(Long clusterId) {
-        this.clusterId = clusterId;
-    }
-
-    public String getAppId() {
-        return appId;
-    }
-
-    public void setAppId(String appId) {
-        this.appId = appId;
-    }
-
-    public String getAppName() {
-        return appName;
-    }
-
-    public void setAppName(String appName) {
-        this.appName = appName;
-    }
-
-    public String getPrincipals() {
-        return principals;
-    }
-
-    public void setPrincipals(String principals) {
-        this.principals = principals;
-    }
-
-    public String getTopicName() {
-        return topicName;
-    }
-
-    public void setTopicName(String topicName) {
-        this.topicName = topicName;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public List<String> getRegionNameList() {
-        return regionNameList;
-    }
-
-    public void setRegionNameList(List<String> regionNameList) {
-        this.regionNameList = regionNameList;
-    }
-
-    public Integer getScore() {
-        return score;
-    }
-
-    public void setScore(Integer score) {
-        this.score = score;
-    }
-
-    public String getTopicCodeC() {
-        return topicCodeC;
-    }
-
-    public void setTopicCodeC(String topicCodeC) {
-        this.topicCodeC = topicCodeC;
-    }
-
-    public Integer getPartitionNum() {
-        return partitionNum;
-    }
-
-    public void setPartitionNum(Integer partitionNum) {
-        this.partitionNum = partitionNum;
-    }
-
-    public Integer getReplicaNum() {
-        return replicaNum;
-    }
-
-    public void setReplicaNum(Integer replicaNum) {
-        this.replicaNum = replicaNum;
-    }
-
-    public Integer getBrokerNum() {
-        return brokerNum;
-    }
-
-    public void setBrokerNum(Integer brokerNum) {
-        this.brokerNum = brokerNum;
-    }
-
-    public Long getModifyTime() {
-        return modifyTime;
-    }
-
-    public void setModifyTime(Long modifyTime) {
-        this.modifyTime = modifyTime;
-    }
-
-    public Long getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Long createTime) {
-        this.createTime = createTime;
-    }
-
-    public Long getRetentionTime() {
-        return retentionTime;
-    }
-
-    public void setRetentionTime(Long retentionTime) {
-        this.retentionTime = retentionTime;
-    }
-
-    public Long getRetentionBytes() {
-        return retentionBytes;
-    }
-
-    public void setRetentionBytes(Long retentionBytes) {
-        this.retentionBytes = retentionBytes;
-    }
 
     @Override
     public String toString() {
@@ -186,6 +63,7 @@ public class TopicBasicDTO {
                 ", createTime=" + createTime +
                 ", retentionTime=" + retentionTime +
                 ", retentionBytes=" + retentionBytes +
+                ", haRelation=" + haRelation +
                 '}';
     }
 }

kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/ao/topic/TopicConnection.java

@@ -1,9 +1,12 @@
 package com.xiaojukeji.kafka.manager.common.entity.ao.topic;
 
+import lombok.Data;
+
 /**
  * @author zengqiao
  * @date 20/4/20
  */
+@Data
 public class TopicConnection {
     private Long clusterId;
 
@@ -19,72 +22,9 @@ public class TopicConnection {
 
     private String clientVersion;
 
-    public Long getClusterId() {
+    private String clientId;
-        return clusterId;
-    }
 
-    public void setClusterId(Long clusterId) {
+    private Long realConnectTime;
-        this.clusterId = clusterId;
-    }
 
-    public String getTopicName() {
+    private Long createTime;
-        return topicName;
-    }
-
-    public void setTopicName(String topicName) {
-        this.topicName = topicName;
-    }
-
-    public String getAppId() {
-        return appId;
-    }
-
-    public void setAppId(String appId) {
-        this.appId = appId;
-    }
-
-    public String getIp() {
-        return ip;
-    }
-
-    public void setIp(String ip) {
-        this.ip = ip;
-    }
-
-    public String getHostname() {
-        return hostname;
-    }
-
-    public void setHostname(String hostname) {
-        this.hostname = hostname;
-    }
-
-    public String getClientType() {
-        return clientType;
-    }
-
-    public void setClientType(String clientType) {
-        this.clientType = clientType;
-    }
-
-    public String getClientVersion() {
-        return clientVersion;
-    }
-
-    public void setClientVersion(String clientVersion) {
-        this.clientVersion = clientVersion;
-    }
-
-    @Override
-    public String toString() {
-        return "TopicConnectionDTO{" +
-                "clusterId=" + clusterId +
-                ", topicName='" + topicName + '\'' +
-                ", appId='" + appId + '\'' +
-                ", ip='" + ip + '\'' +
-                ", hostname='" + hostname + '\'' +
-                ", clientType='" + clientType + '\'' +
-                ", clientVersion='" + clientVersion + '\'' +
-                '}';
-    }
 }

kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/ao/topic/TopicOverview.java

@@ -1,10 +1,13 @@
 package com.xiaojukeji.kafka.manager.common.entity.ao.topic;
 
+import lombok.Data;
+
 /**
  * Topic概览信息
  * @author zengqiao
  * @date 20/5/14
  */
+@Data
 public class TopicOverview {
     private Long clusterId;
 
@@ -32,109 +35,7 @@ public class TopicOverview {
 
     private Long logicalClusterId;
 
-    public Long getClusterId() {
+    private Integer haRelation;
-        return clusterId;
-    }
-
-    public void setClusterId(Long clusterId) {
-        this.clusterId = clusterId;
-    }
-
-    public String getTopicName() {
-        return topicName;
-    }
-
-    public void setTopicName(String topicName) {
-        this.topicName = topicName;
-    }
-
-    public Integer getReplicaNum() {
-        return replicaNum;
-    }
-
-    public void setReplicaNum(Integer replicaNum) {
-        this.replicaNum = replicaNum;
-    }
-
-    public Integer getPartitionNum() {
-        return partitionNum;
-    }
-
-    public void setPartitionNum(Integer partitionNum) {
-        this.partitionNum = partitionNum;
-    }
-
-    public Long getRetentionTime() {
-        return retentionTime;
-    }
-
-    public void setRetentionTime(Long retentionTime) {
-        this.retentionTime = retentionTime;
-    }
-
-    public Object getByteIn() {
-        return byteIn;
-    }
-
-    public void setByteIn(Object byteIn) {
-        this.byteIn = byteIn;
-    }
-
-    public Object getByteOut() {
-        return byteOut;
-    }
-
-    public void setByteOut(Object byteOut) {
-        this.byteOut = byteOut;
-    }
-
-    public Object getProduceRequest() {
-        return produceRequest;
-    }
-
-    public void setProduceRequest(Object produceRequest) {
-        this.produceRequest = produceRequest;
-    }
-
-    public String getAppName() {
-        return appName;
-    }
-
-    public void setAppName(String appName) {
-        this.appName = appName;
-    }
-
-    public String getAppId() {
-        return appId;
-    }
-
-    public void setAppId(String appId) {
-        this.appId = appId;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public Long getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Long updateTime) {
-        this.updateTime = updateTime;
-    }
-
-    public Long getLogicalClusterId() {
-        return logicalClusterId;
-    }
-
-    public void setLogicalClusterId(Long logicalClusterId) {
-        this.logicalClusterId = logicalClusterId;
-    }
 
     @Override
     public String toString() {
@@ -152,6 +53,7 @@ public class TopicOverview {
                 ", description='" + description + '\'' +
                 ", updateTime=" + updateTime +
                 ", logicalClusterId=" + logicalClusterId +
+                ", haRelation=" + haRelation +
                 '}';
     }
 }

kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/dto/ha/ASSwitchJobActionDTO.java

@@ -0,0 +1,18 @@
+package com.xiaojukeji.kafka.manager.common.entity.dto.ha;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+@Data
+@ApiModel(description="Topic信息")
+public class ASSwitchJobActionDTO {
+    /**
+     * @see com.xiaojukeji.kafka.manager.common.bizenum.TaskActionEnum
+     */
+    @NotBlank(message = "action不允许为空")
+    @ApiModelProperty(value = "动作, force")
+    private String action;
+}

kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/dto/ha/ASSwitchJobDTO.java

@@ -0,0 +1,40 @@
+package com.xiaojukeji.kafka.manager.common.entity.dto.ha;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+@Data
+@ApiModel(description="主备切换任务")
+public class ASSwitchJobDTO {
+    @NotNull(message = "all不允许为NULL")
+    @ApiModelProperty(value = "所有Topic")
+    private Boolean all;
+
+    @NotNull(message = "mustContainAllKafkaUserTopics不允许为NULL")
+    @ApiModelProperty(value = "是否需要包含KafkaUser关联的所有Topic")
+    private Boolean mustContainAllKafkaUserTopics;
+
+    @NotNull(message = "activeClusterPhyId不允许为NULL")
+    @ApiModelProperty(value="主集群ID")
+    private Long activeClusterPhyId;
+
+    @NotNull(message = "standbyClusterPhyId不允许为NULL")
+    @ApiModelProperty(value="备集群ID")
+    private Long standbyClusterPhyId;
+
+    @NotNull(message = "topicNameList不允许为NULL")
+    @ApiModelProperty(value="切换的Topic名称列表")
+    private List<String> topicNameList;
+
+    /**
+     * kafkaUser+Client列表
+     */
+    @Valid
+    @ApiModelProperty(value="切换的KafkaUser&ClientId列表，Client可以为空串")
+    private List<KafkaUserAndClientDTO> kafkaUserAndClientIdList;
+}

kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/dto/ha/KafkaUserAndClientDTO.java

@@ -0,0 +1,18 @@
+package com.xiaojukeji.kafka.manager.common.entity.dto.ha;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+@Data
+@ApiModel(description="KafkaUser和ClientId信息")
+public class KafkaUserAndClientDTO {
+    @NotBlank(message = "kafkaUser不允许为空串")
+    @ApiModelProperty(value = "kafkaUser")
+    private String kafkaUser;
+
+    @ApiModelProperty(value = "clientId")
+    private String clientId;
+}

kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/dto/op/topic/HaTopicRelationDTO.java

@@ -0,0 +1,55 @@
+package com.xiaojukeji.kafka.manager.common.entity.dto.op.topic;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.xiaojukeji.kafka.manager.common.utils.ValidateUtils;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+/**
+ * @author huangyiminghappy@163.com, zengqiao
+ * @date 2022-06-29
+ */
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+@ApiModel(description = "Topic高可用关联|解绑")
+public class HaTopicRelationDTO {
+    @NotNull(message = "主集群id不能为空")
+    @ApiModelProperty(value = "主集群id")
+    private Long activeClusterId;
+
+    @NotNull(message = "备集群id不能为空")
+    @ApiModelProperty(value = "备集群id")
+    private Long standbyClusterId;
+
+    @NotNull(message = "是否应用于所有topic")
+    @ApiModelProperty(value = "是否应用于所有topic")
+    private Boolean all;
+
+    @ApiModelProperty(value = "需要关联|解绑的topic名称列表")
+    private List<String> topicNames;
+
+    @ApiModelProperty(value = "解绑是否保留备集群资源（topic,kafkaUser,group）")
+    private Boolean retainStandbyResource;
+
+    @Override
+    public String toString() {
+        return "HaTopicRelationDTO{" +
+                ", activeClusterId=" + activeClusterId +
+                ", standbyClusterId=" + standbyClusterId +
+                ", all=" + all +
+                ", topicNames=" + topicNames +
+                ", retainStandbyResource=" + retainStandbyResource +
+                '}';
+    }
+
+    public boolean paramLegal() {
+        if(!all && ValidateUtils.isEmptyList(topicNames)) {
+            return false;
+        }
+        return true;
+    }
+}

kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/dto/rd/AppRelateTopicsDTO.java

@@ -0,0 +1,31 @@
+package com.xiaojukeji.kafka.manager.common.entity.dto.rd;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+/**
+ * @author zengqiao
+ * @date 20/5/4
+ */
+@Data
+@ApiModel(description="App关联Topic信息")
+public class AppRelateTopicsDTO {
+    @NotNull(message = "clusterPhyId不允许为NULL")
+    @ApiModelProperty(value="物理集群ID")
+    private Long clusterPhyId;
+
+    @NotNull(message = "filterTopicNameList不允许为NULL")
+    @ApiModelProperty(value="过滤的Topic列表")
+    private List<String> filterTopicNameList;
+
+    @ApiModelProperty(value="使用KafkaUser+Client维度的数据，默认是kafkaUser维度")
+    private Boolean useKafkaUserAndClientId;
+
+    @NotNull(message = "ha不允许为NULL")
+    @ApiModelProperty(value="查询是否高可用topic")
+    private Boolean ha;
+}

kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/dto/rd/ClusterDTO.java

@@ -4,11 +4,13 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.xiaojukeji.kafka.manager.common.utils.ValidateUtils;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 /**
  * @author zengqiao
  * @date 20/4/23
  */
+@Data
 @ApiModel(description = "集群接入&修改")
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class ClusterDTO {
@@ -33,60 +35,21 @@ public class ClusterDTO {
     @ApiModelProperty(value="Jmx配置")
     private String jmxProperties;
 
-    public Long getClusterId() {
+    @ApiModelProperty(value="主集群Id")
-        return clusterId;
+    private Long activeClusterId;
-    }
 
-    public void setClusterId(Long clusterId) {
+    @ApiModelProperty(value="是否高可用")
-        this.clusterId = clusterId;
+    private boolean isHa;
-    }
 
-    public String getClusterName() {
+    public boolean legal() {
-        return clusterName;
+        if (ValidateUtils.isNull(clusterName)
+                || ValidateUtils.isNull(zookeeper)
+                || ValidateUtils.isNull(idc)
+                || ValidateUtils.isNull(bootstrapServers)
+                || (isHa && ValidateUtils.isNull(activeClusterId))) {
+            return false;
         }
-
+        return true;
-    public void setClusterName(String clusterName) {
-        this.clusterName = clusterName;
-    }
-
-    public String getZookeeper() {
-        return zookeeper;
-    }
-
-    public void setZookeeper(String zookeeper) {
-        this.zookeeper = zookeeper;
-    }
-
-    public String getBootstrapServers() {
-        return bootstrapServers;
-    }
-
-    public void setBootstrapServers(String bootstrapServers) {
-        this.bootstrapServers = bootstrapServers;
-    }
-
-    public String getIdc() {
-        return idc;
-    }
-
-    public void setIdc(String idc) {
-        this.idc = idc;
-    }
-
-    public String getSecurityProperties() {
-        return securityProperties;
-    }
-
-    public void setSecurityProperties(String securityProperties) {
-        this.securityProperties = securityProperties;
-    }
-
-    public String getJmxProperties() {
-        return jmxProperties;
-    }
-
-    public void setJmxProperties(String jmxProperties) {
-        this.jmxProperties = jmxProperties;
     }
 
     @Override
@@ -99,16 +62,8 @@ public class ClusterDTO {
                 ", idc='" + idc + '\'' +
                 ", securityProperties='" + securityProperties + '\'' +
                 ", jmxProperties='" + jmxProperties + '\'' +
+                ", activeClusterId=" + activeClusterId +
+                ", isHa=" + isHa +
                 '}';
     }
-
-    public boolean legal() {
-        if (ValidateUtils.isNull(clusterName)
-                || ValidateUtils.isNull(zookeeper)
-                || ValidateUtils.isNull(idc)
-                || ValidateUtils.isNull(bootstrapServers)) {
-            return false;
-        }
-        return true;
-    }
 }

kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/pagination/Pagination.java

@@ -0,0 +1,24 @@
+package com.xiaojukeji.kafka.manager.common.entity.pagination;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(description = "分页信息")
+public class Pagination {
+    @ApiModelProperty(value = "总记录数", example = "100")
+    private long total;
+
+    @ApiModelProperty(value = "当前页码", example = "0")
+    private long pageNo;
+
+    @ApiModelProperty(value = "单页大小", example = "10")
+    private long pageSize;
+
+    public Pagination(long total, long pageNo, long pageSize) {
+        this.total = total;
+        this.pageNo = pageNo;
+        this.pageSize = pageSize;
+    }
+}

kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/pagination/PaginationData.java

@@ -0,0 +1,17 @@
+package com.xiaojukeji.kafka.manager.common.entity.pagination;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@ApiModel(description = "分页数据")
+public class PaginationData<T> {
+    @ApiModelProperty(value = "业务数据")
+    private List<T> bizData;
+
+    @ApiModelProperty(value = "分页信息")
+    private Pagination pagination;
+}

kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/pojo/BaseDO.java

@@ -0,0 +1,30 @@
+package com.xiaojukeji.kafka.manager.common.entity.pojo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author zengqiao
+ * @date 21/07/19
+ */
+@Data
+public class BaseDO implements Serializable {
+    private static final long serialVersionUID = 8782560709154468485L;
+
+    /**
+     * 主键ID
+     */
+    protected Long id;
+
+    /**
+     * 创建时间
+     */
+    protected Date createTime;
+
+    /**
+     * 更新时间
+     */
+    protected Date modifyTime;
+}

kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/pojo/LogicalClusterDO.java

@@ -1,11 +1,18 @@
 package com.xiaojukeji.kafka.manager.common.entity.pojo;
 
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
 import java.util.Date;
 
 /**
  * @author zengqiao
  * @date 20/6/29
  */
+@Data
+@ToString
+@NoArgsConstructor
 public class LogicalClusterDO {
     private Long id;
 
@@ -27,99 +34,17 @@ public class LogicalClusterDO {
 
     private Date gmtModify;
 
-    public Long getId() {
+    public LogicalClusterDO(String name,
-        return id;
+                            String identification,
-    }
+                            Integer mode,
-
+                            String appId,
-    public void setId(Long id) {
+                            Long clusterId,
-        this.id = id;
+                            String regionList) {
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
         this.name = name;
-    }
-
-    public String getIdentification() {
-        return identification;
-    }
-
-    public void setIdentification(String identification) {
         this.identification = identification;
-    }
-
-    public Integer getMode() {
-        return mode;
-    }
-
-    public void setMode(Integer mode) {
         this.mode = mode;
-    }
-
-    public String getAppId() {
-        return appId;
-    }
-
-    public void setAppId(String appId) {
         this.appId = appId;
-    }
-
-    public Long getClusterId() {
-        return clusterId;
-    }
-
-    public void setClusterId(Long clusterId) {
         this.clusterId = clusterId;
-    }
-
-    public String getRegionList() {
-        return regionList;
-    }
-
-    public void setRegionList(String regionList) {
         this.regionList = regionList;
     }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public Date getGmtCreate() {
-        return gmtCreate;
-    }
-
-    public void setGmtCreate(Date gmtCreate) {
-        this.gmtCreate = gmtCreate;
-    }
-
-    public Date getGmtModify() {
-        return gmtModify;
-    }
-
-    public void setGmtModify(Date gmtModify) {
-        this.gmtModify = gmtModify;
-    }
-
-    @Override
-    public String toString() {
-        return "LogicalClusterDO{" +
-                "id=" + id +
-                ", name='" + name + '\'' +
-                ", identification='" + identification + '\'' +
-                ", mode=" + mode +
-                ", appId='" + appId + '\'' +
-                ", clusterId=" + clusterId +
-                ", regionList='" + regionList + '\'' +
-                ", description='" + description + '\'' +
-                ", gmtCreate=" + gmtCreate +
-                ", gmtModify=" + gmtModify +
-                '}';
-    }
 }

kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/pojo/RegionDO.java

@@ -1,7 +1,14 @@
 package com.xiaojukeji.kafka.manager.common.entity.pojo;
 
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
 import java.util.Date;
 
+@Data
+@ToString
+@NoArgsConstructor
 public class RegionDO implements Comparable<RegionDO> {
     private Long id;
 
@@ -25,111 +32,13 @@ public class RegionDO implements Comparable<RegionDO> {
 
     private String description;
 
-    public Long getId() {
+    public RegionDO(Integer status, String name, Long clusterId, String brokerList) {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Integer getStatus() {
-        return status;
-    }
-
-    public void setStatus(Integer status) {
         this.status = status;
-    }
-
-    public Date getGmtCreate() {
-        return gmtCreate;
-    }
-
-    public void setGmtCreate(Date gmtCreate) {
-        this.gmtCreate = gmtCreate;
-    }
-
-    public Date getGmtModify() {
-        return gmtModify;
-    }
-
-    public void setGmtModify(Date gmtModify) {
-        this.gmtModify = gmtModify;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
         this.name = name;
-    }
-
-    public Long getClusterId() {
-        return clusterId;
-    }
-
-    public void setClusterId(Long clusterId) {
         this.clusterId = clusterId;
-    }
-
-    public String getBrokerList() {
-        return brokerList;
-    }
-
-    public void setBrokerList(String brokerList) {
         this.brokerList = brokerList;
     }
 
-    public Long getCapacity() {
-        return capacity;
-    }
-
-    public void setCapacity(Long capacity) {
-        this.capacity = capacity;
-    }
-
-    public Long getRealUsed() {
-        return realUsed;
-    }
-
-    public void setRealUsed(Long realUsed) {
-        this.realUsed = realUsed;
-    }
-
-    public Long getEstimateUsed() {
-        return estimateUsed;
-    }
-
-    public void setEstimateUsed(Long estimateUsed) {
-        this.estimateUsed = estimateUsed;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    @Override
-    public String toString() {
-        return "RegionDO{" +
-                "id=" + id +
-                ", status=" + status +
-                ", gmtCreate=" + gmtCreate +
-                ", gmtModify=" + gmtModify +
-                ", name='" + name + '\'' +
-                ", clusterId=" + clusterId +
-                ", brokerList='" + brokerList + '\'' +
-                ", capacity=" + capacity +
-                ", realUsed=" + realUsed +
-                ", estimateUsed=" + estimateUsed +
-                ", description='" + description + '\'' +
-                '}';
-    }
-
     @Override
     public int compareTo(RegionDO regionDO) {
         return this.id.compareTo(regionDO.id);

kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/pojo/TopicDO.java

@@ -2,6 +2,8 @@ package com.xiaojukeji.kafka.manager.common.entity.pojo;
 
 import com.xiaojukeji.kafka.manager.common.entity.dto.op.topic.TopicCreationDTO;
 import com.xiaojukeji.kafka.manager.common.utils.ValidateUtils;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.util.Date;
 
@@ -9,6 +11,8 @@ import java.util.Date;
  * @author zengqiao
  * @date 20/4/24
  */
+@Data
+@NoArgsConstructor
 public class TopicDO {
     private Long id;
 
@@ -26,70 +30,14 @@ public class TopicDO {
 
     private Long peakBytesIn;
 
-    public String getAppId() {
+    public TopicDO(String appId, Long clusterId, String topicName, String description, Long peakBytesIn) {
-        return appId;
-    }
-
-    public void setAppId(String appId) {
         this.appId = appId;
-    }
-
-    public Long getClusterId() {
-        return clusterId;
-    }
-
-    public void setClusterId(Long clusterId) {
         this.clusterId = clusterId;
-    }
-
-    public String getTopicName() {
-        return topicName;
-    }
-
-    public void setTopicName(String topicName) {
         this.topicName = topicName;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
         this.description = description;
-    }
-
-    public Long getPeakBytesIn() {
-        return peakBytesIn;
-    }
-
-    public void setPeakBytesIn(Long peakBytesIn) {
         this.peakBytesIn = peakBytesIn;
     }
 
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Date getGmtCreate() {
-        return gmtCreate;
-    }
-
-    public void setGmtCreate(Date gmtCreate) {
-        this.gmtCreate = gmtCreate;
-    }
-
-    public Date getGmtModify() {
-        return gmtModify;
-    }
-
-    public void setGmtModify(Date gmtModify) {
-        this.gmtModify = gmtModify;
-    }
-
     public static TopicDO buildFrom(TopicCreationDTO dto) {
         TopicDO topicDO = new TopicDO();
         topicDO.setAppId(dto.getAppId());

kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/pojo/gateway/TopicConnectionDO.java

@@ -1,5 +1,7 @@
 package com.xiaojukeji.kafka.manager.common.entity.pojo.gateway;
 
+import lombok.Data;
+
 import java.util.Date;
 
 /**
@@ -7,6 +9,7 @@ import java.util.Date;
  * @author zengqiao
  * @date 20/7/6
  */
+@Data
 public class TopicConnectionDO {
     private Long id;
 
@@ -22,87 +25,13 @@ public class TopicConnectionDO {
 
     private String clientVersion;
 
+    private String clientId;
+
+    private Long realConnectTime;
+
     private Date createTime;
 
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getClusterId() {
-        return clusterId;
-    }
-
-    public void setClusterId(Long clusterId) {
-        this.clusterId = clusterId;
-    }
-
-    public String getTopicName() {
-        return topicName;
-    }
-
-    public void setTopicName(String topicName) {
-        this.topicName = topicName;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    public String getAppId() {
-        return appId;
-    }
-
-    public void setAppId(String appId) {
-        this.appId = appId;
-    }
-
-    public String getIp() {
-        return ip;
-    }
-
-    public void setIp(String ip) {
-        this.ip = ip;
-    }
-
-    public String getClientVersion() {
-        return clientVersion;
-    }
-
-    public void setClientVersion(String clientVersion) {
-        this.clientVersion = clientVersion;
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    @Override
-    public String toString() {
-        return "TopicConnectionDO{" +
-                "id=" + id +
-                ", clusterId=" + clusterId +
-                ", topicName='" + topicName + '\'' +
-                ", type='" + type + '\'' +
-                ", appId='" + appId + '\'' +
-                ", ip='" + ip + '\'' +
-                ", clientVersion='" + clientVersion + '\'' +
-                ", createTime=" + createTime +
-                '}';
-    }
-
     public String uniqueKey() {
-        return appId + clusterId + topicName + type + ip;
+        return appId + clusterId + topicName + type + ip + clientId;
     }
 }

kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/pojo/ha/HaASRelationDO.java

@@ -0,0 +1,71 @@
+package com.xiaojukeji.kafka.manager.common.entity.pojo.ha;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.xiaojukeji.kafka.manager.common.bizenum.ha.HaResTypeEnum;
+import com.xiaojukeji.kafka.manager.common.entity.pojo.BaseDO;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+
+/**
+ * HA-主备关系表
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@TableName("ha_active_standby_relation")
+public class HaASRelationDO extends BaseDO {
+    /**
+     * 主集群ID
+     */
+    private Long activeClusterPhyId;
+
+    /**
+     * 主集群资源名称
+     */
+    private String activeResName;
+
+    /**
+     * 备集群ID
+     */
+    private Long standbyClusterPhyId;
+
+    /**
+     * 备集群资源名称
+     */
+    private String standbyResName;
+
+    /**
+     * 资源类型
+     * @see HaResTypeEnum
+     */
+    private Integer resType;
+
+    /**
+     * 主备状态
+     */
+    private Integer status;
+
+    /**
+     * 主备关系中的唯一性字段
+     */
+    private String uniqueField;
+
+    public HaASRelationDO(Long id, Integer status) {
+        this.id = id;
+        this.status = status;
+    }
+
+    public HaASRelationDO(Long activeClusterPhyId, String activeResName, Long standbyClusterPhyId, String standbyResName, Integer resType, Integer status) {
+        this.activeClusterPhyId = activeClusterPhyId;
+        this.activeResName = activeResName;
+        this.standbyClusterPhyId = standbyClusterPhyId;
+        this.standbyResName = standbyResName;
+        this.resType = resType;
+        this.status = status;
+
+        // 主备两个资源之间唯一，但是不保证两个资源之间，只存在主备关系，也可能存在双活关系，及各自都为对方的主备
+        this.uniqueField = String.format("%d_%s||%d_%s||%d", activeClusterPhyId, activeResName, standbyClusterPhyId, standbyResName, resType);
+    }
+}

kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/pojo/ha/HaASSwitchJobDO.java

@@ -0,0 +1,68 @@
+package com.xiaojukeji.kafka.manager.common.entity.pojo.ha;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.xiaojukeji.kafka.manager.common.entity.dto.ha.KafkaUserAndClientDTO;
+import com.xiaojukeji.kafka.manager.common.entity.pojo.BaseDO;
+import com.xiaojukeji.kafka.manager.common.utils.ConvertUtil;
+import com.xiaojukeji.kafka.manager.common.utils.ValidateUtils;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+/**
+ * HA-主备关系切换任务表
+ */
+@Data
+@NoArgsConstructor
+@TableName("ha_active_standby_switch_job")
+public class HaASSwitchJobDO extends BaseDO {
+    /**
+     * 主集群ID
+     */
+    private Long activeClusterPhyId;
+
+    /**
+     * 备集群ID
+     */
+    private Long standbyClusterPhyId;
+
+    /**
+     * 主备状态
+     */
+    private Integer jobStatus;
+
+    /**
+     * 类型，0：kafkaUser 1：kafkaUser+Client
+     */
+    private Integer type;
+
+    /**
+     * 扩展数据
+     */
+    private String extendData;
+
+    /**
+     * 操作人
+     */
+    private String operator;
+
+    public HaASSwitchJobDO(Long activeClusterPhyId, Long standbyClusterPhyId, Integer type, List<KafkaUserAndClientDTO> extendDataObj, Integer jobStatus, String operator) {
+        this.activeClusterPhyId = activeClusterPhyId;
+        this.standbyClusterPhyId = standbyClusterPhyId;
+        this.type = type;
+        this.extendData = ValidateUtils.isEmptyList(extendDataObj)? "": ConvertUtil.obj2Json(extendDataObj);
+        this.jobStatus = jobStatus;
+        this.operator = operator;
+    }
+
+    public List<KafkaUserAndClientDTO> getExtendRawData() {
+        if (ValidateUtils.isBlank(extendData)) {
+            return new ArrayList<>();
+        }
+
+        return ConvertUtil.str2ObjArrayByJson(extendData, KafkaUserAndClientDTO.class);
+    }
+}

kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/pojo/ha/HaASSwitchSubJobDO.java

@@ -0,0 +1,67 @@
+package com.xiaojukeji.kafka.manager.common.entity.pojo.ha;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.xiaojukeji.kafka.manager.common.entity.pojo.BaseDO;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+
+/**
+ * HA-主备关系切换子任务表
+ */
+@Data
+@NoArgsConstructor
+@TableName("ha_active_standby_switch_sub_job")
+public class HaASSwitchSubJobDO extends BaseDO {
+    /**
+     * 任务ID
+     */
+    private Long jobId;
+
+    /**
+     * 主集群ID
+     */
+    private Long activeClusterPhyId;
+
+    /**
+     * 主集群资源名称
+     */
+    private String activeResName;
+
+    /**
+     * 备集群ID
+     */
+    private Long standbyClusterPhyId;
+
+    /**
+     * 备集群资源名称
+     */
+    private String standbyResName;
+
+    /**
+     * 资源类型
+     */
+    private Integer resType;
+
+    /**
+     * 任务状态
+     */
+    private Integer jobStatus;
+
+    /**
+     * 扩展数据
+     * @see com.xiaojukeji.kafka.manager.common.entity.ao.ha.job.HaSubJobExtendData
+     */
+    private String extendData;
+
+    public HaASSwitchSubJobDO(Long jobId, Long activeClusterPhyId, String activeResName, Long standbyClusterPhyId, String standbyResName, Integer resType, Integer jobStatus, String extendData) {
+        this.jobId = jobId;
+        this.activeClusterPhyId = activeClusterPhyId;
+        this.activeResName = activeResName;
+        this.standbyClusterPhyId = standbyClusterPhyId;
+        this.standbyResName = standbyResName;
+        this.resType = resType;
+        this.jobStatus = jobStatus;
+        this.extendData = extendData;
+    }
+}

kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/pojo/ha/JobLogDO.java

@@ -0,0 +1,50 @@
+package com.xiaojukeji.kafka.manager.common.entity.pojo.ha;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.xiaojukeji.kafka.manager.common.entity.pojo.BaseDO;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+
+@Data
+@NoArgsConstructor
+@TableName("job_log")
+public class JobLogDO extends BaseDO {
+    /**
+     * 业务类型
+     */
+    private Integer bizType;
+
+    /**
+     * 业务关键字
+     */
+    private String bizKeyword;
+
+    /**
+     * 打印时间
+     */
+    private Date printTime;
+
+    /**
+     * 内容
+     */
+    private String content;
+
+    public JobLogDO(Integer bizType, String bizKeyword) {
+        this.bizType = bizType;
+        this.bizKeyword = bizKeyword;
+    }
+
+    public JobLogDO(Integer bizType, String bizKeyword, Date printTime, String content) {
+        this.bizType = bizType;
+        this.bizKeyword = bizKeyword;
+        this.printTime = printTime;
+        this.content = content;
+    }
+
+    public JobLogDO setAndCopyNew(Date printTime, String content) {
+        return new JobLogDO(this.bizType, this.bizKeyword, printTime, content);
+    }
+}

kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/vo/common/TopicOverviewVO.java

@@ -2,12 +2,14 @@ package com.xiaojukeji.kafka.manager.common.entity.vo.common;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 /**
  * Topic信息
  * @author zengqiao
  * @date 19/4/1
  */
+@Data
 @ApiModel(description = "Topic信息概览")
 public class TopicOverviewVO {
     @ApiModelProperty(value = "集群ID")
@@ -49,109 +51,8 @@ public class TopicOverviewVO {
     @ApiModelProperty(value = "逻辑集群id")
     private Long logicalClusterId;
 
-    public Long getClusterId() {
+    @ApiModelProperty(value = "高可用关系：1:主topic, 0:备topic , 其他:非高可用topic")
-        return clusterId;
+    private Integer haRelation;
-    }
-
-    public void setClusterId(Long clusterId) {
-        this.clusterId = clusterId;
-    }
-
-    public String getTopicName() {
-        return topicName;
-    }
-
-    public void setTopicName(String topicName) {
-        this.topicName = topicName;
-    }
-
-    public Integer getReplicaNum() {
-        return replicaNum;
-    }
-
-    public void setReplicaNum(Integer replicaNum) {
-        this.replicaNum = replicaNum;
-    }
-
-    public Integer getPartitionNum() {
-        return partitionNum;
-    }
-
-    public void setPartitionNum(Integer partitionNum) {
-        this.partitionNum = partitionNum;
-    }
-
-    public Long getRetentionTime() {
-        return retentionTime;
-    }
-
-    public void setRetentionTime(Long retentionTime) {
-        this.retentionTime = retentionTime;
-    }
-
-    public Object getByteIn() {
-        return byteIn;
-    }
-
-    public void setByteIn(Object byteIn) {
-        this.byteIn = byteIn;
-    }
-
-    public Object getByteOut() {
-        return byteOut;
-    }
-
-    public void setByteOut(Object byteOut) {
-        this.byteOut = byteOut;
-    }
-
-    public Object getProduceRequest() {
-        return produceRequest;
-    }
-
-    public void setProduceRequest(Object produceRequest) {
-        this.produceRequest = produceRequest;
-    }
-
-    public String getAppName() {
-        return appName;
-    }
-
-    public void setAppName(String appName) {
-        this.appName = appName;
-    }
-
-    public String getAppId() {
-        return appId;
-    }
-
-    public void setAppId(String appId) {
-        this.appId = appId;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public Long getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Long updateTime) {
-        this.updateTime = updateTime;
-    }
-
-    public Long getLogicalClusterId() {
-        return logicalClusterId;
-    }
-
-    public void setLogicalClusterId(Long logicalClusterId) {
-        this.logicalClusterId = logicalClusterId;
-    }
 
     @Override
     public String toString() {
@@ -169,6 +70,7 @@ public class TopicOverviewVO {
                 ", description='" + description + '\'' +
                 ", updateTime=" + updateTime +
                 ", logicalClusterId=" + logicalClusterId +
+                ", haRelation=" + haRelation +
                 '}';
     }
 }

kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/vo/ha/HaClusterTopicVO.java

@@ -0,0 +1,34 @@
+package com.xiaojukeji.kafka.manager.common.entity.vo.ha;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author zengqiao
+ * @date 20/4/29
+ */
+@Data
+@ApiModel(description="HA集群-Topic信息")
+public class HaClusterTopicVO {
+    @ApiModelProperty(value="当前查询的集群ID")
+    private Long clusterId;
+
+    @ApiModelProperty(value="Topic名称")
+    private String topicName;
+
+    @ApiModelProperty(value="生产Acl数量")
+    private Integer produceAclNum;
+
+    @ApiModelProperty(value="消费Acl数量")
+    private Integer consumeAclNum;
+
+    @ApiModelProperty(value="主集群ID")
+    private Long activeClusterId;
+
+    @ApiModelProperty(value="备集群ID")
+    private Long standbyClusterId;
+
+    @ApiModelProperty(value="主备状态")
+    private Integer status;
+}

kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/vo/ha/HaClusterVO.java

@@ -0,0 +1,48 @@
+package com.xiaojukeji.kafka.manager.common.entity.vo.ha;
+
+import com.xiaojukeji.kafka.manager.common.entity.vo.rd.cluster.ClusterBaseVO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author zengqiao
+ * @date 20/4/29
+ */
+@Data
+@ApiModel(description="HA集群-集群信息")
+public class HaClusterVO extends ClusterBaseVO {
+    @ApiModelProperty(value="broker数量")
+    private Integer brokerNum;
+
+    @ApiModelProperty(value="topic数量")
+    private Integer topicNum;
+
+    @ApiModelProperty(value="消费组数")
+    private Integer consumerGroupNum;
+
+    @ApiModelProperty(value="region数")
+    private Integer regionNum;
+
+    @ApiModelProperty(value="ControllerID")
+    private Integer controllerId;
+
+    /**
+     * @see com.xiaojukeji.kafka.manager.common.bizenum.ha.HaStatusEnum
+     */
+    @ApiModelProperty(value="主备状态")
+    private Integer haStatus;
+
+    @ApiModelProperty(value="主topic数")
+    private Long activeTopicCount;
+
+    @ApiModelProperty(value="备topic数")
+    private Long standbyTopicCount;
+
+    @ApiModelProperty(value="备集群信息")
+    private HaClusterVO haClusterVO;
+
+    @ApiModelProperty(value="切换任务id")
+    private Long haASSwitchJobId;
+
+}

kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/vo/ha/job/HaJobDetailVO.java

@@ -0,0 +1,37 @@
+package com.xiaojukeji.kafka.manager.common.entity.vo.ha.job;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel(description = "Job详情")
+public class HaJobDetailVO {
+    @ApiModelProperty(value = "Topic名称")
+    private String topicName;
+
+    @ApiModelProperty(value="主物理集群ID")
+    private Long activeClusterPhyId;
+
+    @ApiModelProperty(value="主物理集群名称")
+    private String activeClusterPhyName;
+
+    @ApiModelProperty(value="备物理集群ID")
+    private Long standbyClusterPhyId;
+
+    @ApiModelProperty(value="备物理集群名称")
+    private String standbyClusterPhyName;
+
+    @ApiModelProperty(value="Lag和")
+    private Long sumLag;
+
+    @ApiModelProperty(value="状态")
+    private Integer status;
+
+    @ApiModelProperty(value="超时时间配置")
+    private Long timeoutUnitSecConfig;
+}

kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/vo/ha/job/HaJobStateVO.java

@@ -0,0 +1,46 @@
+package com.xiaojukeji.kafka.manager.common.entity.vo.ha.job;
+
+import com.xiaojukeji.kafka.manager.common.entity.ao.ha.job.HaJobState;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel(description = "Job状态")
+public class HaJobStateVO {
+    @ApiModelProperty(value = "任务总数")
+    private Integer jobNu;
+
+    @ApiModelProperty(value = "运行中的任务数")
+    private Integer runningNu;
+
+    @ApiModelProperty(value = "超时运行中的任务数")
+    private Integer runningInTimeoutNu;
+
+    @ApiModelProperty(value = "准备好待运行的任务数")
+    private Integer waitingNu;
+
+    @ApiModelProperty(value = "运行成功的任务数")
+    private Integer successNu;
+
+    @ApiModelProperty(value = "运行失败的任务数")
+    private Integer failedNu;
+
+    @ApiModelProperty(value = "进度，[0 - 100]")
+    private Integer progress;
+
+    public HaJobStateVO(HaJobState jobState) {
+        this.jobNu = jobState.getTotal();
+        this.runningNu = jobState.getDoing();
+        this.runningInTimeoutNu = jobState.getDoingInTimeout();
+        this.waitingNu = 0;
+        this.successNu = jobState.getSuccess();
+        this.failedNu = jobState.getFailed();
+
+        this.progress = jobState.getProgress();
+    }
+}

kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/vo/normal/topic/HaClusterTopicHaStatusVO.java

@@ -0,0 +1,26 @@
+package com.xiaojukeji.kafka.manager.common.entity.vo.normal.topic;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author zengqiao
+ * @date 20/4/8
+ */
+@Data
+@ApiModel(value = "集群的topic高可用状态")
+public class HaClusterTopicHaStatusVO {
+    @ApiModelProperty(value = "物理集群ID")
+    private Long clusterId;
+
+    @ApiModelProperty(value = "物理集群名称")
+    private String clusterName;
+
+    @ApiModelProperty(value = "Topic名称")
+    private String topicName;
+
+    @ApiModelProperty(value = "高可用关系：1:主topic, 0:备topic , 其他:非高可用topic")
+    private Integer haRelation;
+
+}

kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/vo/normal/topic/TopicBasicVO.java

@@ -2,6 +2,7 @@ package com.xiaojukeji.kafka.manager.common.entity.vo.normal.topic;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 import java.util.List;
 
@@ -10,6 +11,7 @@ import java.util.List;
  * @author zengqiao
  * @date 19/4/1
  */
+@Data
 @ApiModel(description = "Topic基本信息")
 public class TopicBasicVO {
     @ApiModelProperty(value = "集群id")
@@ -57,125 +59,8 @@ public class TopicBasicVO {
     @ApiModelProperty(value = "所属region")
     private List<String> regionNameList;
 
-    public Long getClusterId() {
+    @ApiModelProperty(value = "高可用关系：1:主topic, 0:备topic , 其他:非主备topic")
-        return clusterId;
+    private Integer haRelation;
-    }
-
-    public void setClusterId(Long clusterId) {
-        this.clusterId = clusterId;
-    }
-
-    public String getAppId() {
-        return appId;
-    }
-
-    public void setAppId(String appId) {
-        this.appId = appId;
-    }
-
-    public String getAppName() {
-        return appName;
-    }
-
-    public void setAppName(String appName) {
-        this.appName = appName;
-    }
-
-    public Integer getPartitionNum() {
-        return partitionNum;
-    }
-
-    public void setPartitionNum(Integer partitionNum) {
-        this.partitionNum = partitionNum;
-    }
-
-    public Integer getReplicaNum() {
-        return replicaNum;
-    }
-
-    public void setReplicaNum(Integer replicaNum) {
-        this.replicaNum = replicaNum;
-    }
-
-    public String getPrincipals() {
-        return principals;
-    }
-
-    public void setPrincipals(String principals) {
-        this.principals = principals;
-    }
-
-    public Long getRetentionTime() {
-        return retentionTime;
-    }
-
-    public void setRetentionTime(Long retentionTime) {
-        this.retentionTime = retentionTime;
-    }
-
-    public Long getRetentionBytes() {
-        return retentionBytes;
-    }
-
-    public void setRetentionBytes(Long retentionBytes) {
-        this.retentionBytes = retentionBytes;
-    }
-
-    public Long getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Long createTime) {
-        this.createTime = createTime;
-    }
-
-    public Long getModifyTime() {
-        return modifyTime;
-    }
-
-    public void setModifyTime(Long modifyTime) {
-        this.modifyTime = modifyTime;
-    }
-
-    public Integer getScore() {
-        return score;
-    }
-
-    public void setScore(Integer score) {
-        this.score = score;
-    }
-
-    public String getTopicCodeC() {
-        return topicCodeC;
-    }
-
-    public void setTopicCodeC(String topicCodeC) {
-        this.topicCodeC = topicCodeC;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public String getBootstrapServers() {
-        return bootstrapServers;
-    }
-
-    public void setBootstrapServers(String bootstrapServers) {
-        this.bootstrapServers = bootstrapServers;
-    }
-
-    public List<String> getRegionNameList() {
-        return regionNameList;
-    }
-
-    public void setRegionNameList(List<String> regionNameList) {
-        this.regionNameList = regionNameList;
-    }
 
     @Override
     public String toString() {
@@ -195,6 +80,7 @@ public class TopicBasicVO {
                 ", description='" + description + '\'' +
                 ", bootstrapServers='" + bootstrapServers + '\'' +
                 ", regionNameList=" + regionNameList +
+                ", haRelation=" + haRelation +
                 '}';
     }
 }

kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/vo/normal/topic/TopicConnectionVO.java

@@ -2,11 +2,13 @@ package com.xiaojukeji.kafka.manager.common.entity.vo.normal.topic;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 /**
  * @author zhongyuankai,zengqiao
  * @date 20/4/8
  */
+@Data
 @ApiModel(value = "Topic连接信息")
 public class TopicConnectionVO {
     @ApiModelProperty(value = "集群ID")
@@ -30,72 +32,12 @@ public class TopicConnectionVO {
     @ApiModelProperty(value = "客户端版本")
     private String clientVersion;
 
-    public Long getClusterId() {
+    @ApiModelProperty(value = "客户端ID")
-        return clusterId;
+    private String clientId;
-    }
 
-    public void setClusterId(Long clusterId) {
+    @ApiModelProperty(value = "连接Broker时间")
-        this.clusterId = clusterId;
+    private Long realConnectTime;
-    }
 
-    public String getTopicName() {
+    @ApiModelProperty(value = "创建时间")
-        return topicName;
+    private Long createTime;
-    }
-
-    public void setTopicName(String topicName) {
-        this.topicName = topicName;
-    }
-
-    public String getAppId() {
-        return appId;
-    }
-
-    public void setAppId(String appId) {
-        this.appId = appId;
-    }
-
-    public String getIp() {
-        return ip;
-    }
-
-    public void setIp(String ip) {
-        this.ip = ip;
-    }
-
-    public String getHostname() {
-        return hostname;
-    }
-
-    public void setHostname(String hostname) {
-        this.hostname = hostname;
-    }
-
-    public String getClientType() {
-        return clientType;
-    }
-
-    public void setClientType(String clientType) {
-        this.clientType = clientType;
-    }
-
-    public String getClientVersion() {
-        return clientVersion;
-    }
-
-    public void setClientVersion(String clientVersion) {
-        this.clientVersion = clientVersion;
-    }
-
-    @Override
-    public String toString() {
-        return "TopicConnectionVO{" +
-                "clusterId=" + clusterId +
-                ", topicName='" + topicName + '\'' +
-                ", appId='" + appId + '\'' +
-                ", ip='" + ip + '\'' +
-                ", hostname='" + hostname + '\'' +
-                ", clientType='" + clientType + '\'' +
-                ", clientVersion='" + clientVersion + '\'' +
-                '}';
-    }
 }

kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/vo/normal/topic/TopicHaVO.java

@@ -0,0 +1,26 @@
+package com.xiaojukeji.kafka.manager.common.entity.vo.normal.topic;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author zengqiao
+ * @date 20/4/8
+ */
+@Data
+@ApiModel(value = "Topic信息")
+public class TopicHaVO {
+    @ApiModelProperty(value = "物理集群ID")
+    private Long clusterId;
+
+    @ApiModelProperty(value = "物理集群名称")
+    private String clusterName;
+
+    @ApiModelProperty(value = "Topic名称")
+    private String topicName;
+
+    @ApiModelProperty(value = "高可用关系：1:主topic, 0:备topic , 其他:非高可用topic")
+    private Integer haRelation;
+
+}

kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/vo/rd/RdTopicBasicVO.java

@@ -2,6 +2,7 @@ package com.xiaojukeji.kafka.manager.common.entity.vo.rd;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 import java.util.List;
 import java.util.Properties;
@@ -10,6 +11,7 @@ import java.util.Properties;
  * @author zengqiao
  * @date 20/6/10
  */
+@Data
 @ApiModel(description = "Topic基本信息(RD视角)")
 public class RdTopicBasicVO {
     @ApiModelProperty(value = "集群ID")
@@ -39,77 +41,8 @@ public class RdTopicBasicVO {
     @ApiModelProperty(value = "所属region")
     private List<String> regionNameList;
 
-    public Long getClusterId() {
+    @ApiModelProperty(value = "高可用关系：1:主topic, 0:备topic , 其他:非主备topic")
-        return clusterId;
+    private Integer haRelation;
-    }
-
-    public void setClusterId(Long clusterId) {
-        this.clusterId = clusterId;
-    }
-
-    public String getClusterName() {
-        return clusterName;
-    }
-
-    public void setClusterName(String clusterName) {
-        this.clusterName = clusterName;
-    }
-
-    public String getTopicName() {
-        return topicName;
-    }
-
-    public void setTopicName(String topicName) {
-        this.topicName = topicName;
-    }
-
-    public Long getRetentionTime() {
-        return retentionTime;
-    }
-
-    public void setRetentionTime(Long retentionTime) {
-        this.retentionTime = retentionTime;
-    }
-
-    public String getAppId() {
-        return appId;
-    }
-
-    public void setAppId(String appId) {
-        this.appId = appId;
-    }
-
-    public String getAppName() {
-        return appName;
-    }
-
-    public void setAppName(String appName) {
-        this.appName = appName;
-    }
-
-    public Properties getProperties() {
-        return properties;
-    }
-
-    public void setProperties(Properties properties) {
-        this.properties = properties;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public List<String> getRegionNameList() {
-        return regionNameList;
-    }
-
-    public void setRegionNameList(List<String> regionNameList) {
-        this.regionNameList = regionNameList;
-    }
 
     @Override
     public String toString() {
@@ -122,7 +55,8 @@ public class RdTopicBasicVO {
                 ", appName='" + appName + '\'' +
                 ", properties=" + properties +
                 ", description='" + description + '\'' +
-                ", regionNameList='" + regionNameList + '\'' +
+                ", regionNameList=" + regionNameList +
+                ", haRelation=" + haRelation +
                 '}';
     }
 }

kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/vo/rd/app/AppRelateTopicsVO.java

@@ -0,0 +1,72 @@
+package com.xiaojukeji.kafka.manager.common.entity.vo.rd.app;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author zengqiao
+ * @date 20/5/4
+ */
+@Data
+@NoArgsConstructor
+@ApiModel(description="App关联Topic信息")
+public class AppRelateTopicsVO {
+    @ApiModelProperty(value="物理集群ID")
+    private Long clusterPhyId;
+
+    @ApiModelProperty(value="kafkaUser")
+    private String kafkaUser;
+
+    @ApiModelProperty(value="clientId")
+    private String clientId;
+
+    @ApiModelProperty(value="已建立HA的Client")
+    private List<String> haClientIdList;
+
+    @ApiModelProperty(value="选中的Topic列表")
+    private List<String> selectedTopicNameList;
+
+    @ApiModelProperty(value="未选中的Topic列表")
+    private List<String> notSelectTopicNameList;
+
+    @ApiModelProperty(value="未建立HA的Topic列表")
+    private List<String> notHaTopicNameList;
+
+    public AppRelateTopicsVO(Long clusterPhyId, String kafkaUser, String clientId) {
+        this.clusterPhyId = clusterPhyId;
+        this.kafkaUser = kafkaUser;
+        this.clientId = clientId;
+        this.selectedTopicNameList = new ArrayList<>();
+        this.notSelectTopicNameList = new ArrayList<>();
+        this.notHaTopicNameList = new ArrayList<>();
+    }
+
+    public void addSelectedIfNotExist(String topicName) {
+        if (selectedTopicNameList.contains(topicName)) {
+            return;
+        }
+
+        selectedTopicNameList.add(topicName);
+    }
+
+    public void addNotSelectedIfNotExist(String topicName) {
+        if (notSelectTopicNameList.contains(topicName)) {
+            return;
+        }
+
+        notSelectTopicNameList.add(topicName);
+    }
+
+    public void addNotHaIfNotExist(String topicName) {
+        if (notHaTopicNameList.contains(topicName)) {
+            return;
+        }
+
+        notHaTopicNameList.add(topicName);
+    }
+}

kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/vo/rd/cluster/ClusterDetailVO.java

@@ -2,11 +2,13 @@ package com.xiaojukeji.kafka.manager.common.entity.vo.rd.cluster;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 /**
  * @author zengqiao
  * @date 20/4/23
  */
+@Data
 @ApiModel(description="集群信息")
 public class ClusterDetailVO extends ClusterBaseVO {
     @ApiModelProperty(value="Broker数")
@@ -24,45 +26,11 @@ public class ClusterDetailVO extends ClusterBaseVO {
     @ApiModelProperty(value="Region数")
     private Integer regionNum;
 
-    public Integer getBrokerNum() {
+    @ApiModelProperty(value = "高可用关系：1:主, 0:备 , 其他:非高可用")
-        return brokerNum;
+    private Integer haRelation;
-    }
 
-    public void setBrokerNum(Integer brokerNum) {
+    @ApiModelProperty(value = "互备集群名称")
-        this.brokerNum = brokerNum;
+    private String mutualBackupClusterName;
-    }
-
-    public Integer getTopicNum() {
-        return topicNum;
-    }
-
-    public void setTopicNum(Integer topicNum) {
-        this.topicNum = topicNum;
-    }
-
-    public Integer getConsumerGroupNum() {
-        return consumerGroupNum;
-    }
-
-    public void setConsumerGroupNum(Integer consumerGroupNum) {
-        this.consumerGroupNum = consumerGroupNum;
-    }
-
-    public Integer getControllerId() {
-        return controllerId;
-    }
-
-    public void setControllerId(Integer controllerId) {
-        this.controllerId = controllerId;
-    }
-
-    public Integer getRegionNum() {
-        return regionNum;
-    }
-
-    public void setRegionNum(Integer regionNum) {
-        this.regionNum = regionNum;
-    }
 
     @Override
     public String toString() {
@@ -72,6 +40,8 @@ public class ClusterDetailVO extends ClusterBaseVO {
                 ", consumerGroupNum=" + consumerGroupNum +
                 ", controllerId=" + controllerId +
                 ", regionNum=" + regionNum +
-                "} " + super.toString();
+                ", haRelation=" + haRelation +
+                ", mutualBackupClusterName='" + mutualBackupClusterName + '\'' +
+                '}';
     }
 }

kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/vo/rd/job/JobLogVO.java

@@ -0,0 +1,30 @@
+package com.xiaojukeji.kafka.manager.common.entity.vo.rd.job;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel(description = "Job日志")
+public class JobLogVO {
+    @ApiModelProperty(value = "日志ID")
+    protected Long id;
+
+    @ApiModelProperty(value = "业务类型")
+    private Integer bizType;
+
+    @ApiModelProperty(value = "业务关键字")
+    private String bizKeyword;
+
+    @ApiModelProperty(value = "打印时间")
+    private Date printTime;
+
+    @ApiModelProperty(value = "内容")
+    private String content;
+}

kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/vo/rd/job/JobMulLogVO.java

@@ -0,0 +1,31 @@
+package com.xiaojukeji.kafka.manager.common.entity.vo.rd.job;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel(description = "Job日志")
+public class JobMulLogVO {
+    @ApiModelProperty(value = "末尾日志ID")
+    private Long endLogId;
+
+    @ApiModelProperty(value = "日志信息")
+    private List<JobLogVO> logList;
+
+    public JobMulLogVO(List<JobLogVO> logList, Long startLogId) {
+        this.logList = logList == null? new ArrayList<>(): logList;
+        if (!this.logList.isEmpty()) {
+            this.endLogId = this.logList.stream().map(elem -> elem.id).reduce(Long::max).get() + 1;
+        } else {
+            this.endLogId = startLogId;
+        }
+    }
+}

kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/utils/ConvertUtil.java

@@ -0,0 +1,404 @@
+package com.xiaojukeji.kafka.manager.common.utils;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.TypeReference;
+import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.google.common.collect.*;
+import org.apache.commons.collections.CollectionUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.lang.reflect.Type;
+import java.util.*;
+import java.util.Map.Entry;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Consumer;
+import java.util.function.Function;
+
+public class ConvertUtil {
+    private static final Logger LOGGER = LoggerFactory.getLogger(ConvertUtil.class);
+
+    private ConvertUtil(){}
+
+    public static <T> T toObj(String json, Type resultType) {
+        if (resultType instanceof Class) {
+            Class<T> clazz = (Class<T>) resultType;
+            return str2ObjByJson(json, clazz);
+        }
+
+        return JSON.parseObject(json, resultType);
+    }
+
+    public static <T> T str2ObjByJson(String srcStr, Class<T> tgtClass) {
+        return JSON.parseObject(srcStr, tgtClass);
+    }
+
+    public static <T> T str2ObjByJson(String srcStr, TypeReference<T> tt) {
+        return JSON.parseObject(srcStr, tt);
+    }
+
+    public static String obj2Json(Object srcObj) {
+        if (srcObj == null) {
+            return null;
+        }
+        if (srcObj instanceof String) {
+            return (String) srcObj;
+        } else {
+            return JSON.toJSONString(srcObj);
+        }
+    }
+
+    public static String obj2JsonWithIgnoreCircularReferenceDetect(Object srcObj) {
+        return JSON.toJSONString(srcObj, SerializerFeature.DisableCircularReferenceDetect);
+    }
+
+    public static <T> List<T> str2ObjArrayByJson(String srcStr, Class<T> tgtClass) {
+        return JSON.parseArray(srcStr, tgtClass);
+    }
+
+    public static <T> T obj2ObjByJSON(Object srcObj, Class<T> tgtClass) {
+        return JSON.parseObject( JSON.toJSONString(srcObj), tgtClass);
+    }
+
+    public static String list2String(List<?> list, String separator) {
+        if (list == null || list.isEmpty()) {
+            return "";
+        }
+
+        StringBuilder sb = new StringBuilder();
+        for (Object item : list) {
+            sb.append(item).append(separator);
+        }
+        return sb.deleteCharAt(sb.length() - 1).toString();
+    }
+
+    public static <K, V> Map<K, V> list2Map(List<V> list, Function<? super V, ? extends K> mapper) {
+        Map<K, V> map = Maps.newHashMap();
+        if (CollectionUtils.isNotEmpty(list)) {
+            for (V v : list) {
+                map.put(mapper.apply(v), v);
+            }
+        }
+        return map;
+    }
+
+    public static <K, V> Map<K, V> list2MapParallel(List<V> list, Function<? super V, ? extends K> mapper) {
+        Map<K, V> map = new ConcurrentHashMap<>();
+        if (CollectionUtils.isNotEmpty(list)) {
+            list.parallelStream().forEach(v -> map.put(mapper.apply(v), v));
+        }
+        return map;
+    }
+
+    public static <K, V, O> Map<K, V> list2Map(List<O> list, Function<? super O, ? extends K> keyMapper,
+                                               Function<? super O, ? extends V> valueMapper) {
+        Map<K, V> map = Maps.newHashMap();
+        if (CollectionUtils.isNotEmpty(list)) {
+            for (O o : list) {
+                map.put(keyMapper.apply(o), valueMapper.apply(o));
+            }
+        }
+        return map;
+    }
+
+    public static <K, V> Multimap<K, V> list2MulMap(List<V> list, Function<? super V, ? extends K> mapper) {
+        Multimap<K, V> multimap = ArrayListMultimap.create();
+        if (CollectionUtils.isNotEmpty(list)) {
+            for (V v : list) {
+                multimap.put(mapper.apply(v), v);
+            }
+        }
+        return multimap;
+    }
+
+    public static <K, V, O> Multimap<K, V> list2MulMap(List<O> list, Function<? super O, ? extends K> keyMapper,
+                                                       Function<? super O, ? extends V> valueMapper) {
+        Multimap<K, V> multimap = ArrayListMultimap.create();
+        if (CollectionUtils.isNotEmpty(list)) {
+            for (O o : list) {
+                multimap.put(keyMapper.apply(o), valueMapper.apply(o));
+            }
+        }
+        return multimap;
+    }
+
+    public static <K, V, O> Map<K, List<V>> list2MapOfList(List<O> list, Function<? super O, ? extends K> keyMapper,
+                                                           Function<? super O, ? extends V> valueMapper) {
+        ArrayListMultimap<K, V> multimap = ArrayListMultimap.create();
+        if (CollectionUtils.isNotEmpty(list)) {
+            for (O o : list) {
+                multimap.put(keyMapper.apply(o), valueMapper.apply(o));
+            }
+        }
+
+        return Multimaps.asMap(multimap);
+    }
+
+    public static <K, V> Set<K> list2Set(List<V> list, Function<? super V, ? extends K> mapper) {
+        Set<K> set = Sets.newHashSet();
+        if (CollectionUtils.isNotEmpty(list)) {
+            for (V v : list) {
+                set.add(mapper.apply(v));
+            }
+        }
+        return set;
+    }
+
+    public static <T> Set<T> set2Set(Set<? extends Object> set, Class<T> tClass) {
+        if (CollectionUtils.isEmpty(set)) {
+            return new HashSet<>();
+        }
+
+        Set<T> result = new HashSet<>();
+
+        for (Object o : set) {
+            T t = obj2Obj(o, tClass);
+            if (t != null) {
+                result.add(t);
+            }
+        }
+
+        return result;
+    }
+
+    public static <T> List<T> list2List(List<? extends Object> list, Class<T> tClass) {
+        return list2List(list, tClass, (t) -> {
+        });
+    }
+
+    public static <T> List<T> list2List(List<? extends Object> list, Class<T> tClass, Consumer<T> consumer) {
+        if (CollectionUtils.isEmpty(list)) {
+            return Lists.newArrayList();
+        }
+
+        List<T> result = Lists.newArrayList();
+
+        for (Object object : list) {
+            T t = obj2Obj(object, tClass, consumer);
+            if (t != null) {
+                result.add(t);
+            }
+        }
+
+        return result;
+    }
+
+    /**
+     * 对象转换工具
+     * @param srcObj 元对象
+     * @param tgtClass 目标对象类
+     * @param <T> 泛型
+     * @return 目标对象
+     */
+    public static <T> T obj2Obj(final Object srcObj, Class<T> tgtClass) {
+        return obj2Obj(srcObj, tgtClass, (t) -> {
+        });
+    }
+
+    public static <T> T obj2Obj(final Object srcObj, Class<T> tgtClass, Consumer<T> consumer) {
+        if (srcObj == null) {
+            return null;
+        }
+
+        T tgt = null;
+        try {
+            tgt = tgtClass.newInstance();
+            BeanUtils.copyProperties(srcObj, tgt);
+            consumer.accept(tgt);
+        } catch (Exception e) {
+            LOGGER.warn("class=ConvertUtil||method=obj2Obj||msg={}", e.getMessage());
+        }
+
+        return tgt;
+    }
+
+    public static <K, V> Map<K, V> mergeMapList(List<Map<K, V>> mapList) {
+        Map<K, V> result = Maps.newHashMap();
+        for (Map<K, V> map : mapList) {
+            result.putAll(map);
+        }
+        return result;
+    }
+
+    public static Map<String, Object> Obj2Map(Object obj) {
+        if (null == obj) {
+            return null;
+        }
+
+        Map<String, Object> map = new HashMap<>();
+        Field[] fields = obj.getClass().getDeclaredFields();
+        for (Field field : fields) {
+            field.setAccessible(true);
+            try {
+                map.put(field.getName(), field.get(obj));
+            } catch (IllegalAccessException e) {
+                LOGGER.warn("class=ConvertUtil||method=Obj2Map||msg={}", e.getMessage(), e);
+            }
+        }
+        return map;
+    }
+
+    public static Object map2Obj(Map<String, Object> map, Class<?> clz) {
+        Object obj = null;
+        try {
+            obj = clz.newInstance();
+            Field[] declaredFields = obj.getClass().getDeclaredFields();
+            for (Field field : declaredFields) {
+                int mod = field.getModifiers();
+                if (Modifier.isStatic(mod) || Modifier.isFinal(mod)) {
+                    continue;
+                }
+                field.setAccessible(true);
+                field.set(obj, map.get(field.getName()));
+            }
+        } catch (Exception e) {
+            LOGGER.warn("class=ConvertUtil||method=map2Obj||msg={}", e.getMessage(), e);
+        }
+
+        return obj;
+    }
+
+    public static Map<String, Double> sortMapByValue(Map<String, Double> map) {
+        List<Entry<String, Double>> data = new ArrayList<>(map.entrySet());
+        data.sort((o1, o2) -> {
+            if ((o2.getValue() - o1.getValue()) > 0) {
+                return 1;
+            } else if ((o2.getValue() - o1.getValue()) == 0) {
+                return 0;
+            } else {
+                return -1;
+            }
+        });
+
+        Map<String, Double> result = Maps.newLinkedHashMap();
+
+        for (Entry<String, Double> next : data) {
+            result.put(next.getKey(), next.getValue());
+        }
+        return result;
+    }
+
+    public static Map<String, Object> directFlatObject(JSONObject obj) {
+        Map<String, Object> ret = new HashMap<>();
+
+        if(obj==null) {
+            return ret;
+        }
+
+        for (Entry<String, Object> entry : obj.entrySet()) {
+            String key = entry.getKey();
+            Object o = entry.getValue();
+
+            if (o instanceof JSONObject) {
+                Map<String, Object> m = directFlatObject((JSONObject) o);
+                for (Entry<String, Object> e : m.entrySet()) {
+                    ret.put(key + "." + e.getKey(), e.getValue());
+                }
+            } else {
+                ret.put(key, o);
+            }
+        }
+
+        return ret;
+    }
+
+    public static Long string2Long(String s) {
+        if (ValidateUtils.isNull(s)) {
+            return null;
+        }
+        try {
+            return Long.parseLong(s);
+        } catch (Exception e) {
+            // ignore exception
+        }
+        return null;
+    }
+
+    public static Float string2Float(String s) {
+        if (ValidateUtils.isNull(s)) {
+            return null;
+        }
+        try {
+            return Float.parseFloat(s);
+        } catch (Exception e) {
+            // ignore exception
+        }
+        return null;
+    }
+
+    public static String float2String(Float f) {
+        if (ValidateUtils.isNull(f)) {
+            return null;
+        }
+        try {
+            return String.valueOf(f);
+        } catch (Exception e) {
+            // ignore exception
+        }
+        return null;
+    }
+
+    public static Integer string2Integer(String s) {
+        if (null == s) {
+            return null;
+        }
+        try {
+            return Integer.parseInt(s);
+        } catch (Exception e) {
+            // ignore exception
+        }
+        return null;
+    }
+
+    public static Double string2Double(String s) {
+        if (null == s) {
+            return null;
+        }
+        try {
+            return Double.parseDouble(s);
+        } catch (Exception e) {
+            // ignore exception
+        }
+        return null;
+    }
+
+    public static Long double2Long(Double d) {
+        if (null == d) {
+            return null;
+        }
+        try {
+            return d.longValue();
+        } catch (Exception e) {
+            // ignore exception
+        }
+        return null;
+    }
+
+    public static Integer double2Int(Double d) {
+        if (null == d) {
+            return null;
+        }
+        try {
+            return d.intValue();
+        } catch (Exception e) {
+            // ignore exception
+        }
+        return null;
+    }
+
+    public static Long Float2Long(Float f) {
+        if (null == f) {
+            return null;
+        }
+        try {
+            return f.longValue();
+        } catch (Exception e) {
+            // ignore exception
+        }
+        return null;
+    }
+}

kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/utils/CopyUtils.java

@@ -15,6 +15,7 @@ import java.util.concurrent.ConcurrentHashMap;
  * @author huangyiminghappy@163.com
  * @date 2019/3/15
  */
+@Deprecated
 public class CopyUtils {
 
     @SuppressWarnings({"unchecked", "rawtypes"})

kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/utils/FutureUtil.java

@@ -40,6 +40,14 @@ public class FutureUtil<T> {
         return futureUtil;
     }
 
+    public Future<T> directSubmitTask(Callable<T> callable) {
+        return executor.submit(callable);
+    }
+
+    public Future<T> directSubmitTask(Runnable runnable) {
+        return (Future<T>) executor.submit(runnable);
+    }
+
     /**
      * 必须配合 waitExecute使用 否则容易会撑爆内存
      */

kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/utils/HAUtils.java

@@ -0,0 +1,29 @@
+package com.xiaojukeji.kafka.manager.common.utils;
+
+public class HAUtils {
+    public static String mergeKafkaUserAndClient(String kafkaUser, String clientId) {
+        if (ValidateUtils.isBlank(clientId)) {
+            return kafkaUser;
+        }
+
+        return String.format("%s#%s", kafkaUser, clientId);
+    }
+
+    public static Tuple<String, String> splitKafkaUserAndClient(String kafkaUserAndClientId) {
+        if (ValidateUtils.isBlank(kafkaUserAndClientId)) {
+            return null;
+        }
+
+        int idx = kafkaUserAndClientId.indexOf('#');
+        if (idx == -1) {
+            return null;
+        } else if (idx == kafkaUserAndClientId.length() - 1) {
+            return new Tuple<>(kafkaUserAndClientId.substring(0, idx), "");
+        }
+
+        return new Tuple<>(kafkaUserAndClientId.substring(0, idx), kafkaUserAndClientId.substring(idx + 1));
+    }
+
+    private HAUtils() {
+    }
+}

kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/utils/JsonUtils.java

@@ -79,10 +79,27 @@ public class JsonUtils {
                     TopicConnectionDO connectionDO = new TopicConnectionDO();
 
                     String[] appIdDetailArray = appIdDetail.toString().split("#");
-                    if (appIdDetailArray.length >= 3) {
+                    if (appIdDetailArray == null) {
-                        connectionDO.setAppId(appIdDetailArray[0]);
+                        appIdDetailArray = new String[0];
-                        connectionDO.setIp(appIdDetailArray[1]);
+                    }
-                        connectionDO.setClientVersion(appIdDetailArray[2]);
+
+                    connectionDO.setAppId(parseTopicConnections(appIdDetailArray, 0));
+                    connectionDO.setIp(parseTopicConnections(appIdDetailArray, 1));
+                    connectionDO.setClientVersion(parseTopicConnections(appIdDetailArray, 2));
+
+                    // 解析clientId
+                    StringBuilder sb = new StringBuilder();
+                    for (int i = 3; i < appIdDetailArray.length - 1; ++i) {
+                        sb.append(parseTopicConnections(appIdDetailArray, i)).append("#");
+                    }
+                    connectionDO.setClientId(sb.substring(0, sb.length() - 1));
+
+                    // 解析时间
+                    Long receiveTime = ConvertUtil.string2Long(parseTopicConnections(appIdDetailArray, appIdDetailArray.length - 1));
+                    if (receiveTime == null) {
+                        connectionDO.setRealConnectTime(-1L);
+                    } else {
+                        connectionDO.setRealConnectTime(receiveTime);
                     }
 
                     connectionDO.setClusterId(clusterId);
@@ -95,4 +112,8 @@ public class JsonUtils {
         }
         return connectionDOList;
     }
+
+    private static String parseTopicConnections(String[] appIdDetailArray, int idx) {
+        return (appIdDetailArray != null && appIdDetailArray.length >= idx + 1)? appIdDetailArray[idx]: "";
+    }
 }

kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/utils/Tuple.java

@@ -0,0 +1,61 @@
+package com.xiaojukeji.kafka.manager.common.utils;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Data;
+
+/**
+ * @Author: D10865
+ * @Description:
+ * @Date: Create on 2018/5/29 下午4:08
+ * @Modified By
+ */
+@JsonIgnoreProperties(value = { "hibernateLazyInitializer", "handler" })
+@Data
+public class Tuple<T, V> {
+
+    private T v1;
+    private V v2;
+
+    public Tuple(){}
+
+    public Tuple(T v1, V v2) {
+        this.v1 = v1;
+        this.v2 = v2;
+    }
+
+    public T v1() {
+        return v1;
+    }
+
+    public Tuple<T, V> setV1(T v1) {
+        this.v1 = v1;
+        return this;
+    }
+
+    public V v2() {
+        return v2;
+    }
+
+    public Tuple<T, V> setV2(V v2) {
+        this.v2 = v2;
+        return this;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {return true;}
+        if (o == null || getClass() != o.getClass()) {return false;}
+
+        Tuple<?, ?> tuple = (Tuple<?, ?>) o;
+
+        if (v1 != null ? !v1.equals(tuple.v1) : tuple.v1 != null) {return false;}
+        return v2 != null ? v2.equals(tuple.v2) : tuple.v2 == null;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = v1 != null ? v1.hashCode() : 0;
+        result = 31 * result + (v2 != null ? v2.hashCode() : 0);
+        return result;
+    }
+}

kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/zookeeper/ZkPathUtil.java

@@ -8,6 +8,8 @@ package com.xiaojukeji.kafka.manager.common.zookeeper;
 public class ZkPathUtil {
     private static final String     ZOOKEEPER_SEPARATOR         = "/";
 
+    public static final String      CLUSTER_ID_NODE            = ZOOKEEPER_SEPARATOR + "cluster/id";
+
     public static final String      BROKER_ROOT_NODE            = ZOOKEEPER_SEPARATOR + "brokers";
 
     public static final String      CONTROLLER_ROOT_NODE        = ZOOKEEPER_SEPARATOR + "controller";

kafka-manager-console/package.json

@@ -1,13 +1,13 @@
 {
   "name": "logi-kafka",
-  "version": "2.6.1",
+  "version": "2.8.0",
   "description": "",
   "scripts": {
     "prestart": "npm install --save-dev webpack-dev-server",
-    "start": "webpack serve",
+    "start": "webpack-dev-server",
     "daily-build": "cross-env NODE_ENV=production webpack",
     "pre-build": "cross-env NODE_ENV=production webpack",
-    "prod-build": "cross-env NODE_ENV=production webpack",
+    "prod-build": "cross-env NODE_OPTIONS=--max-old-space-size=8000 NODE_ENV=production webpack",
     "fix-memory": "cross-env LIMIT=4096 increase-memory-limit"
   },
   "author": "",
@@ -16,8 +16,10 @@
     "@hot-loader/react-dom": "^16.8.6",
     "@types/events": "^3.0.0",
     "@types/lodash.debounce": "^4.0.6",
+    "@types/node": "18.7.13",
     "@types/react": "^16.8.8",
     "@types/react-dom": "^16.8.2",
+    "@types/react-router": "4.4.5",
     "@types/react-router-dom": "^4.3.1",
     "@types/spark-md5": "^3.0.2",
     "@webpack-cli/serve": "^1.6.0",
@@ -52,7 +54,8 @@
     "typescript": "^3.3.3333",
     "url-loader": "^4.1.1",
     "webpack": "^4.29.6",
-    "webpack-cli": "^4.9.1",
+    "webpack-cli": "^3.2.3",
+    "webpack-dev-server": "^3.11.3",
     "xlsx": "^0.16.1"
   },
   "dependencies": {

kafka-manager-console/src/component/x-form-wrapper/index.tsx

@@ -8,7 +8,7 @@ export class XFormWrapper extends React.Component<IXFormWrapper> {
   public state = {
     confirmLoading: false,
     formMap: this.props.formMap || [] as any,
-    formData: this.props.formData || {}
+    formData: this.props.formData || {},
   };
 
   private $formRef: any;
@@ -121,7 +121,8 @@ export class XFormWrapper extends React.Component<IXFormWrapper> {
             this.closeModalWrapper();
           }).catch((err: any) => {
             const { formMap, formData } = wrapper.xFormWrapper;
-            onSubmitFaild(err, this.$formRef, formData, formMap);
+            // tslint:disable-next-line:no-unused-expression
+            onSubmitFaild && onSubmitFaild(err, this.$formRef, formData, formMap);
           }).finally(() => {
             this.setState({
               confirmLoading: false,

kafka-manager-console/src/component/x-form/index.less

@@ -1,4 +1,5 @@
-.ant-input-number, .ant-form-item-children .ant-select {
+.ant-input-number,
+.ant-form-item-children .ant-select {
   width: 314px
 }
 
@@ -9,3 +10,35 @@
     margin-right: 16px;
   }
 }
+
+.x-form {
+  .ant-form-item-label {
+    line-height: 32px;
+  }
+
+  .ant-form-item-control {
+    line-height: 32px;
+  }
+}
+
+.prompt-info {
+  color: #ccc;
+  font-size: 12px;
+  line-height: 20px;
+  display: block;
+
+  &.inline {
+    margin-left: 16px;
+    display: inline-block;
+
+    font-family: PingFangSC-Regular;
+    font-size: 12px;
+    color: #042866;
+    letter-spacing: 0;
+    text-align: justify;
+
+    .anticon {
+      margin-right: 6px;
+    }
+  }
+}

kafka-manager-console/src/component/x-form/index.tsx

@@ -85,6 +85,10 @@ class XForm extends React.Component<IXFormProps> {
       initialValue = false;
     }
 
+    if (formItem.type === FormItemType.select) {
+      initialValue = initialValue || undefined;
+    }
+
     // if (formItem.type === FormItemType.select && formItem.attrs
     //   && ['tags'].includes(formItem.attrs.mode)) {
     //   initialValue = formItem.defaultValue ? [formItem.defaultValue] : [];
@@ -105,7 +109,7 @@ class XForm extends React.Component<IXFormProps> {
     const { form, formData, formMap, formLayout, layout } = this.props;
     const { getFieldDecorator } = form;
     return (
-      <Form layout={layout || 'horizontal'} onSubmit={() => ({})}>
+      <Form className="x-form" layout={layout || 'horizontal'} onSubmit={() => ({})}>
         {formMap.map(formItem => {
           const { initialValue, valuePropName } = this.handleFormItem(formItem, formData);
           const getFieldValue = {
@@ -131,7 +135,13 @@ class XForm extends React.Component<IXFormProps> {
               )}
               {formItem.renderExtraElement ? formItem.renderExtraElement() : null}
               {/* 添加保存时间提示文案 */}
-              {formItem.attrs?.prompttype ? <span style={{ color: "#cccccc", fontSize: '12px', lineHeight: '20px', display: 'block' }}>{formItem.attrs.prompttype}</span> : null}
+              {formItem.attrs?.prompttype ?
+                <span className={`prompt-info ${formItem.attrs?.promptclass || ''}`}>
+                  {formItem.attrs?.prompticon ?
+                    <Icon type="info-circle" theme="twoTone" twoToneColor="#0A70F5" className={formItem.attrs?.prompticomclass} /> : null}
+                  {formItem.attrs.prompttype}
+                </span>
+                : null}
             </Form.Item>
           );
         })}

kafka-manager-console/src/container/admin/cluster-detail/cluster-overview.tsx

@@ -30,7 +30,7 @@ export class ClusterOverview extends React.Component<IOverview> {
     const content = this.props.basicInfo as IMetaData;
     const gmtCreate = moment(content.gmtCreate).format(timeFormat);
     const clusterContent = [{
-      value: content.clusterName,
+      value: `${content.clusterName}${content.haRelation === 0 ? '（备）' : content.haRelation === 1 ? '（主）' : content.haRelation === 2 ? '（主&备）' : ''}`,
       label: '集群名称',
     },
     // {
@@ -50,6 +50,9 @@ export class ClusterOverview extends React.Component<IOverview> {
     }, {
       value: content.zookeeper,
       label: 'Zookeeper',
+    }, {
+      value: `${content.mutualBackupClusterName || '-'}${content.haRelation === 0 ? '（主）' : content.haRelation === 1 ? '（备）' : content.haRelation === 2 ? '（主&备）' : ''}`,
+      label: '互备集群',
     }];
     return (
       <>

kafka-manager-console/src/container/admin/cluster-detail/cluster-topic.tsx

@@ -118,10 +118,10 @@ export class ClusterTopic extends SearchAndFilterContainer {
   public renderClusterTopicList() {
     const clusterColumns = [
       {
-        title: 'Topic名称',
+        title: `Topic名称`,
         dataIndex: 'topicName',
         key: 'topicName',
-        width: '120px',
+        width: '140px',
         sorter: (a: IClusterTopics, b: IClusterTopics) => a.topicName.charCodeAt(0) - b.topicName.charCodeAt(0),
         render: (text: string, record: IClusterTopics) => {
           return (
@@ -130,7 +130,7 @@ export class ClusterTopic extends SearchAndFilterContainer {
                 // tslint:disable-next-line:max-line-length
                 href={`${urlPrefix}/topic/topic-detail?clusterId=${record.clusterId || ''}&topic=${record.topicName || ''}&isPhysicalClusterId=true&region=${region.currentRegion}`}
               >
-                {text}
+                {text}{record.haRelation === 0 ? '（备）' : record.haRelation === 1 ? '（主）' : record.haRelation === 2 ? '（主&备）' : ''}
               </a>
             </Tooltip>);
         },
@@ -208,7 +208,10 @@ export class ClusterTopic extends SearchAndFilterContainer {
       {
         title: '操作',
         width: '120px',
-        render: (value: string, item: IClusterTopics) => (
+        render: (value: string, item: IClusterTopics) => {
+          if (item.haRelation === 0) return '-';
+
+          return (
             <>
               <a onClick={() => this.getBaseInfo(item)} className="action-button">编辑</a>
               <a onClick={() => this.expandPartition(item)} className="action-button">扩分区</a>
@@ -224,7 +227,8 @@ export class ClusterTopic extends SearchAndFilterContainer {
                 <a>删除</a>
               </Popconfirm>
             </>
-        ),
+          );
+        },
       },
     ];
     if (users.currentUser.role !== 2) {

kafka-manager-console/src/container/admin/cluster-detail/logical-cluster.tsx

@@ -73,6 +73,7 @@ export class LogicalCluster extends SearchAndFilterContainer {
         key: 'mode',
         render: (value: number) => {
           let val = '';
+          // tslint:disable-next-line:no-unused-expression
           cluster.clusterModes && cluster.clusterModes.forEach((ele: any) => {
             if (value === ele.code) {
               val = ele.message;
@@ -206,6 +207,7 @@ export class LogicalCluster extends SearchAndFilterContainer {
   }
 
   public render() {
+    const clusterModes = cluster.clusterModes;
     return (
       <div className="k-row">
         <ul className="k-tab">

kafka-manager-console/src/container/admin/cluster-list/index.less

@@ -0,0 +1,381 @@
+.switch-style {
+  &.ant-switch {
+    min-width: 32px;
+    height: 20px;
+    line-height: 18px;
+
+    ::after {
+      height: 16px;
+      width: 16px;
+    }
+  }
+
+  &.ant-switch-loading-icon,
+  &.ant-switch::after {
+    height: 16px;
+    width: 16px;
+  }
+}
+
+.expanded-table {
+  width: auto ! important;
+
+  .ant-table-thead {
+    // visibility: hidden;
+    display: none;
+  }
+
+  .ant-table-tbody>tr>td {
+    background-color: #FAFAFA;
+    border-bottom: none;
+  }
+}
+
+tr.ant-table-expanded-row td>.expanded-table {
+  padding: 10px;
+  // margin: -13px 0px -14px ! important;
+  border: none;
+}
+
+.cluster-tag {
+  background: #27D687;
+  border-radius: 2px;
+  font-family: PingFangSC-Medium;
+  color: #FFFFFF;
+  letter-spacing: 0;
+  text-align: justify;
+  -webkit-transform: scale(0.5);
+  margin-right: 0px;
+}
+
+.no-padding {
+  .ant-modal-body {
+    padding: 0;
+
+    .attribute-content {
+      .tag-gray {
+        font-family: PingFangSC-Regular;
+        font-size: 12px;
+        color: #575757;
+        text-align: center;
+        line-height: 18px;
+        padding: 0 4px;
+        margin: 3px;
+        height: 20px;
+        background: #EEEEEE;
+        border-radius: 5px;
+      }
+
+      .icon {
+        zoom: 0.8;
+      }
+
+      .tag-num {
+        font-family: PingFangSC-Medium;
+        text-align: right;
+        line-height: 13px;
+        margin-left: 6px;
+        transform: scale(0.8333);
+      }
+    }
+
+    .attribute-tag {
+      .ant-popover-inner-content {
+        padding: 12px;
+        max-width: 480px;
+      }
+
+      .ant-popover-arrow {
+        display: none;
+      }
+
+      .ant-popover-placement-bottom,
+      .ant-popover-placement-bottomLeft,
+      .ant-popover-placement-bottomRight {
+        top: 23px !important;
+        border-radius: 2px;
+      }
+
+      .tag-gray {
+        font-family: PingFangSC-Regular;
+        font-size: 12px;
+        color: #575757;
+        text-align: center;
+        line-height: 12px;
+        padding: 0 4px;
+        margin: 3px;
+        height: 20px;
+        background: #EEEEEE;
+        border-radius: 5px;
+      }
+    }
+
+    .col-status {
+      font-family: PingFangSC-Regular;
+      font-size: 12px;
+      letter-spacing: 0;
+      text-align: justify;
+
+      &.green {
+        .ant-badge-status-text {
+          color: #2FC25B;
+        }
+      }
+
+      &.black {
+        .ant-badge-status-text {
+          color: #575757;
+        }
+      }
+
+      &.red {
+        .ant-badge-status-text {
+          color: #F5202E;
+        }
+      }
+    }
+
+    .ant-alert-message {
+      font-family: PingFangSC-Regular;
+      font-size: 12px;
+      letter-spacing: 0;
+      text-align: justify;
+    }
+
+    .ant-alert-warning {
+      border: none;
+      color: #592D00;
+      padding: 7px 15px 7px 41px;
+      background: #FFFAE0;
+
+      .ant-alert-message {
+        color: #592D00
+      }
+    }
+
+    .ant-alert-info {
+      border: none;
+      padding: 7px 15px 7px 41px;
+      color: #042866;
+      background: #EFF8FF;
+
+      .ant-alert-message {
+        color: #042866;
+      }
+    }
+
+    .ant-alert-icon {
+      left: 24px;
+      top: 10px;
+    }
+
+    .switch-warning {
+      .btn {
+        position: absolute;
+        top: 60px;
+        right: 24px;
+        height: 22px;
+        width: 64px;
+        padding: 0px;
+
+        &.disabled {
+          top: 77px;
+        }
+
+        button {
+          height: 22px;
+          width: 64px;
+          padding: 0px;
+        }
+
+        &.loading {
+          width: 80px;
+
+          button {
+            height: 22px;
+            width: 88px;
+            padding: 0px 0px 0px 12px;
+          }
+        }
+      }
+    }
+
+    .modal-table-content {
+      padding: 0px 24px 16px;
+
+      .ant-table-small {
+        border: none;
+        border-top: 1px solid #e8e8e8;
+
+        .ant-table-thead {
+          background: #FAFAFA;
+        }
+      }
+    }
+
+    .modal-table-download {
+      height: 40px;
+      line-height: 40px;
+      text-align: center;
+      border-top: 1px solid #e8e8e8;
+    }
+
+    .ant-form {
+      padding: 18px 24px 0px;
+
+      .ant-col-3 {
+        width: 9.5%;
+      }
+
+      .ant-form-item-label {
+        text-align: left;
+      }
+
+      .no-label {
+        .ant-col-21 {
+          width: 100%;
+        }
+
+        .transfe-list {
+          .ant-transfer-list {
+            height: 359px;
+          }
+        }
+
+        .ant-transfer-list {
+          width: 249px;
+          border: 1px solid #E8E8E8;
+          border-radius: 8px;
+
+          .ant-transfer-list-header-title {
+            font-family: PingFangSC-Regular;
+            font-size: 12px;
+            color: #252525;
+            letter-spacing: 0;
+            text-align: right;
+          }
+
+          .ant-transfer-list-body-search-wrapper {
+            padding: 19px 16px 6px;
+
+            input {
+              height: 27px;
+              background: #FAFAFA;
+              border-radius: 8px;
+              border: none;
+            }
+
+            .ant-transfer-list-search-action {
+              line-height: 27px;
+              height: 27px;
+              top: 19px;
+            }
+          }
+        }
+
+        .ant-transfer-list-header {
+          border-radius: 8px 8px 0px 0px;
+          padding: 16px;
+        }
+      }
+
+      .ant-transfer-customize-list .ant-transfer-list-body-customize-wrapper {
+        padding: 0px;
+        margin: 0px 16px;
+        background: #FAFAFA;
+        border-radius: 8px;
+
+        .ant-table-header-column {
+          font-family: PingFangSC-Regular;
+          font-size: 12px;
+          color: #575757;
+          letter-spacing: 0;
+          text-align: justify;
+        }
+
+        .ant-table-thead>tr {
+          border: none;
+          background: #FAFAFA;
+        }
+
+        .ant-table-tbody>tr>td {
+          border: none;
+          background: #FAFAFA;
+        }
+
+        .ant-table-body {
+          background: #FAFAFA;
+        }
+      }
+
+      .ant-table-selection-column {
+
+        .ant-table-header-column {
+          opacity: 0;
+        }
+      }
+    }
+
+    .log-process {
+      height: 56px;
+      background: #FAFAFA;
+      padding: 6px 8px;
+      margin-bottom: 15px;
+
+      .name {
+        display: flex;
+        color: #575757;
+        justify-content: space-between;
+      }
+    }
+
+    .log-panel {
+      padding: 24px;
+      font-family: PingFangSC-Regular;
+      font-size: 12px;
+
+      .title {
+        color: #252525;
+        letter-spacing: 0;
+        text-align: justify;
+        margin-bottom: 15px;
+
+        .divider {
+          display: inline-block;
+          border-left: 2px solid #F38031;
+          height: 9px;
+          margin-right: 6px;
+        }
+      }
+
+      .log-info {
+        color: #575757;
+        letter-spacing: 0;
+        text-align: justify;
+        margin-bottom: 10px;
+
+        .text-num {
+          font-size: 14px;
+        }
+
+        .warning-num {
+          color: #F38031;
+          font-size: 14px;
+        }
+      }
+
+      .log-table {
+        margin-bottom: 24px;
+
+        .ant-table-small {
+          border: none;
+          border-top: 1px solid #e8e8e8;
+
+          .ant-table-thead {
+            background: #FAFAFA;
+          }
+        }
+      }
+    }
+  }
+}

kafka-manager-console/src/container/admin/cluster-list/index.tsx

@@ -1,8 +1,8 @@
 import * as React from 'react';
-import { Modal, Table, Button, notification, message, Tooltip, Icon, Popconfirm, Alert, Popover } from 'component/antd';
+import { Modal, Table, Button, notification, message, Tooltip, Icon, Popconfirm, Alert, Dropdown } from 'component/antd';
 import { wrapper } from 'store';
 import { observer } from 'mobx-react';
-import { IXFormWrapper, IMetaData, IRegister } from 'types/base-type';
+import { IXFormWrapper, IMetaData, IRegister, ILabelValue } from 'types/base-type';
 import { admin } from 'store/admin';
 import { users } from 'store/users';
 import { registerCluster, createCluster, pauseMonitoring } from 'lib/api';
@@ -10,11 +10,14 @@ import { SearchAndFilterContainer } from 'container/search-filter';
 import { cluster } from 'store/cluster';
 import { customPagination } from 'constants/table';
 import { urlPrefix } from 'constants/left-menu';
-import { indexUrl } from 'constants/strategy'
+import { indexUrl } from 'constants/strategy';
 import { region } from 'store';
 import './index.less';
-import Monacoeditor from 'component/editor/monacoEditor';
 import { getAdminClusterColumns } from '../config';
+import { FormItemType } from 'component/x-form';
+import { TopicHaRelationWrapper } from 'container/modal/admin/TopicHaRelation';
+import { TopicSwitchWrapper } from 'container/modal/admin/TopicHaSwitch';
+import { TopicSwitchLog } from 'container/modal/admin/SwitchTaskLog';
 
 const { confirm } = Modal;
 
@@ -22,6 +25,10 @@ const { confirm } = Modal;
 export class ClusterList extends SearchAndFilterContainer {
   public state = {
     searchKey: '',
+    haVisible: false,
+    switchVisible: false,
+    logVisible: false,
+    currentCluster: {} as IMetaData,
   };
 
   private xFormModal: IXFormWrapper;
@@ -36,7 +43,26 @@ export class ClusterList extends SearchAndFilterContainer {
     );
   }
 
+  public updateFormModal(value: boolean, metaList: ILabelValue[]) {
+    const formMap = wrapper.xFormWrapper.formMap;
+    formMap[1].attrs.prompttype = !value ? '' : metaList.length ? '已设置为高可用集群，请选择所关联的主集群' : '当前暂无可用集群进行关联高可用关系，请先添加集群';
+    formMap[1].attrs.prompticon = 'true';
+    formMap[2].invisible = !value;
+    formMap[2].attrs.disabled = !metaList.length;
+    formMap[6].rules[0].required = value;
+
+    // tslint:disable-next-line:no-unused-expression
+    wrapper.ref && wrapper.ref.updateFormMap$(formMap, wrapper.xFormWrapper.formData);
+
+  }
+
   public createOrRegisterCluster(item: IMetaData) {
+    const self = this;
+    const metaList = Array.from(admin.metaList).filter(item => item.haRelation === null).map(item => ({
+      label: item.clusterName,
+      value: item.clusterId,
+    }));
+
     this.xFormModal = {
       formMap: [
         {
@@ -51,6 +77,38 @@ export class ClusterList extends SearchAndFilterContainer {
             disabled: item ? true : false,
           },
         },
+        {
+          key: 'ha',
+          label: '高可用',
+          type: FormItemType._switch,
+          invisible: item ? true : false,
+          rules: [{
+            required: false,
+          }],
+          attrs: {
+            className: 'switch-style',
+            prompttype: '',
+            prompticon: '',
+            prompticomclass: '',
+            promptclass: 'inline',
+            onChange(value: boolean) {
+              self.updateFormModal(value, metaList);
+            },
+          },
+        },
+        {
+          key: 'activeClusterId',
+          label: '主集群',
+          type: FormItemType.select,
+          options: metaList,
+          invisible: true,
+          rules: [{
+            required: false,
+          }],
+          attrs: {
+            placeholder: '请选择主集群',
+          },
+        },
         {
           key: 'zookeeper',
           label: 'zookeeper地址',
@@ -162,17 +220,18 @@ export class ClusterList extends SearchAndFilterContainer {
       visible: true,
       width: 590,
       title: item ? '编辑' : '接入集群',
+      isWaitting: true,
       onSubmit: (value: IRegister) => {
         value.idc = region.currentRegion;
         if (item) {
           value.clusterId = item.clusterId;
-          registerCluster(value).then(data => {
+          return registerCluster(value).then(data => {
-            admin.getMetaData(true);
+            admin.getHaMetaData();
             notification.success({ message: '编辑集群成功' });
           });
         } else {
-          createCluster(value).then(data => {
+          return createCluster(value).then(data => {
-            admin.getMetaData(true);
+            admin.getHaMetaData();
             notification.success({ message: '接入集群成功' });
           });
         }
@@ -186,7 +245,7 @@ export class ClusterList extends SearchAndFilterContainer {
     const info = item.status === 1 ? '暂停监控' : '开始监控';
     const status = item.status === 1 ? 0 : 1;
     pauseMonitoring(item.clusterId, status).then(data => {
-      admin.getMetaData(true);
+      admin.getHaMetaData();
       notification.success({ message: `${info}成功` });
     });
   }
@@ -216,12 +275,34 @@ export class ClusterList extends SearchAndFilterContainer {
           }
           admin.deleteCluster(record.clusterId).then(data => {
             notification.success({ message: '删除成功' });
+            admin.getHaMetaData();
           });
         },
       });
     });
   }
 
+  public showDelStandModal = (record: IMetaData) => {
+    confirm({
+      // tslint:disable-next-line:jsx-wrap-multiline
+      title: '删除集群',
+      // icon: 'none',
+      content: <>{record.activeTopicCount ? `当前集群含有主topic，无法删除！` : record.haStatus !== 0 ? `当前集群正在进行主备切换，无法删除！` : `确认删除集群${record.clusterName}吗?`}</>,
+      width: 500,
+      okText: '确认',
+      cancelText: '取消',
+      onOk() {
+        if (record.activeTopicCount || record.haStatus !== 0) {
+          return;
+        }
+        admin.deleteCluster(record.clusterId).then(data => {
+          notification.success({ message: '删除成功' });
+          admin.getHaMetaData();
+        });
+      },
+    });
+  }
+
   public deleteMonitorModal = (source: any) => {
     const cellStyle = {
       overflow: 'hidden',
@@ -275,11 +356,105 @@ export class ClusterList extends SearchAndFilterContainer {
     return data;
   }
 
+  public expandedRowRender = (record: IMetaData) => {
+    const dataSource: any = record.haClusterVO ? [record.haClusterVO] : [];
+    const cols = getAdminClusterColumns(false);
+    const role = users.currentUser.role;
+
+    if (!record.haClusterVO) return null;
+
+    const haRecord = record.haClusterVO;
+
+    const btnsMenu = (
+      <>
+        <ul className="dropdown-menu">
+          <li>
+            <a onClick={this.createOrRegisterCluster.bind(this, haRecord)} className="action-button">
+              编辑
+            </a>
+          </li>
+          <li>
+            <Popconfirm
+              title={`确定${haRecord.status === 1 ? '暂停' : '开始'}${haRecord.clusterName}监控？`}
+              onConfirm={() => this.pauseMonitor(haRecord)}
+              cancelText="取消"
+              okText="确认"
+            >
+              <Tooltip placement="left" title="暂停监控将无法正常监控指标信息，建议开启监控">
+                <a
+                  className="action-button"
+                >
+                  {haRecord.status === 1 ? '暂停监控' : '开始监控'}
+                </a>
+              </Tooltip>
+            </Popconfirm>
+          </li>
+          <li>
+            <a onClick={this.showDelStandModal.bind(this, haRecord)}>
+              删除
+            </a>
+          </li>
+        </ul>
+      </>);
+
+    const noAuthMenu = (
+      <ul className="dropdown-menu">
+        <Tooltip placement="left" title="该功能只对运维人员开放">
+          <li><a style={{ color: '#a0a0a0' }} className="action-button">编辑</a></li>
+          <li><a className="action-button" style={{ color: '#a0a0a0' }}>{record.status === 1 ? '暂停监控' : '开始监控'}</a></li>
+          <li><a style={{ color: '#a0a0a0' }}>删除</a></li>
+        </Tooltip>
+      </ul>
+    );
+
+    const col = {
+      title: '操作',
+      width: 270,
+      render: (value: string, item: IMetaData) => (
+        <>
+          <a
+            onClick={this.openModal.bind(this, 'haVisible', record)}
+            className="action-button"
+          >
+            Topic高可用关联
+          </a>
+          {item.haStatus !== 0 ? null : <a onClick={this.openModal.bind(this, 'switchVisible', record)} className="action-button">
+            Topic主备切换
+          </a>}
+          {item.haASSwitchJobId ? <a className="action-button" onClick={this.openModal.bind(this, 'logVisible', record)}>
+            查看日志
+          </a> : null}
+          <Dropdown
+            overlay={role === 2 ? btnsMenu : noAuthMenu}
+            trigger={['click', 'hover']}
+            placement="bottomLeft"
+          >
+            <span className="didi-theme ml-10">
+              ···
+            </span>
+          </Dropdown>
+        </>
+      ),
+    };
+    cols.push(col as any);
+    return (
+      <Table
+        className="expanded-table"
+        rowKey="clusterId"
+        style={{ width: '500px' }}
+        columns={cols}
+        dataSource={dataSource}
+        pagination={false}
+      />
+    );
+  }
+
   public getColumns = () => {
     const cols = getAdminClusterColumns();
     const role = users.currentUser.role;
     const col = {
       title: '操作',
+      width: 270,
       render: (value: string, item: IMetaData) => (
         <>
           {
@@ -319,6 +494,20 @@ export class ClusterList extends SearchAndFilterContainer {
     return cols;
   }
 
+  public openModal(type: string, record: IMetaData) {
+    this.setState({
+      currentCluster: record,
+    }, () => {
+      this.handleVisible(type, true);
+    });
+  }
+
+  public handleVisible(type: string, visible: boolean) {
+    this.setState({
+      [type]: visible,
+    });
+  }
+
   public renderClusterList() {
     const role = users.currentUser.role;
     return (
@@ -333,8 +522,8 @@ export class ClusterList extends SearchAndFilterContainer {
                   role && role === 2 ?
                     <Button type="primary" onClick={this.createOrRegisterCluster.bind(this, null)}>接入集群</Button>
                     :
-                    <Tooltip placement="left" title="该功能只对运维人员开放" trigger='hover'>
+                    <Tooltip placement="left" title="该功能只对运维人员开放" trigger="hover">
-                      <Button disabled type="primary">接入集群</Button>
+                      <Button disabled={true} type="primary">接入集群</Button>
                     </Tooltip>
                 }
               </li>
@@ -343,26 +532,63 @@ export class ClusterList extends SearchAndFilterContainer {
           <div className="table-wrapper">
             <Table
               rowKey="key"
+              expandIcon={({ expanded, onExpand, record }) => (
+                record.haClusterVO ?
+                  <Icon style={{ fontSize: 10 }} type={expanded ? 'down' : 'right'} onClick={e => onExpand(record, e)} />
+                  : null
+              )}
               loading={admin.loading}
-              dataSource={this.getData(admin.metaList)}
+              expandedRowRender={this.expandedRowRender}
+              dataSource={this.getData(admin.haMetaList)}
               columns={this.getColumns()}
               pagination={customPagination}
             />
           </div>
         </div>
+        {this.state.haVisible && <TopicHaRelationWrapper
+          handleVisible={(val: boolean) => this.handleVisible('haVisible', val)}
+          visible={this.state.haVisible}
+          currentCluster={this.state.currentCluster}
+          reload={() => admin.getHaMetaData()}
+          formData={{}}
+        />}
+        {this.state.switchVisible &&
+          <TopicSwitchWrapper
+            reload={(jobId: number) => {
+              admin.getHaMetaData().then((res) => {
+                const currentRecord = res.find(item => item.clusterId === this.state.currentCluster.clusterId);
+                currentRecord.haClusterVO.haASSwitchJobId = jobId;
+                this.openModal('logVisible', currentRecord);
+              });
+            }}
+            handleVisible={(val: boolean) => this.handleVisible('switchVisible', val)}
+            visible={this.state.switchVisible}
+            currentCluster={this.state.currentCluster}
+            formData={{}}
+          />
+        }
+        {this.state.logVisible &&
+          <TopicSwitchLog
+            reload={() => admin.getHaMetaData()}
+            handleVisible={(val: boolean) => this.handleVisible('logVisible', val)}
+            visible={this.state.logVisible}
+            currentCluster={this.state.currentCluster}
+          />
+        }
       </>
     );
   }
 
   public componentDidMount() {
     admin.getMetaData(true);
+    admin.getHaMetaData();
     cluster.getClusterModes();
     admin.getDataCenter();
   }
 
   public render() {
     return (
-      admin.metaList ? <> {this.renderClusterList()} </> : null
+      admin.haMetaList ? <> {this.renderClusterList()} </> : null
     );
   }
 }

kafka-manager-console/src/container/admin/config.tsx

@@ -3,12 +3,13 @@ import { IUser, IUploadFile, IConfigure, IConfigGateway, IMetaData } from 'types
 import { users } from 'store/users';
 import { version } from 'store/version';
 import { showApplyModal, showApplyModalModifyPassword, showModifyModal, showConfigureModal, showConfigGatewayModal } from 'container/modal/admin';
-import { Popconfirm, Tooltip } from 'component/antd';
+import { Icon, Popconfirm, Tooltip } from 'component/antd';
 import { admin } from 'store/admin';
 import { cellStyle } from 'constants/table';
 import { timeFormat } from 'constants/strategy';
 import { urlPrefix } from 'constants/left-menu';
 import moment = require('moment');
+import { Tag } from 'antd';
 
 export const getUserColumns = () => {
   const columns = [
@@ -28,7 +29,7 @@ export const getUserColumns = () => {
           <span className="table-operation">
             <a onClick={() => showApplyModal(record)}>编辑</a>
             <a onClick={() => showApplyModalModifyPassword(record)}>修改密码</a>
-            {record.username == users.currentUser.username ? "" :
+            {record.username === users.currentUser.username ? '' :
               <Popconfirm
                 title="确定删除？"
                 onConfirm={() => users.deleteUser(record.username)}
@@ -271,33 +272,82 @@ export const getConfigColumns = () => {
 const renderClusterHref = (value: number | string, item: IMetaData, key: number) => {
   return ( // 0 暂停监控--不可点击  1 监控中---可正常点击
     <>
-      {item.status === 1 ? <a href={`${urlPrefix}/admin/cluster-detail?clusterId=${item.clusterId}#${key}`}>{value}</a>
+      {item.status === 1 ? <a href={`${urlPrefix}/admin/cluster-detail?clusterId=${item.clusterId}#${key}`}>{value}</a> :
-        : <a style={{ cursor: 'not-allowed', color: '#999' }}>{value}</a>}
+        <a style={{ cursor: 'not-allowed', color: '#999' }}>{value}</a>}
     </>
   );
 };
 
-export const getAdminClusterColumns = () => {
+const renderTopicNum = (value: number | string, item: IMetaData, key: number, active?: boolean) => {
+  const show = item.haClusterVO || (!item.haClusterVO && !active);
+
+  if (!show) {
+    return ( // 0 暂停监控--不可点击  1 监控中---可正常点击
+      <>
+        {item.status === 1 ? <a href={`${urlPrefix}/admin/cluster-detail?clusterId=${item.clusterId}#${key}`}>
+          {value}
+        </a> :
+          <a style={{ cursor: 'not-allowed', color: '#999' }}>
+            {value}
+          </a>}
+      </>
+    );
+  }
+  return ( // 0 暂停监控--不可点击  1 监控中---可正常点击
+    <>
+      {item.status === 1 ? <a href={`${urlPrefix}/admin/cluster-detail?clusterId=${item.clusterId}#${key}`}>
+        {value}
+        <>（主{item.activeTopicCount ?? '-'}/备{item.standbyTopicCount ?? '-'}）</>
+      </a> :
+        <a style={{ cursor: 'not-allowed', color: '#999' }}>
+          {value}
+          <>（主{item.activeTopicCount ?? '-'}/备{item.standbyTopicCount ?? '-'}）</>
+        </a>}
+    </>
+  );
+};
+
+const renderClusterName = (value: number | string, item: IMetaData, key: number, active: boolean) => {
+  const show = item.haClusterVO || (!item.haClusterVO && !active);
+
+  return ( // 0 暂停监控--不可点击  1 监控中---可正常点击
+    <>
+      {item.status === 1 ?
+        <a href={`${urlPrefix}/admin/cluster-detail?clusterId=${item.clusterId}`}>{value}</a> :
+        <a style={{ cursor: 'not-allowed', color: '#999' }}>{value}</a>}
+      {active ? <>
+        {item.haClusterVO ? <Tooltip title="高可用集群"><Tag className="cluster-tag">HA</Tag></Tooltip> : null}
+        {item.haClusterVO && item.haStatus !== 0 ? <Tooltip title="Topic主备切换中"><Icon type="swap" style={{ color: '#27D687' }} /></Tooltip>
+          : null}
+      </> : null}
+    </>
+  );
+};
+export const getAdminClusterColumns = (active = true) => {
   return [
     {
       title: '物理集群ID',
       dataIndex: 'clusterId',
       key: 'clusterId',
-      sorter: (a: IMetaData, b: IMetaData) => b.clusterId - a.clusterId,
+      sorter: (a: IMetaData, b: IMetaData) => a.clusterId - b.clusterId,
+      width: active ? 115 : 111,
+      render: (text: number) => active ? text : `（${text ?? 0}）`,
     },
     {
       title: '物理集群名称',
       dataIndex: 'clusterName',
       key: 'clusterName',
       sorter: (a: IMetaData, b: IMetaData) => a.clusterName.charCodeAt(0) - b.clusterName.charCodeAt(0),
-      render: (text: string, item: IMetaData) => renderClusterHref(text, item, 1),
+      render: (text: string, item: IMetaData) => renderClusterName(text, item, 1, active),
+      width: 235,
     },
     {
       title: 'Topic数',
       dataIndex: 'topicNum',
       key: 'topicNum',
       sorter: (a: any, b: IMetaData) => b.topicNum - a.topicNum,
-      render: (text: number, item: IMetaData) => renderClusterHref(text, item, 2),
+      render: (text: number, item: IMetaData) => renderTopicNum(text, item, 2, active),
+      width: 140,
     },
     {
       title: 'Broker数',
@@ -305,6 +355,7 @@ export const getAdminClusterColumns = () => {
       key: 'brokerNum',
       sorter: (a: IMetaData, b: IMetaData) => b.brokerNum - a.brokerNum,
       render: (text: number, item: IMetaData) => renderClusterHref(text, item, 3),
+      width: 140,
     },
     {
       title: 'Consumer数',
@@ -312,6 +363,8 @@ export const getAdminClusterColumns = () => {
       key: 'consumerGroupNum',
       sorter: (a: IMetaData, b: IMetaData) => b.consumerGroupNum - a.consumerGroupNum,
       render: (text: number, item: IMetaData) => renderClusterHref(text, item, 4),
+      width: 150,
+
     },
     {
       title: 'Region数',
@@ -319,6 +372,8 @@ export const getAdminClusterColumns = () => {
       key: 'regionNum',
       sorter: (a: IMetaData, b: IMetaData) => b.regionNum - a.regionNum,
       render: (text: number, item: IMetaData) => renderClusterHref(text, item, 5),
+      width: 140,
+
     },
     {
       title: 'Controllerld',
@@ -326,12 +381,15 @@ export const getAdminClusterColumns = () => {
       key: 'controllerId',
       sorter: (a: IMetaData, b: IMetaData) => b.controllerId - a.controllerId,
       render: (text: number, item: IMetaData) => renderClusterHref(text, item, 7),
+      width: 150,
+
     },
     {
       title: '监控中',
       dataIndex: 'status',
       key: 'status',
       sorter: (a: IMetaData, b: IMetaData) => b.key - a.key,
+      width: 140,
       render: (value: number) => value === 1 ?
         <span className="success">是</span > : <span className="fail">否</span>,
     },

kafka-manager-console/src/container/cluster/my-cluster.tsx

@@ -44,7 +44,7 @@ export class MyCluster extends SearchAndFilterContainer {
           label: '所属应用',
           rules: [{ required: true, message: '请选择所属应用' }],
           type: 'select',
-          options: app.data.map((item) => {
+          options: app.clusterAppData.map((item) => {
             return {
               label: item.name,
               value: item.appId,
@@ -135,8 +135,8 @@ export class MyCluster extends SearchAndFilterContainer {
     if (!cluster.clusterModes.length) {
       cluster.getClusterModes();
     }
-    if (!app.data.length) {
+    if (!app.clusterAppData.length) {
-      app.getAppList();
+      app.getAppListByClusterId(-1);
     }
   }
 

kafka-manager-console/src/container/header/index.tsx

@@ -145,7 +145,7 @@ export const Header = observer((props: IHeader) => {
       <div className="left-content">
         <img className="kafka-header-icon" src={logoUrl} alt="" />
         <span className="kafka-header-text">LogiKM</span>
-        <a className='kafka-header-version' href="https://github.com/didi/Logi-KafkaManager/releases" target='_blank'>v2.6.1</a>
+        <a className='kafka-header-version' href="https://github.com/didi/Logi-KafkaManager/releases" target='_blank'>v2.8.0</a>
         {/* 添加版本超链接 */}
       </div>
       <div className="mid-content">

kafka-manager-console/src/container/modal/admin/SwitchTaskLog.tsx

@@ -0,0 +1,300 @@
+import * as React from 'react';
+import { Modal, Progress, Tooltip } from 'antd';
+import { IMetaData } from 'types/base-type';
+import { Alert, Badge, Button, Input, message, notification, Table } from 'component/antd';
+import { getJobDetail, getJobState, getJobLog, switchAsJobs } from 'lib/api';
+import moment from 'moment';
+import { timeFormat } from 'constants/strategy';
+
+interface IProps {
+  reload: any;
+  visible?: boolean;
+  handleVisible?: any;
+  currentCluster?: IMetaData;
+}
+
+interface IJobState {
+  failedNu: number;
+  jobNu: number;
+  runningNu: number;
+  successNu: number;
+  waitingNu: number;
+  runningInTimeoutNu: number;
+  progress: number;
+}
+
+interface IJobDetail {
+  standbyClusterPhyId: number;
+  status: number;
+  sumLag: number;
+  timeoutUnitSecConfig: number;
+  topicName: string;
+  activeClusterPhyName: string;
+  standbyClusterPhyName: string;
+}
+
+interface ILog {
+  bizKeyword: string;
+  bizType: number;
+  content: string;
+  id: number;
+  printTime: number;
+}
+interface IJobLog {
+  logList: ILog[];
+  endLogId: number;
+}
+const STATUS_MAP = {
+  '-1': '未知',
+  '30': '运行中',
+  '32': '超时运行中',
+  '101': '成功',
+  '102': '失败',
+} as any;
+const STATUS_COLORS = {
+  '-1': '#575757',
+  '30': '#575757',
+  '32': '#F5202E',
+  '101': '#2FC25B',
+  '102': '#F5202E',
+} as any;
+const STATUS_COLOR_MAP = {
+  '-1': 'black',
+  '30': 'black',
+  '32': 'red',
+  '101': 'green',
+  '102': 'red',
+} as any;
+
+const getFilters = () => {
+  const keys = Object.keys(STATUS_MAP);
+  const filters = [];
+  for (const key of keys) {
+    filters.push({
+      text: STATUS_MAP[key],
+      value: key,
+    });
+  }
+  return filters;
+};
+
+const columns = [
+  {
+    dataIndex: 'key',
+    title: '编号',
+    width: 60,
+  },
+  {
+    dataIndex: 'topicName',
+    title: 'Topic名称',
+    width: 120,
+    ellipsis: true,
+  },
+  {
+    dataIndex: 'sumLag',
+    title: '延迟',
+    width: 100,
+    render: (value: number) => value ?? '-',
+  },
+  {
+    dataIndex: 'status',
+    title: '状态',
+    width: 100,
+    filters: getFilters(),
+    onFilter: (value: string, record: IJobDetail) => record.status === Number(value),
+    render: (t: number) => (
+      <span className={'col-status ' + STATUS_COLOR_MAP[t]}>
+        <Badge color={STATUS_COLORS[t]} text={STATUS_MAP[t]} />
+      </span>
+    ),
+  },
+];
+
+export class TopicSwitchLog extends React.Component<IProps> {
+  public state = {
+    radioCheck: 'all',
+    jobDetail: [] as IJobDetail[],
+    jobState: {} as IJobState,
+    jobLog: {} as IJobLog,
+    textStr: '',
+    primaryTargetKeys: [] as string[],
+    loading: false,
+  };
+  public timer = null as number;
+  public jobId = this.props.currentCluster?.haClusterVO?.haASSwitchJobId as number;
+
+  public handleOk = () => {
+    this.props.handleVisible(false);
+    this.props.reload();
+  }
+
+  public handleCancel = () => {
+    this.props.handleVisible(false);
+    this.props.reload();
+  }
+
+  public iTimer = () => {
+    this.timer = window.setInterval(() => {
+      const { jobLog } = this.state;
+      this.getContentJobLog(jobLog.endLogId);
+      this.getContentJobState();
+      this.getContentJobDetail();
+    }, 10 * 1 * 1000);
+  }
+
+  public getTextAreaStr = (logList: ILog[]) => {
+    const strs = [];
+
+    for (const item of logList) {
+      strs.push(`${moment(item.printTime).format(timeFormat)} ${item.content}`);
+    }
+
+    return strs.join(`\n`);
+  }
+
+  public getContentJobLog = (startId?: number) => {
+    getJobLog(this.jobId, startId).then((res: IJobLog) => {
+      const { jobLog } = this.state;
+      const logList = (jobLog.logList || []);
+      logList.push(...(res?.logList || []));
+
+      const newJobLog = {
+        endLogId: res?.endLogId,
+        logList,
+      };
+
+      this.setState({
+        textStr: this.getTextAreaStr(logList),
+        jobLog: newJobLog,
+      });
+    });
+  }
+
+  public getContentJobState = () => {
+    getJobState(this.jobId).then((res: IJobState) => {
+      // 成功后清除调用
+      if (res?.jobNu === res.successNu) {
+        clearInterval(this.timer);
+      }
+      this.setState({
+        jobState: res || {},
+      });
+    });
+  }
+  public getContentJobDetail = () => {
+    getJobDetail(this.jobId).then((res: IJobDetail[]) => {
+      this.setState({
+        jobDetail: (res || []).map((row, index) => ({
+          ...row,
+          key: index,
+        })),
+      });
+    });
+  }
+
+  public switchJobs = () => {
+    const { jobState } = this.state;
+    Modal.confirm({
+      title: '强制切换',
+      content: `当前有${jobState.runningNu}个Topic切换中，${jobState.runningInTimeoutNu}个Topic切换超时，强制切换会使这些Topic有数据丢失的风险，确定强制切换吗？`,
+      onOk: () => {
+        this.setState({
+          loading: true,
+        });
+        switchAsJobs(this.jobId, {
+          action: 'force',
+          allJumpWaitInSync: true,
+          jumpWaitInSyncActiveTopicList: [],
+        }).then(res => {
+          message.success('强制切换成功');
+        }).finally(() => {
+          this.setState({
+            loading: false,
+          });
+        });
+      },
+    });
+  }
+
+  public componentWillUnmount() {
+    clearInterval(this.timer);
+  }
+
+  public componentDidMount() {
+    this.getContentJobDetail();
+    this.getContentJobState();
+    this.getContentJobLog();
+    setTimeout(this.iTimer, 0);
+  }
+
+  public render() {
+    const { visible, currentCluster } = this.props;
+    const { jobState, jobDetail, textStr, loading } = this.state;
+    const runtimeJob = jobDetail.filter(item => item.status === 32);
+    const percent = jobState?.progress;
+    return (
+      <Modal
+        title="主备切换日志"
+        wrapClassName="no-padding"
+        visible={visible}
+        onOk={this.handleOk}
+        onCancel={this.handleCancel}
+        maskClosable={false}
+        width={590}
+        okText="确认"
+        cancelText="取消"
+      >
+        {runtimeJob.length ?
+          <Alert
+            message={`${runtimeJob[0].topicName}消息同步已经超时${runtimeJob[0].timeoutUnitSecConfig}s，建议立即强制切换`}
+            type="warning"
+            showIcon={true}
+          />
+          : null}
+        <div className="switch-warning">
+          <Tooltip title="不用等待所有topic数据完成同步，立即进行切换，但是有数据丢失的风险。">
+            <Button loading={loading} type="primary" disabled={!runtimeJob.length} onClick={this.switchJobs} className={loading ? 'btn loading' : runtimeJob.length ? 'btn' : 'btn disabled'}>强制切换</Button>
+          </Tooltip>
+        </div>
+
+        <div className="log-panel">
+          <div className="title">
+            <div className="divider" />
+            <span>Topic切换详情:</span>
+          </div>
+          <div className="log-process">
+            <div className="name">
+              <span>源集群 {jobDetail?.[0]?.standbyClusterPhyName || ''}</span>
+              <span>目标集群 {jobDetail?.[0]?.activeClusterPhyName || ''}</span>
+            </div>
+            <Progress percent={percent} strokeColor="#F38031" status={percent === 100 ? 'normal' : 'active'} />
+          </div>
+          <div className="log-info">
+            Topic总数 <span className="text-num">{jobState.jobNu ?? '-'}</span> 个，
+            切换成功 <span className="text-num">{jobState.successNu ?? '-'}</span> 个，
+            切换超时  <span className="warning-num">{jobState.failedNu ?? '-'}</span> 个，
+            待切换  <span className="warning-num">{jobState.waitingNu ?? '-'}</span> 个。
+          </div>
+          <Table
+            className="log-table"
+            columns={columns}
+            dataSource={jobDetail}
+            size="small"
+            rowKey="topicName"
+            pagination={false}
+            bordered={false}
+            scroll={{ y: 138 }}
+          />
+          <div className="title">
+            <div className="divider" />
+            <span>集群切换日志:</span>
+          </div>
+          <div>
+            <Input.TextArea value={textStr} rows={7} />
+          </div>
+        </div>
+
+      </Modal >
+    );
+  }
+}

kafka-manager-console/src/container/modal/admin/TopicHaRelation.tsx

@@ -0,0 +1,676 @@
+import * as React from 'react';
+import { admin } from 'store/admin';
+import { Modal, Form, Radio } from 'antd';
+import { IBrokersMetadata, IBrokersRegions, IMetaData } from 'types/base-type';
+import { Alert, message, notification, Table, Tooltip, Spin } from 'component/antd';
+import { getClusterHaTopicsStatus, getAppRelatedTopics, setHaTopics, unbindHaTopics } from 'lib/api';
+import { cellStyle } from 'constants/table';
+import { renderAttributes, TransferTable, IKafkaUser } from './TopicHaSwitch'
+import './index.less'
+
+const layout = {
+  labelCol: { span: 3 },
+  wrapperCol: { span: 21 },
+};
+
+interface IXFormProps {
+  form: any;
+  reload: any;
+  formData?: any;
+  visible?: boolean;
+  handleVisible?: any;
+  currentCluster?: IMetaData;
+}
+
+interface IHaTopic {
+  clusterId: number;
+  clusterName: string;
+  haRelation: number;
+  isHaRelation: boolean;
+  topicName: string;
+  key: string;
+  disabled?: boolean;
+}
+
+const resColumns = [
+  {
+    title: 'TopicName',
+    dataIndex: 'topicName',
+    key: 'topicName',
+    width: 120,
+  },
+  {
+    title: '状态',
+    dataIndex: 'code',
+    key: 'code',
+    width: 60,
+    render: (t: number) => {
+      return (
+        <span className={t === 0 ? 'success' : 'fail'}>
+          {t === 0 ? '成功' : '失败'}
+        </span>
+      );
+    },
+  },
+  {
+    title: '原因',
+    dataIndex: 'message',
+    key: 'message',
+    width: 125,
+    onCell: () => ({
+      style: {
+        maxWidth: 120,
+        ...cellStyle,
+      },
+    }),
+    render: (text: string) => {
+      return (
+        <Tooltip placement="bottomLeft" title={text} >
+          {text}
+        </Tooltip>);
+    },
+  },
+];
+
+const columns = [
+  {
+    dataIndex: 'topicName',
+    title: '名称',
+    width: 260,
+    ellipsis: true,
+  },
+];
+
+const kafkaUserColumn = [
+  {
+    dataIndex: 'kafkaUser',
+    title: 'kafkaUser',
+    width: 100,
+    ellipsis: true,
+  },
+  {
+    dataIndex: 'manualSelectedTopics',
+    title: '已选中Topic',
+    width: 120,
+    render: (text: string[]) => {
+      return text?.length ? renderAttributes({ data: text, limit: 3 }) : '-';
+    },
+  },
+  {
+    dataIndex: 'autoSelectedTopics',
+    title: '选中关联Topic',
+    width: 120,
+    render: (text: string[]) => {
+      return text?.length ? renderAttributes({ data: text, limit: 3 }) : '-';
+    },
+  },
+];
+
+class TopicHaRelation extends React.Component<IXFormProps> {
+  public state = {
+    radioCheck: 'spec',
+    topics: [] as IHaTopic[],
+    kafkaUsers: [] as IKafkaUser[],
+    targetKeys: [] as string[],
+    selectedKeys: [] as string[],
+    confirmLoading: false,
+    firstMove: true,
+    primaryActiveKeys: [] as string[],
+    primaryStandbyKeys: [] as string[],
+    manualSelectedKeys: [] as string[],
+    spinLoading: false,
+  };
+
+  public selectSingle = null as boolean;
+  public manualSelectedNames = [] as string[];
+
+  public setSelectSingle = (val: boolean) => {
+    this.selectSingle = val;
+  }
+  public setManualSelectedNames = (keys: string[]) => {
+    // this.manualSelectedNames = this.getTopicsByKeys(keys);
+    this.manualSelectedNames = keys;
+  }
+
+  public filterManualSelectedKeys = (key: string, selected: boolean) => {
+    const newManualSelectedKeys = [...this.state.manualSelectedKeys];
+    const index = newManualSelectedKeys.findIndex(item => item === key);
+    if (selected) {
+      if (index === -1) newManualSelectedKeys.push(key);
+    } else {
+      if (index !== -1) newManualSelectedKeys.splice(index, 1);
+    }
+    this.setManualSelectedNames(newManualSelectedKeys);
+    this.setState({
+      manualSelectedKeys: newManualSelectedKeys,
+    });
+  }
+
+  public getManualSelected = (single: boolean, key?: any, selected?: boolean) => {
+    this.setSelectSingle(single);
+    if (single) {
+      this.filterManualSelectedKeys(key, selected);
+    } else {
+      this.setManualSelectedNames(key);
+      this.setState({
+        manualSelectedKeys: key,
+      });
+    }
+  }
+
+  public handleOk = () => {
+    this.props.form.validateFields((err: any, values: any) => {
+      const { primaryStandbyKeys, targetKeys} = this.state;
+      const unbindKeys = [];
+      const bindKeys = [];
+
+      if (values.rule === 'all') {
+        setHaTopics({
+          all: true,
+          activeClusterId: this.props.currentCluster.clusterId,
+          standbyClusterId: this.props.currentCluster.haClusterVO?.clusterId,
+          topicNames: [],
+        }).then(res => {
+          handleMsg(res, '关联成功');
+          this.setState({
+            confirmLoading: false,
+          });
+          this.handleCancel();
+        });
+        return;
+      }
+
+      for (const item of primaryStandbyKeys) {
+        if (!targetKeys.includes(item)) {
+          unbindKeys.push(item);
+        }
+      }
+      for (const item of targetKeys) {
+        if (!primaryStandbyKeys.includes(item)) {
+          bindKeys.push(item);
+        }
+      }
+
+      if (!unbindKeys.length && !bindKeys.length) {
+        return message.info('请选择您要操作的Topic');
+      }
+
+      const handleMsg = (res: any[], successTip: string) => {
+        const errorRes = res.filter(item => item.code !== 0);
+
+        if (errorRes.length) {
+          Modal.confirm({
+            title: '执行结果',
+            width: 520,
+            icon: null,
+            content: (
+              <Table
+                columns={resColumns}
+                rowKey="id"
+                dataSource={res}
+                scroll={{ y: 260 }}
+                pagination={false}
+              />
+            ),
+          });
+        } else {
+          notification.success({ message: successTip });
+        }
+
+        this.props.reload();
+      };
+
+      if (bindKeys.length) {
+        this.setState({
+          confirmLoading: true,
+        });
+        setHaTopics({
+          all: false,
+          activeClusterId: this.props.currentCluster.clusterId,
+          standbyClusterId: this.props.currentCluster.haClusterVO?.clusterId,
+          // topicNames: this.getTopicsByKeys(bindKeys),
+          topicNames: bindKeys,
+        }).then(res => {
+          this.setState({
+            confirmLoading: false,
+          });
+          this.handleCancel();
+          handleMsg(res, '关联成功');
+        });
+      }
+
+      if (unbindKeys.length) {
+        this.setState({
+          confirmLoading: true,
+        });
+        unbindHaTopics({
+          all: false,
+          activeClusterId: this.props.currentCluster.clusterId,
+          standbyClusterId: this.props.currentCluster.haClusterVO?.clusterId,
+          // topicNames: this.getTopicsByKeys(unbindKeys),
+          topicNames: unbindKeys,
+          retainStandbyResource: values.retainStandbyResource,
+        }).then(res => {
+          this.setState({
+            confirmLoading: false,
+          });
+          this.handleCancel();
+          handleMsg(res, '解绑成功');
+        });
+      }
+    });
+  }
+
+  public handleCancel = () => {
+    this.props.handleVisible(false);
+    this.props.form.resetFields();
+  }
+
+  public handleRadioChange = (e: any) => {
+    this.setState({
+      radioCheck: e.target.value,
+    });
+  }
+
+  public isPrimaryStatus = (targetKeys: string[]) => {
+    const { primaryStandbyKeys } = this.state;
+    let isReset = false;
+    // 判断当前移动是否还原为最初的状态
+    if (primaryStandbyKeys.length === targetKeys.length) {
+      const diff = targetKeys.find(item => primaryStandbyKeys.indexOf(item) < 0);
+      isReset = diff ? false : true;
+    }
+    return isReset;
+  }
+
+  public getNewSelectKeys = (removeKeys: string[], selectedKeys: string[]) => {
+    const { topics, kafkaUsers } = this.state;
+    // 根据移除的key找与该key关联的其他key，一起移除
+    let relatedTopics: string[] = [];
+    const relatedKeys: string[] = [];
+    const newSelectKeys = [];
+    for (const key of removeKeys) {
+      const topicName = topics.find(row => row.key === key)?.topicName;
+      for (const item of kafkaUsers) {
+        if (item.selectedTopicNameList.includes(topicName)) {
+          relatedTopics = relatedTopics.concat(item.selectedTopicNameList, item.notSelectTopicNameList);
+        }
+      }
+      for (const item of relatedTopics) {
+        const key = topics.find(row => row.topicName === item)?.key;
+        if (key) {
+          relatedKeys.push(key);
+        }
+      }
+      for (const key of selectedKeys) {
+        if (!relatedKeys.includes(key)) {
+          newSelectKeys.push(key);
+        }
+      }
+    }
+    return newSelectKeys;
+  }
+
+  public setTopicsStatus = (targetKeys: string[], disabled: boolean, isAll = false) => {
+    const { topics } = this.state;
+    const newTopics = Array.from(topics);
+    if (isAll) {
+      for (let i = 0; i < topics.length; i++) {
+        newTopics[i].disabled = disabled;
+      }
+    } else {
+      for (const key of targetKeys) {
+        const index = topics.findIndex(item => item.key === key);
+        if (index > -1) {
+          newTopics[index].disabled = disabled;
+        }
+      }
+    }
+    this.setState(({
+      topics: newTopics,
+    }));
+  }
+
+  public getTopicsByKeys = (keys: string[]) => {
+    // 依据key值找topicName
+    const topicNames: string[] = [];
+    for (const key of keys) {
+      const topicName = this.state.topics.find(item => item.key === key)?.topicName;
+      if (topicName) {
+        topicNames.push(topicName);
+      }
+    }
+    return topicNames;
+  }
+
+  public getNewKafkaUser = (targetKeys: string[]) => {
+    const { primaryStandbyKeys, kafkaUsers, topics } = this.state;
+    const removeKeys = [];
+    const addKeys = [];
+    for (const key of primaryStandbyKeys) {
+      if (targetKeys.indexOf(key) < 0) {
+        // 移除的
+        removeKeys.push(key);
+      }
+    }
+    for (const key of targetKeys) {
+      if (primaryStandbyKeys.indexOf(key) < 0) {
+        // 新增的
+        addKeys.push(key);
+      }
+    }
+    const keepKeys = [...removeKeys, ...addKeys];
+    const newKafkaUsers = kafkaUsers;
+
+    const moveTopics = this.getTopicsByKeys(keepKeys);
+
+    for (const topic of moveTopics) {
+      for (const item of newKafkaUsers) {
+        if (item.selectedTopicNameList.includes(topic)) {
+          item.show = true;
+        }
+      }
+    }
+
+    const showKafaUsers = newKafkaUsers.filter(item => item.show === true);
+
+    for (const item of showKafaUsers) {
+      let i = 0;
+      while (i < moveTopics.length) {
+        if (!item.selectedTopicNameList.includes(moveTopics[i])) {
+          i++;
+        } else {
+          break;
+        }
+      }
+
+      // 表示该kafkaUser不该展示
+      if (i === moveTopics.length) {
+        item.show = false;
+      }
+    }
+
+    return showKafaUsers;
+  }
+
+  public getAppRelatedTopicList = (selectedKeys: string[]) => {
+    const { topics, targetKeys, primaryStandbyKeys, kafkaUsers } = this.state;
+    const filterTopicNameList = this.getTopicsByKeys(selectedKeys);
+    const isReset = this.isPrimaryStatus(targetKeys);
+
+    if (!filterTopicNameList.length && isReset) {
+      // targetKeys
+      this.setState({
+        kafkaUsers: kafkaUsers.map(item => ({
+          ...item,
+          show: false,
+        })),
+      });
+      return;
+    } else {
+      // 保留选中项与移动的的项
+      this.setState({
+        kafkaUsers: this.getNewKafkaUser(targetKeys),
+      });
+    }
+
+    // 单向选择，所以取当前值的clusterId
+    const clusterInfo = topics.find(item => item.topicName === filterTopicNameList[0]);
+    const clusterPhyId = clusterInfo?.clusterId;
+    if (!clusterPhyId) return;
+    this.setState({spinLoading: true});
+    getAppRelatedTopics({
+      clusterPhyId,
+      filterTopicNameList,
+      ha: clusterInfo.isHaRelation,
+      useKafkaUserAndClientId: false,
+    }).then((res: IKafkaUser[]) => {
+      let notSelectTopicNames: string[] = [];
+      const notSelectTopicKeys: string[] = [];
+      for (const item of (res || [])) {
+        notSelectTopicNames = notSelectTopicNames.concat(item.notSelectTopicNameList || []);
+      }
+
+      for (const item of notSelectTopicNames) {
+        const key = topics.find(row => row.topicName === item)?.key;
+
+        if (key && notSelectTopicKeys.indexOf(key) < 0) {
+          notSelectTopicKeys.push(key);
+        }
+      }
+
+      const newSelectedKeys = selectedKeys.concat(notSelectTopicKeys);
+      const newKafkaUsers = (res || []).map(item => ({
+        ...item,
+        show: true,
+        manualSelectedTopics: item.selectedTopicNameList.filter(topic => this.manualSelectedNames.indexOf(topic) > -1),
+        autoSelectedTopics: [...item.selectedTopicNameList, ...item.notSelectTopicNameList].filter(topic => this.manualSelectedNames.indexOf(topic) === -1),
+      }));
+      const { kafkaUsers } = this.state;
+
+      for (const item of kafkaUsers) {
+        const resItem = res.find(row => row.kafkaUser === item.kafkaUser);
+        if (!resItem) {
+          newKafkaUsers.push(item);
+        }
+      }
+      this.setState({
+        kafkaUsers: newKafkaUsers,
+        selectedKeys: newSelectedKeys,
+      });
+
+      if (notSelectTopicKeys.length) {
+        this.getAppRelatedTopicList(newSelectedKeys);
+      }
+    }).finally(() => {
+      this.setState({spinLoading: false});
+    });
+  }
+
+  public getRelatedKeys = (currentKeys: string[]) => {
+    // 未被选中的项
+    const removeKeys = [];
+    // 对比上一次记录的选中的值找出本次取消的项
+    const { selectedKeys } = this.state;
+    for (const preKey of selectedKeys) {
+      if (!currentKeys.includes(preKey)) {
+        removeKeys.push(preKey);
+      }
+    }
+
+    return removeKeys?.length ? this.getNewSelectKeys(removeKeys, currentKeys) : currentKeys;
+  }
+
+  public handleTopicChange = (sourceSelectedKeys: string[], targetSelectedKeys: string[]) => {
+    if (this.selectSingle) {
+      this.setSelectSingle(false);
+    } else {
+      this.getManualSelected(false, [...sourceSelectedKeys, ...targetSelectedKeys])
+    }
+    const { topics, targetKeys } = this.state;
+    // 条件限制只允许选中一边，单向操作
+    const keys = [...sourceSelectedKeys, ...targetSelectedKeys];
+
+    // 判断当前选中项属于哪一类
+    if (keys.length) {
+      const isHaRelation = topics.find(item => item.key === keys[0])?.isHaRelation;
+      const needDisabledKeys = topics.filter(item => item.isHaRelation !== isHaRelation).map(row => row.key);
+      this.setTopicsStatus(needDisabledKeys, true);
+    }
+    const selectedKeys = this.state.selectedKeys.length ? this.getRelatedKeys(keys) : keys;
+
+    const isReset = this.isPrimaryStatus(targetKeys);
+    if (!selectedKeys.length && isReset) {
+      this.setTopicsStatus([], false, true);
+    }
+    this.setState({
+      selectedKeys,
+    });
+    this.getAppRelatedTopicList(selectedKeys);
+  }
+
+  public onDirectChange = (targetKeys: string[], direction: string, moveKeys: string[]) => {
+    const { primaryStandbyKeys, firstMove, primaryActiveKeys, kafkaUsers } = this.state;
+
+    const getKafkaUser = () => {
+      const newKafkaUsers = kafkaUsers;
+      const moveTopics = this.getTopicsByKeys(moveKeys);
+      for (const topic of moveTopics) {
+        for (const item of newKafkaUsers) {
+          if (item.selectedTopicNameList.includes(topic)) {
+            item.show = true;
+          }
+        }
+      }
+      return newKafkaUsers;
+    };
+    // 判断当前移动是否还原为最初的状态
+    const isReset = this.isPrimaryStatus(targetKeys);
+    if (firstMove) {
+      const primaryKeys = direction === 'right' ? primaryStandbyKeys : primaryActiveKeys;
+      this.setTopicsStatus(primaryKeys, true, false);
+      this.setState(({
+        firstMove: false,
+        kafkaUsers: getKafkaUser(),
+        targetKeys,
+      }));
+      return;
+    }
+    // 如果是还原为初始状态则还原禁用状态
+    if (isReset) {
+      this.setTopicsStatus([], false, true);
+      this.setState(({
+        firstMove: true,
+        targetKeys,
+        kafkaUsers: [],
+      }));
+      return;
+    }
+
+    this.setState(({
+      targetKeys,
+      kafkaUsers: this.getNewKafkaUser(targetKeys),
+    }));
+  }
+
+  public componentDidMount() {
+    Promise.all([
+      getClusterHaTopicsStatus(this.props.currentCluster.clusterId, true),
+      getClusterHaTopicsStatus(this.props.currentCluster.clusterId, false),
+    ]).then(([activeRes, standbyRes]: IHaTopic[][]) => {
+      activeRes = (activeRes || []).map(row => ({
+        ...row,
+        isHaRelation: row.haRelation === 1 || row.haRelation === 0,
+        key: row.topicName,
+      })).filter(item => !item.isHaRelation);
+      standbyRes = (standbyRes || []).map(row => ({
+        ...row,
+        isHaRelation: row.haRelation === 1 || row.haRelation === 0,
+        key: row.topicName,
+      })).filter(item => item.isHaRelation);
+      this.setState({
+        topics: [].concat([...activeRes, ...standbyRes]).sort((a, b) => a.topicName.localeCompare(b.topicName)),
+        primaryActiveKeys: activeRes.map(row => row.key),
+        primaryStandbyKeys: standbyRes.map(row => row.key),
+        targetKeys: standbyRes.map(row => row.key),
+      });
+    });
+  }
+
+  public render() {
+    const { formData = {} as any, visible, currentCluster } = this.props;
+    const { getFieldDecorator } = this.props.form;
+    let metadata = [] as IBrokersMetadata[];
+    metadata = admin.brokersMetadata ? admin.brokersMetadata : metadata;
+    let regions = [] as IBrokersRegions[];
+    regions = admin.brokersRegions ? admin.brokersRegions : regions;
+    const { kafkaUsers, confirmLoading, radioCheck, targetKeys, selectedKeys, topics, primaryStandbyKeys, spinLoading} = this.state;
+    const tableData = kafkaUsers.filter(row => row.show);
+
+    return (
+      <>
+        <Modal
+          title="Topic高可用关联"
+          wrapClassName="no-padding"
+          visible={visible}
+          onOk={this.handleOk}
+          onCancel={this.handleCancel}
+          maskClosable={false}
+          confirmLoading={confirmLoading}
+          width={800}
+          okText="确认"
+          cancelText="取消"
+        >
+          <Alert
+            message={`将【集群${currentCluster.clusterName}】和【集群${currentCluster.haClusterVO?.clusterName}】的Topic关联高可用关系，此操作会把同一个kafkaUser下的所有Topic都关联高可用关系`}
+            type="info"
+            showIcon={true}
+          />
+          <Spin spinning={spinLoading}>
+            <Form {...layout} name="basic" className="x-form">
+              {/* <Form.Item label="规则">
+                {getFieldDecorator('rule', {
+                  initialValue: 'spec',
+                  rules: [{
+                    required: true,
+                    message: '请选择规则',
+                  }],
+                })(<Radio.Group onChange={this.handleRadioChange} >
+                  <Radio value="all">应用于所有Topic</Radio>
+                  <Radio value="spec">应用于特定Topic</Radio>
+                </Radio.Group>)}
+              </Form.Item> */}
+              {radioCheck === 'spec' ? <Form.Item className="no-label" label=""  >
+                {getFieldDecorator('topicNames', {
+                  initialValue: targetKeys,
+                  rules: [{
+                    required: false,
+                    message: '请选择Topic',
+                  }],
+                })(
+                  <TransferTable
+                    selectedKeys={selectedKeys}
+                    topicChange={this.handleTopicChange}
+                    onDirectChange={this.onDirectChange}
+                    columns={columns}
+                    dataSource={topics}
+                    currentCluster={currentCluster}
+                    getManualSelected={this.getManualSelected}
+                    transferAttrs={{
+                      titles: ['未关联', '已关联'],
+                    }}
+                    tableAttrs={{
+                      className: 'no-table-header',
+                    }}
+                  />,
+                )}
+              </Form.Item> : null}
+              {radioCheck === 'spec' ? <Table
+                className="modal-table-content no-lr-padding"
+                columns={kafkaUserColumn}
+                dataSource={tableData}
+                size="small"
+                rowKey="kafkaUser"
+                pagination={false}
+                scroll={{ y: 300 }}
+              /> : null}
+              {targetKeys.length < primaryStandbyKeys.length ? <Form.Item label="数据清理策略" labelCol={{span: 4}} wrapperCol={{span: 20}}>
+                {getFieldDecorator('retainStandbyResource', {
+                  initialValue: false,
+                  rules: [{
+                    required: true,
+                    message: '请选择数据清理策略',
+                  }],
+                })(<Radio.Group>
+                  <Radio value={false}>删除备集群所有数据</Radio>
+                  <Radio value={true}>保留备集群所有数据</Radio>
+                </Radio.Group>)}
+              </Form.Item> : null}
+            </Form>
+          </Spin>
+        </Modal>
+      </>
+    );
+  }
+}
+export const TopicHaRelationWrapper = Form.create<IXFormProps>()(TopicHaRelation);

kafka-manager-console/src/container/modal/admin/TopicHaSwitch.tsx

@@ -0,0 +1,853 @@
+import * as React from 'react';
+import { admin } from 'store/admin';
+import { Modal, Form, Radio, Tag, Popover, Button, Tooltip, Spin } from 'antd';
+import { IBrokersMetadata, IBrokersRegions, IMetaData } from 'types/base-type';
+import { Alert, Icon, message, Table, Transfer } from 'component/antd';
+import { getClusterHaTopics, getAppRelatedTopics, createSwitchTask } from 'lib/api';
+import { TooltipPlacement } from 'antd/es/tooltip';
+import * as XLSX from 'xlsx';
+import moment from 'moment';
+import { cloneDeep } from "lodash";
+import { timeMinute } from 'constants/strategy';
+
+const layout = {
+  labelCol: { span: 3 },
+  wrapperCol: { span: 21 },
+};
+
+interface IXFormProps {
+  form: any;
+  reload: any;
+  formData?: any;
+  visible?: boolean;
+  handleVisible?: any;
+  currentCluster?: IMetaData;
+}
+
+interface IHaTopic {
+  clusterId: number;
+  topicName: string;
+  key: string;
+  activeClusterId: number;
+  consumeAclNum: number;
+  produceAclNum: number;
+  standbyClusterId: number;
+  status: number;
+  disabled?: boolean;
+}
+
+export interface IKafkaUser {
+  clusterPhyId: number;
+  kafkaUser: string;
+  notHaTopicNameList: string[];
+  notSelectTopicNameList: string[];
+  selectedTopicNameList: string[];
+  show: boolean;
+  manualSelectedTopics: string[];
+  autoSelectedTopics: string[];
+  clientId?: string;
+  haClientIdList?: string[]
+}
+
+const columns = [
+  {
+    dataIndex: 'topicName',
+    title: '名称',
+    width: 100,
+    ellipsis: true,
+  },
+  {
+    dataIndex: 'produceAclNum',
+    title: '生产者数量',
+    width: 80,
+  },
+  {
+    dataIndex: 'consumeAclNum',
+    title: '消费者数量',
+    width: 80,
+  },
+];
+
+const kafkaUserColumn = [
+  {
+    dataIndex: 'kafkaUser',
+    title: 'kafkaUser',
+    width: 100,
+    ellipsis: true,
+  },
+  {
+    dataIndex: 'clientId',
+    title: 'clientID',
+    width: 100,
+    ellipsis: true,
+  },
+  {
+    dataIndex: 'manualSelectedTopics',
+    title: '已选中Topic',
+    // width: 120,
+    render: (text: string[]) => {
+      return text?.length ? renderAttributes({ data: text, limit: 3 }) : '-';
+    },
+  },
+  {
+    dataIndex: 'autoSelectedTopics',
+    title: '选中关联Topic',
+    // width: 120,
+    render: (text: string[]) => {
+      return text?.length ? renderAttributes({ data: text, limit: 3 }) : '-';
+    },
+  },
+  {
+    dataIndex: 'notHaTopicNameList',
+    title: '未建立HA Topic',
+    // width: 120,
+    render: (text: string[]) => {
+      return text?.length ? renderAttributes({ data: text, limit: 3 }) : '-';
+    },
+  },
+];
+
+export const renderAttributes = (params: {
+  data: any;
+  type?: string;
+  limit?: number;
+  splitType?: string;
+  placement?: TooltipPlacement;
+}) => {
+  const { data, type = ',', limit = 2, splitType = '；', placement } = params;
+  let attrArray = data;
+  if (!Array.isArray(data) && data) {
+    attrArray = data.split(type);
+  }
+  const showItems = attrArray.slice(0, limit) || [];
+  const hideItems = attrArray.slice(limit, attrArray.length) || [];
+  const content = hideItems.map((item: string, index: number) => (
+    <Tag key={index} className="tag-gray">
+      {item}
+    </Tag>
+  ));
+  const showItemsContent = showItems.map((item: string, index: number) => (
+    <Tag key={index} className="tag-gray">
+      {item}
+    </Tag>
+  ));
+
+  return (
+    <div className="attribute-content">
+      {showItems.length > 0 ? showItemsContent : '-'}
+      {hideItems.length > 0 && (
+        <Popover placement={placement || 'bottomRight'} content={content} overlayClassName="attribute-tag">
+          共{attrArray.length}个<Icon className="icon" type="down" />
+        </Popover>
+      )}
+    </div>
+  );
+};
+class TopicHaSwitch extends React.Component<IXFormProps> {
+  public state = {
+    radioCheck: 'spec',
+    switchMode: 'kafkaUser',
+    targetKeys: [] as string[],
+    selectedKeys: [] as string[],
+    topics: [] as IHaTopic[],
+    kafkaUsers: [] as IKafkaUser[],
+    primaryTopics: [] as string[],
+    primaryActiveKeys: [] as string[],
+    primaryStandbyKeys: [] as string[],
+    firstMove: true,
+    manualSelectedKeys: [] as string[],
+    selectTableColumn: kafkaUserColumn.filter(item => item.title !== 'clientID') as [],
+    spinLoading: false,
+  };
+
+  public selectSingle = null as boolean;
+  public manualSelectedNames = [] as string[];
+
+  public setSelectSingle = (val: boolean) => {
+    this.selectSingle = val;
+  }
+  public setManualSelectedNames = (keys: string[]) => {
+    // this.manualSelectedNames = this.getTopicsByKeys(keys);
+    this.manualSelectedNames = keys;
+  }
+
+  public filterManualSelectedKeys = (key: string, selected: boolean) => {
+    const newManualSelectedKeys = [...this.state.manualSelectedKeys];
+    const index = newManualSelectedKeys.findIndex(item => item === key);
+    if (selected) {
+      if (index === -1) newManualSelectedKeys.push(key);
+    } else {
+      if (index !== -1) newManualSelectedKeys.splice(index, 1);
+    }
+    this.setManualSelectedNames(newManualSelectedKeys);
+    this.setState({
+      manualSelectedKeys: newManualSelectedKeys,
+    });
+  }
+
+  public getManualSelected = (single: boolean, key?: any, selected?: boolean) => {
+    this.setSelectSingle(single);
+    if (single) {
+      this.filterManualSelectedKeys(key, selected);
+    } else {
+      this.setManualSelectedNames(key);
+      this.setState({
+        manualSelectedKeys: key,
+      });
+    }
+  }
+
+  public isPrimaryStatus = (targetKeys: string[]) => {
+    const { primaryStandbyKeys } = this.state;
+    let isReset = false;
+    // 判断当前移动是否还原为最初的状态
+    if (primaryStandbyKeys.length === targetKeys.length) {
+      const diff = targetKeys.find(item => primaryStandbyKeys.indexOf(item) < 0);
+      isReset = diff ? false : true;
+    }
+    return isReset;
+  }
+
+  public getTargetTopics = (currentKeys: string[], primaryKeys: string[]) => {
+    const targetTopics = [];
+    for (const key of currentKeys) {
+      if (!primaryKeys.includes(key)) {
+        // const topic = this.state.topics.find(item => item.key === key)?.topicName;
+        // targetTopics.push(topic);
+        targetTopics.push(key);
+      }
+    }
+    return targetTopics;
+  }
+
+  public handleOk = () => {
+    const { primaryStandbyKeys, primaryActiveKeys, topics, kafkaUsers, switchMode } = this.state;
+    const standbyClusterId = this.props.currentCluster.haClusterVO?.clusterId;
+    const activeClusterId = this.props.currentCluster.clusterId;
+
+    this.props.form.validateFields((err: any, values: any) => {
+
+      if (values.rule === 'all') {
+        createSwitchTask({
+          activeClusterPhyId: activeClusterId,
+          all: true,
+          mustContainAllKafkaUserTopics: true,
+          standbyClusterPhyId: standbyClusterId,
+          kafkaUserAndClientIdList: [],
+          topicNameList: [],
+        }).then(res => {
+          message.success('任务创建成功');
+          this.handleCancel();
+          this.props.reload(res);
+        });
+        return;
+      }
+      // 判断当前移动是否还原为最初的状态
+      const isPrimary = this.isPrimaryStatus(values.targetKeys || []);
+      if (isPrimary) {
+        return message.info('请选择您要切换的Topic');
+      }
+
+      // 右侧框值
+      const currentStandbyKeys = values.targetKeys || [];
+      // 左侧框值
+      const currentActiveKeys = [];
+      for (const item of topics) {
+        if (!currentStandbyKeys.includes(item.key)) {
+          currentActiveKeys.push(item.key);
+        }
+      }
+
+      const currentKeys = currentStandbyKeys.length > primaryStandbyKeys.length ? currentStandbyKeys : currentActiveKeys;
+      const primaryKeys = currentStandbyKeys.length > primaryStandbyKeys.length ? primaryStandbyKeys : primaryActiveKeys;
+      const activeClusterPhyId = currentStandbyKeys.length > primaryStandbyKeys.length ? standbyClusterId : activeClusterId;
+      const standbyClusterPhyId = currentStandbyKeys.length > primaryStandbyKeys.length ? activeClusterId : standbyClusterId;
+      const targetTopics = this.getTargetTopics(currentKeys, primaryKeys);
+      const clientIdParams = kafkaUsers.map(item => ({ clientId: item.clientId, kafkaUser: item.kafkaUser }));
+      const kafkaUserParams = [] as any;
+      kafkaUsers.forEach(item => {
+        kafkaUserParams.push({
+          clientId: null,
+          kafkaUser: item.kafkaUser,
+        });
+        if (item.haClientIdList?.length) {
+          item.haClientIdList.forEach(clientId => {
+            kafkaUserParams.push({
+              clientId,
+              kafkaUser: item.kafkaUser,
+            });
+          });
+        }
+      });
+      createSwitchTask({
+        activeClusterPhyId,
+        all: false,
+        mustContainAllKafkaUserTopics: switchMode === 'kafkaUser',
+        standbyClusterPhyId,
+        kafkaUserAndClientIdList: switchMode === 'clientID' ? clientIdParams : kafkaUserParams,
+        topicNameList: targetTopics,
+      }).then(res => {
+        message.success('任务创建成功');
+        this.handleCancel();
+        this.props.reload(res);
+      });
+    });
+  }
+
+  public handleCancel = () => {
+    this.props.handleVisible(false);
+    this.props.form.resetFields();
+  }
+
+  public handleRadioChange = (e: any) => {
+    this.setState({
+      radioCheck: e.target.value,
+    });
+  }
+
+  public getNewSelectKeys = (removeKeys: string[], selectedKeys: string[]) => {
+    const { topics, kafkaUsers } = this.state;
+    // 根据移除的key找与该key关联的其他key，一起移除
+    let relatedTopics: string[] = [];
+    const relatedKeys: string[] = [];
+    const newSelectKeys = [];
+    for (const key of removeKeys) {
+      const topicName = topics.find(row => row.key === key)?.topicName;
+      for (const item of kafkaUsers) {
+        if (item.selectedTopicNameList.includes(topicName)) {
+          relatedTopics = relatedTopics.concat(item.selectedTopicNameList, item.notSelectTopicNameList);
+        }
+      }
+      for (const item of relatedTopics) {
+        const key = topics.find(row => row.topicName === item)?.key;
+        if (key) {
+          relatedKeys.push(key);
+        }
+      }
+      for (const key of selectedKeys) {
+        if (!relatedKeys.includes(key)) {
+          newSelectKeys.push(key);
+        }
+      }
+    }
+    return newSelectKeys;
+  }
+
+  public setTopicsStatus = (targetKeys: string[], disabled: boolean, isAll = false) => {
+    const { topics } = this.state;
+    const newTopics = Array.from(topics);
+    if (isAll) {
+      for (let i = 0; i < topics.length; i++) {
+        newTopics[i].disabled = disabled;
+      }
+    } else {
+      for (const key of targetKeys) {
+        const index = topics.findIndex(item => item.key === key);
+        if (index > -1) {
+          newTopics[index].disabled = disabled;
+        }
+      }
+    }
+    this.setState(({
+      topics: newTopics,
+    }));
+  }
+
+  public getTopicsByKeys = (keys: string[]) => {
+    // 依据key值找topicName
+    const topicNames: string[] = [];
+    for (const key of keys) {
+      const topicName = this.state.topics.find(item => item.key === key)?.topicName;
+      if (topicName) {
+        topicNames.push(topicName);
+      }
+    }
+    return topicNames;
+  }
+
+  public getNewKafkaUser = (targetKeys: string[]) => {
+    const { primaryStandbyKeys, kafkaUsers, topics } = this.state;
+    const removeKeys = [];
+    const addKeys = [];
+    for (const key of primaryStandbyKeys) {
+      if (targetKeys.indexOf(key) < 0) {
+        // 移除的
+        removeKeys.push(key);
+      }
+    }
+    for (const key of targetKeys) {
+      if (primaryStandbyKeys.indexOf(key) < 0) {
+        // 新增的
+        addKeys.push(key);
+      }
+    }
+    const keepKeys = [...removeKeys, ...addKeys];
+    const newKafkaUsers = kafkaUsers;
+
+    const moveTopics = this.getTopicsByKeys(keepKeys);
+
+    for (const topic of moveTopics) {
+      for (const item of newKafkaUsers) {
+        if (item.selectedTopicNameList.includes(topic)) {
+          item.show = true;
+        }
+      }
+    }
+
+    const showKafaUsers = newKafkaUsers.filter(item => item.show === true);
+
+    for (const item of showKafaUsers) {
+      let i = 0;
+      while (i < moveTopics.length) {
+        if (!item.selectedTopicNameList.includes(moveTopics[i])) {
+          i++;
+        } else {
+          break;
+        }
+      }
+
+      // 表示该kafkaUser不该展示
+      if (i === moveTopics.length) {
+        item.show = false;
+      }
+    }
+
+    return showKafaUsers;
+  }
+
+  public getAppRelatedTopicList = (selectedKeys: string[]) => {
+    const { topics, targetKeys, primaryStandbyKeys, kafkaUsers, switchMode } = this.state;
+    const filterTopicNameList = this.getTopicsByKeys(selectedKeys);
+    const isReset = this.isPrimaryStatus(targetKeys);
+
+    if (!filterTopicNameList.length && isReset) {
+      // targetKeys
+      this.setState({
+        kafkaUsers: kafkaUsers.map(item => ({
+          ...item,
+          show: false,
+        })),
+      });
+      return;
+    } else {
+      // 保留选中项与移动的的项
+      this.setState({
+        kafkaUsers: this.getNewKafkaUser(targetKeys),
+      });
+    }
+
+    // 单向选择，所以取当前值的aactiveClusterId
+    const clusterPhyId = topics.find(item => item.topicName === filterTopicNameList[0])?.activeClusterId;
+    if (!clusterPhyId) return;
+    this.setState({spinLoading: true});
+    getAppRelatedTopics({
+      clusterPhyId,
+      filterTopicNameList,
+      ha: true,
+      useKafkaUserAndClientId: switchMode === 'clientID',
+    }).then((res: IKafkaUser[]) => {
+      let notSelectTopicNames: string[] = [];
+      const notSelectTopicKeys: string[] = [];
+      for (const item of (res || [])) {
+        notSelectTopicNames = notSelectTopicNames.concat(item.notSelectTopicNameList || []);
+      }
+
+      for (const item of notSelectTopicNames) {
+        const key = topics.find(row => row.topicName === item)?.key;
+
+        if (key && notSelectTopicKeys.indexOf(key) < 0) {
+          notSelectTopicKeys.push(key);
+        }
+      }
+
+      const newSelectedKeys = selectedKeys.concat(notSelectTopicKeys);
+      const newKafkaUsers = (res || []).map(item => ({
+        ...item,
+        show: true,
+        manualSelectedTopics: item.selectedTopicNameList.filter(topic => this.manualSelectedNames.indexOf(topic) > -1),
+        autoSelectedTopics: [...item.selectedTopicNameList, ...item.notSelectTopicNameList].filter(topic => this.manualSelectedNames.indexOf(topic) === -1),
+      }));
+      const { kafkaUsers } = this.state;
+
+      for (const item of kafkaUsers) {
+        const resItem = res.find(row => switchMode === 'clientID' ? row.kafkaUser === item.kafkaUser && row.clientId === item.clientId : row.kafkaUser === item.kafkaUser);
+        if (!resItem) {
+          newKafkaUsers.push(item);
+        }
+      }
+      this.setState({
+        kafkaUsers: newKafkaUsers,
+        selectedKeys: newSelectedKeys,
+      });
+
+      if (notSelectTopicKeys.length) {
+        this.getAppRelatedTopicList(newSelectedKeys);
+      }
+    }).finally(() => {
+      this.setState({spinLoading: false});
+    });
+  }
+
+  public getRelatedKeys = (currentKeys: string[]) => {
+    // 未被选中的项
+    const removeKeys = [];
+    // 对比上一次记录的选中的值找出本次取消的项
+    const { selectedKeys } = this.state;
+    for (const preKey of selectedKeys) {
+      if (!currentKeys.includes(preKey)) {
+        removeKeys.push(preKey);
+      }
+    }
+
+    return removeKeys?.length ? this.getNewSelectKeys(removeKeys, currentKeys) : currentKeys;
+  }
+
+  public handleTopicChange = (sourceSelectedKeys: string[], targetSelectedKeys: string[]) => {
+    const { topics, targetKeys } = this.state;
+    // 条件限制只允许选中一边，单向操作
+    const keys = [...sourceSelectedKeys, ...targetSelectedKeys];
+
+    // 判断当前选中项属于哪一类
+    if (keys.length) {
+      const activeClusterId = topics.find(item => item.key === keys[0])?.activeClusterId;
+      const needDisabledKeys = topics.filter(item => item.activeClusterId !== activeClusterId).map(row => row.key);
+      this.setTopicsStatus(needDisabledKeys, true);
+    }
+    const selectedKeys = this.state.selectedKeys.length ? this.getRelatedKeys(keys) : keys;
+
+    const isReset = this.isPrimaryStatus(targetKeys);
+    if (!selectedKeys.length && isReset) {
+      this.setTopicsStatus([], false, true);
+    }
+    this.setState({
+      selectedKeys,
+    });
+    this.getAppRelatedTopicList(selectedKeys);
+  }
+
+  public onDirectChange = (targetKeys: string[], direction: string, moveKeys: string[]) => {
+    const { primaryStandbyKeys, firstMove, primaryActiveKeys, kafkaUsers, topics } = this.state;
+
+    const getKafkaUser = () => {
+      const newKafkaUsers = kafkaUsers;
+      const moveTopics = this.getTopicsByKeys(moveKeys);
+      for (const topic of moveTopics) {
+        for (const item of newKafkaUsers) {
+          if (item.selectedTopicNameList.includes(topic)) {
+            item.show = true;
+          }
+        }
+      }
+      return newKafkaUsers;
+    };
+    // 判断当前移动是否还原为最初的状态
+    const isReset = this.isPrimaryStatus(targetKeys);
+    if (firstMove) {
+      const primaryKeys = direction === 'right' ? primaryStandbyKeys : primaryActiveKeys;
+      this.setTopicsStatus(primaryKeys, true, false);
+      this.setState(({
+        firstMove: false,
+        kafkaUsers: getKafkaUser(),
+        targetKeys,
+      }));
+      return;
+    }
+    // 如果是还原为初始状态则还原禁用状态
+    if (isReset) {
+      this.setTopicsStatus([], false, true);
+      this.setState(({
+        firstMove: true,
+        targetKeys,
+        kafkaUsers: [],
+      }));
+      return;
+    }
+
+    // 切换后重新判定展示项
+    this.setState(({
+      targetKeys,
+      kafkaUsers: this.getNewKafkaUser(targetKeys),
+    }));
+
+  }
+
+  public downloadData = () => {
+    const { kafkaUsers, switchMode } = this.state;
+    const tableData = kafkaUsers.map(item => {
+      const column = {
+        // tslint:disable
+        'kafkaUser': item.kafkaUser,
+        'clientID': item.clientId,
+        '已选中Topic': item.manualSelectedTopics?.join('、'),
+        '选中关联Topic': item.autoSelectedTopics?.join('、'),
+        '未建立HA Topic': item.notHaTopicNameList?.join(`、`),
+      };
+      if (switchMode === 'kafkaUser') {
+        delete column.clientID
+      }
+      return column;
+    });
+    const data = [].concat(tableData);
+    const wb = XLSX.utils.book_new();
+    // json转sheet
+    const header = ['kafkaUser', 'clientID', '已选中Topic', '选中关联Topic', '未建立HA Topic'];
+    const ws = XLSX.utils.json_to_sheet(data, {
+      header: switchMode === 'kafkaUser' ? header.filter(item => item !== 'clientID') : header,
+    });
+    // XLSX.utils.
+    XLSX.utils.book_append_sheet(wb, ws, 'kafkaUser');
+    // 输出
+    XLSX.writeFile(wb, 'kafkaUser-' + moment((new Date()).getTime()).format(timeMinute) + '.xlsx');
+  }
+
+  public judgeSubmitStatus = () => {
+    const { kafkaUsers } = this.state;
+
+    const newKafkaUsers = kafkaUsers.filter(item => item.show)
+    for (const item of newKafkaUsers) {
+      if (item.notHaTopicNameList.length) {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  public onModeChange = (e: any) => {
+    const mode = e.target.value;
+    // 切换方式变更时，初始化数据
+    const { primaryTopics, primaryStandbyKeys } = this.state;
+    this.setState({
+      switchMode: mode,
+      topics: cloneDeep(primaryTopics),
+      targetKeys: primaryStandbyKeys,
+      selectedKeys: [],
+      kafkaUsers: [],
+      firstMove: true,
+      manualSelectedKeys: [],
+      selectTableColumn: mode === 'kafkaUser' ? kafkaUserColumn.filter(item => item.title !== 'clientID') : kafkaUserColumn,
+    });
+    this.props.form.setFieldsValue({targetKeys: primaryStandbyKeys});
+    this.setSelectSingle(null);
+    this.setManualSelectedNames([]);
+  }
+
+  public componentDidMount() {
+    const standbyClusterId = this.props.currentCluster.haClusterVO?.clusterId;
+    const activeClusterId = this.props.currentCluster.clusterId;
+    getClusterHaTopics(activeClusterId, standbyClusterId).then((res: IHaTopic[]) => {
+      res = res.map((item) => ({
+        key: item.topicName,
+        ...item,
+      }));
+      const targetKeys = (res || []).filter((item) => item.activeClusterId === standbyClusterId).map(row => row.key);
+      const primaryActiveKeys = (res || []).filter((item) => item.activeClusterId === activeClusterId).map(row => row.key);
+      this.setState({
+        topics: res || [],
+        primaryTopics: cloneDeep(res) || [],
+        primaryStandbyKeys: targetKeys,
+        primaryActiveKeys,
+        targetKeys,
+      });
+    });
+  }
+
+  public render() {
+    const { visible, currentCluster } = this.props;
+    const { getFieldDecorator } = this.props.form;
+    let metadata = [] as IBrokersMetadata[];
+    metadata = admin.brokersMetadata ? admin.brokersMetadata : metadata;
+    let regions = [] as IBrokersRegions[];
+    regions = admin.brokersRegions ? admin.brokersRegions : regions;
+    const { switchMode, kafkaUsers, radioCheck, targetKeys, selectedKeys, topics, selectTableColumn, spinLoading } = this.state;
+    const tableData = kafkaUsers.filter(row => row.show);
+    const rulesNode = (
+      <div>
+        1、符合规范的ClientID格式为P#或C#前缀，分别代表生产者客户端和消费者客户端。
+        <br />
+        2、此处只展示符合规范的ClientID格式的高可用Topic。若未找到所需Topic，请检查ClientID的格式是否正确。
+      </div>
+    );
+
+    return (
+      <Modal
+        title="Topic主备切换"
+        wrapClassName="no-padding"
+        visible={visible}
+        onCancel={this.handleCancel}
+        maskClosable={false}
+        width={800}
+        footer={<>
+          <Button onClick={this.handleCancel}>取消</Button>
+          <Button disabled={this.judgeSubmitStatus()} style={{ marginLeft: 8 }} type="primary" onClick={() => this.handleOk()}>确定</Button>
+        </>
+        }
+      >
+        <Alert
+          message={`注意：必须把同一个${switchMode}关联的所有Topic都建立高可用关系，并且都选中，才能执行任务`}
+          type="info"
+          showIcon={true}
+        />
+        <Spin spinning={spinLoading}>
+          <Form {...layout} name="basic" className="x-form">
+            <Form.Item label="切换维度">
+              {getFieldDecorator('switchMode', {
+                initialValue: 'kafkaUser',
+                rules: [{
+                  required: true,
+                  message: '请选择切换维度',
+                }],
+              })(<Radio.Group onChange={this.onModeChange}>
+                <Radio value="kafkaUser">kafkaUser</Radio>
+                <Radio value="clientID">kafkaUser + clientID</Radio>
+              </Radio.Group>)}
+            </Form.Item>
+            {/* <Form.Item label="规则"  >
+              {getFieldDecorator('rule', {
+                initialValue: 'spec',
+                rules: [{
+                  required: true,
+                  message: '请选择规则',
+                }],
+              })(<Radio.Group onChange={this.handleRadioChange} >
+                <Radio value="all">应用于所有Topic</Radio>
+                <Radio value="spec">应用于特定Topic</Radio>
+              </Radio.Group>)}
+            </Form.Item> */}
+            {switchMode === 'clientID' && <div style={{ margin: '-10px 0 10px 0' }} >
+              <Tooltip placement="bottomLeft" title={rulesNode}>
+                <a>规则说明</a>
+              </Tooltip>
+            </div>}
+            {radioCheck === 'spec' ? <Form.Item className="no-label" label=""  >
+              {getFieldDecorator('targetKeys', {
+                initialValue: targetKeys,
+                rules: [{
+                  required: false,
+                  message: '请选择Topic',
+                }],
+              })(
+                <TransferTable
+                  selectedKeys={selectedKeys}
+                  topicChange={this.handleTopicChange}
+                  onDirectChange={this.onDirectChange}
+                  columns={columns}
+                  dataSource={topics}
+                  currentCluster={currentCluster}
+                  getManualSelected={this.getManualSelected}
+                />,
+              )}
+            </Form.Item> : null}
+          </Form>
+          {radioCheck === 'spec' ?
+            <>
+              <Table
+                className="modal-table-content"
+                columns={selectTableColumn}
+                dataSource={tableData}
+                size="small"
+                rowKey="kafkaUser"
+                pagination={false}
+                scroll={{ y: 300 }}
+              />
+              {tableData.length ? <div onClick={this.downloadData} className="modal-table-download"><a>下载表单内容</a></div> : null}
+            </>
+            : null}
+        </Spin>
+      </Modal>
+    );
+  }
+}
+export const TopicSwitchWrapper = Form.create<IXFormProps>()(TopicHaSwitch);
+
+export const TableTransfer = ({ leftColumns, getManualSelected, tableAttrs, ...restProps }: any) => (
+  <Transfer {...restProps} showSelectAll={true}>
+    {({
+      filteredItems,
+      direction,
+      onItemSelect,
+      selectedKeys: listSelectedKeys,
+    }) => {
+      const columns = leftColumns;
+
+      const rowSelection = {
+        columnWidth: 40,
+        getCheckboxProps: (item: any) => ({
+          disabled: item.disabled,
+        }),
+        onSelect({ key }: any, selected: any) {
+          getManualSelected(true, key, selected);
+          onItemSelect(key, selected);
+        },
+        selectedRowKeys: listSelectedKeys,
+      };
+      return (
+        <Table
+          rowSelection={rowSelection}
+          columns={columns}
+          dataSource={filteredItems}
+          size="small"
+          pagination={false}
+          scroll={{ y: 320 }}
+          style={{ marginBottom: 14 }}
+          bordered={false}
+          onRow={({ key, disabled }) => ({
+            onClick: () => {
+              if (disabled) return;
+              getManualSelected(true, key, listSelectedKeys.includes(key));
+              onItemSelect(key, !listSelectedKeys.includes(key));
+            },
+          })}
+          {...tableAttrs}
+        />
+      );
+    }}
+  </Transfer>
+);
+
+interface IProps {
+  value?: any;
+  onChange?: any;
+  onDirectChange?: any;
+  currentCluster: any;
+  topicChange: any;
+  columns: any[];
+  dataSource: any[];
+  selectedKeys: string[];
+  getManualSelected: any;
+  transferAttrs?: any;
+  tableAttrs?: any;
+}
+
+export class TransferTable extends React.Component<IProps> {
+  public onChange = (nextTargetKeys: any, direction: string, moveKeys: string[]) => {
+    this.props.onDirectChange(nextTargetKeys, direction, moveKeys);
+    // tslint:disable-next-line:no-unused-expression
+    this.props.onChange && this.props.onChange(nextTargetKeys);
+  }
+
+  public render() {
+    const { currentCluster, columns, dataSource, value, topicChange, selectedKeys, getManualSelected, transferAttrs, tableAttrs } = this.props;
+    return (
+      <div>
+        <TableTransfer
+          dataSource={dataSource}
+          targetKeys={value || []}
+          selectedKeys={selectedKeys}
+          showSearch={true}
+          onChange={this.onChange}
+          onSelectChange={topicChange}
+          filterOption={(inputValue: string, item: any) => item.topicName?.indexOf(inputValue) > -1}
+          leftColumns={columns}
+          titles={[`集群${currentCluster.clusterName}`, `集群${currentCluster.haClusterVO?.clusterName}`]}
+          locale={{
+            itemUnit: '',
+            itemsUnit: '',
+          }}
+          getManualSelected={getManualSelected}
+          tableAttrs={tableAttrs}
+          {...transferAttrs}
+        />
+      </div>
+    );
+  }
+}

kafka-manager-console/src/container/modal/admin/index.less

@@ -0,0 +1,8 @@
+.ant-table-wrapper.no-lr-padding {
+  padding-left: 0!important;
+  padding-right: 0!important;
+}
+
+.no-table-header .ant-table-header {
+  display: none;
+}

kafka-manager-console/src/container/modal/topic.tsx

@@ -16,6 +16,17 @@ import { modal } from 'store/modal';
 import { TopicAppSelect } from '../topic/topic-app-select';
 import Url from 'lib/url-parser';
 import { expandRemarks, quotaRemarks } from 'constants/strategy';
+import { getAppListByClusterId } from 'lib/api';
+
+const updateApplyTopicFormModal = (clusterId: number) => {
+  const formMap = wrapper.xFormWrapper.formMap;
+  const formData = wrapper.xFormWrapper.formData;
+  getAppListByClusterId(clusterId).then(res => {
+    formMap[2].customFormItem = <AppSelect selectData={res} />;
+    // tslint:disable-next-line:no-unused-expression
+    wrapper.ref && wrapper.ref.updateFormMap$(formMap, formData);
+  });
+};
 
 export const applyTopic = () => {
   const xFormModal = {
@@ -28,6 +39,9 @@ export const applyTopic = () => {
         rules: [{ required: true, message: '请选择' }],
         attrs: {
           placeholder: '请选择',
+          onChange(value: number) {
+            updateApplyTopicFormModal(value);
+          },
         },
       }, {
         key: 'topicName',
@@ -49,7 +63,7 @@ export const applyTopic = () => {
         type: 'custom',
         defaultValue: '',
         rules: [{ required: true, message: '请选择' }],
-        customFormItem: <AppSelect selectData={app.data} />,
+        customFormItem: <AppSelect selectData={[]} />,
       }, {
         key: 'peakBytesIn',
         label: '峰值流量',
@@ -88,7 +102,7 @@ export const applyTopic = () => {
     ],
     formData: {},
     visible: true,
-    title: <div><span>申请Topic</span><a className='applicationDocument' href="https://github.com/didi/Logi-KafkaManager/blob/master/docs/user_guide/resource_apply.md" target='_blank'>资源申请文档</a></div>,
+    title: <div><span>申请Topic</span><a className="applicationDocument" href="https://github.com/didi/Logi-KafkaManager/blob/master/docs/user_guide/resource_apply.md" target="_blank">资源申请文档</a></div>,
     okText: '确认',
     // customRenderElement: <span className="tips">集群资源充足时，预计1分钟自动审批通过</span>,
     isWaitting: true,
@@ -106,7 +120,7 @@ export const applyTopic = () => {
       };
       return topic.applyTopic(quotaParams).then(data => {
         window.location.href = `${urlPrefix}/user/order-detail/?orderId=${data.id}&region=${region.currentRegion}`;
-      })
+      });
     },
     onSubmitFaild: (err: any, ref: any, formData: any, formMap: any) => {
       if (err.message === 'topic already existed') {
@@ -115,10 +129,10 @@ export const applyTopic = () => {
           topicName: {
             value: topic,
             errors: [new Error('该topic名称已存在')],
+          },
+        });
       }
-        })
+    },
-      }
-    }
   };
   wrapper.open(xFormModal);
 };
@@ -380,12 +394,19 @@ export const showTopicApplyQuatoModal = (item: ITopic) => {
         consumeQuota: transMBToB(value.consumeQuota),
         produceQuota: transMBToB(value.produceQuota),
       });
+
+      if (item.isPhysicalClusterId) {
+        Object.assign(quota, {
+          isPhysicalClusterId: true,
+        });
+      }
       const quotaParams = {
         type: 2,
         applicant: users.currentUser.username,
         description: value.description,
         extensions: JSON.stringify(quota),
       };
+
       topic.applyQuota(quotaParams).then((data) => {
         notification.success({ message: '申请配额成功' });
         window.location.href = `${urlPrefix}/user/order-detail/?orderId=${data.id}&region=${region.currentRegion}`;
@@ -454,8 +475,8 @@ const judgeAccessStatus = (access: number) => {
 
 export const showAllPermissionModal = (item: ITopic) => {
   let appId: string = null;
-
+  app.getAppListByClusterId(item.clusterId).then(res => {
-  if (!app.data || !app.data.length) {
+    if (!app.clusterAppData || !app.clusterAppData.length) {
       return notification.info({
         message: (
           <>
@@ -466,12 +487,13 @@ export const showAllPermissionModal = (item: ITopic) => {
           </>),
       });
     }
-  const index = app.data.findIndex(row => row.appId === item.appId);
+    const index = app.clusterAppData.findIndex(row => row.appId === item.appId);
 
-  appId = index > -1 ? item.appId : app.data[0].appId;
+    appId = index > -1 ? item.appId : app.clusterAppData[0].appId;
     topic.getAuthorities(appId, item.clusterId, item.topicName).then((data) => {
       showAllPermission(appId, item, data.access);
     });
+  });
 };
 
 const showAllPermission = (appId: string, item: ITopic, access: number) => {
@@ -494,7 +516,7 @@ const showAllPermission = (appId: string, item: ITopic, access: number) => {
         defaultValue: appId,
         rules: [{ required: true, message: '请选择应用' }],
         type: 'custom',
-        customFormItem: <TopicAppSelect selectData={app.data} parameter={item} />,
+        customFormItem: <TopicAppSelect selectData={app.clusterAppData} parameter={item} />,
       },
       {
         key: 'access',

kafka-manager-console/src/container/search-filter.tsx

@@ -18,7 +18,7 @@ interface IFilterParams {
 }
 
 interface ISearchAndFilterState {
-  [filter: string]: boolean | string | number | any[];
+  [filter: string]: boolean | string | number | any;
 }
 
 export class SearchAndFilterContainer extends React.Component<any, ISearchAndFilterState> {

kafka-manager-console/src/container/topic/topic-detail/connect-information.tsx

@@ -6,6 +6,8 @@ import { Table, Tooltip } from 'component/antd';
 import { SearchAndFilterContainer } from 'container/search-filter';
 import Url from 'lib/url-parser';
 import { pagination, cellStyle } from 'constants/table';
+import moment = require('moment');
+import { timeFormat } from 'constants/strategy';
 
 @observer
 export class ConnectInformation extends SearchAndFilterContainer {
@@ -27,25 +29,43 @@ export class ConnectInformation extends SearchAndFilterContainer {
       title: '客户端类型',
       dataIndex: 'clientType',
       key: 'clientType',
-      width: '20%',
+      width: 130,
       filters: [{ text: '消费', value: 'consumer' }, { text: '生产', value: 'produce' }],
       onFilter: (value: string, record: IConnectionInfo) => record.clientType.indexOf(value) === 0,
       render: (t: string) =>
         <span>{t === 'consumer' ? '消费' : '生产'}</span>,
     }, this.renderColumnsFilter('filterVisible'));
 
-    const columns = [{
+    const columns = [
+      {
         title: 'AppID',
         dataIndex: 'appId',
         key: 'appId',
-      width: '20%',
+        width: '30%',
         sorter: (a: IConnectionInfo, b: IConnectionInfo) => a.appId.charCodeAt(0) - b.appId.charCodeAt(0),
       },
+      {
+        title: 'clientID',
+        dataIndex: 'clientId',
+        key: 'clientId',
+        width: '30%',
+        onCell: () => ({
+          style: {
+            maxWidth: 250,
+            ...cellStyle,
+          },
+        }),
+        render: (t: string) => {
+          return (
+            <Tooltip placement="bottomLeft" title={t} >{t}</Tooltip>
+          );
+        },
+      },
       {
         title: '主机名',
         dataIndex: 'hostname',
         key: 'hostname',
-      width: '40%',
+        width: '30%',
         onCell: () => ({
           style: {
             maxWidth: 250,
@@ -62,9 +82,17 @@ export class ConnectInformation extends SearchAndFilterContainer {
         title: '客户端版本',
         dataIndex: 'clientVersion',
         key: 'clientVersion',
-      width: '20%',
+        width: 130,
       },
       clientType,
+      {
+        title: '最后访问时间',
+        dataIndex: 'realConnectTime',
+        key: 'realConnectTime',
+        width: 170,
+        render: (t: number) => moment(t).format(timeFormat),
+        sorter: (a: IConnectionInfo, b: IConnectionInfo) => a.realConnectTime - b.realConnectTime,
+      },
     ];
     if (connectInfo) {
       return (

kafka-manager-console/src/container/topic/topic-detail/index.tsx

@@ -331,11 +331,13 @@ export class TopicDetail extends React.Component<any> {
   public render() {
     const role = users.currentUser.role;
     const baseInfo = topic.baseInfo as ITopicBaseInfo;
-    const showEditBtn = (role == 1 || role == 2) || (topic.topicBusiness && topic.topicBusiness.principals.includes(users.currentUser.username));
+    const showEditBtn = (role == 1 || role == 2) ||
+      (topic.topicBusiness && topic.topicBusiness.principals.includes(users.currentUser.username));
     const topicRecord = {
       clusterId: this.clusterId,
       topicName: this.topicName,
-      clusterName: this.clusterName
+      clusterName: this.clusterName,
+      isPhysicalClusterId: !!this.isPhysicalTrue,
     } as ITopic;
 
     return (
@@ -349,9 +351,12 @@ export class TopicDetail extends React.Component<any> {
                 title={this.topicName || ''}
                 extra={
                   <>
-                    {this.needAuth == "true" && <Button key="0" type="primary" onClick={() => showAllPermissionModal(topicRecord)} >申请权限</Button>}
+                    {this.needAuth == 'true' &&
-                    <Button key="1" type="primary" onClick={() => applyTopicQuotaQuery(topicRecord)} >申请配额</Button>
+                      <Button key="0" type="primary" onClick={() => showAllPermissionModal(topicRecord)} >申请权限</Button>}
-                    <Button key="2" type="primary" onClick={() => applyExpandModal(topicRecord)} >申请分区</Button>
+                    {baseInfo.haRelation === 0 ? null :
+                      <Button key="1" type="primary" onClick={() => applyTopicQuotaQuery(topicRecord)} >申请配额</Button>}
+                    {baseInfo.haRelation === 0 ? null :
+                      <Button key="2" type="primary" onClick={() => applyExpandModal(topicRecord)} >申请分区</Button>}
                     <Button key="3" type="primary" onClick={() => this.props.history.push(`/alarm/add`)} >新建告警</Button>
                     <Button key="4" type="primary" onClick={this.showDrawer.bind(this)} >数据采样</Button>
                     {/* {showEditBtn && <Button key="5" onClick={() => this.compileDetails()} type="primary">编辑</Button>} */}

kafka-manager-console/src/lib/api.ts

@@ -248,6 +248,10 @@ export const getAppTopicList = (appId: string, mine: boolean) => {
   return fetch(`/normal/apps/${appId}/topics?mine=${mine}`);
 };
 
+export const getAppListByClusterId = (clusterId: number) => {
+  return fetch(`/normal/apps/${clusterId}`);
+};
+
 /**
  * 专家服务
  */
@@ -418,8 +422,69 @@ export const getMetaData = (needDetail: boolean = true) => {
   return fetch(`/rd/clusters/basic-info?need-detail=${needDetail}`);
 };
 
+export const getHaMetaData = () => {
+  return fetch(`/rd/clusters/ha/basic-info`);
+};
+
+export const getClusterHaTopics = (firstClusterId: number, secondClusterId?: number) => {
+  return fetch(`/rd/clusters/${firstClusterId}/ha-topics?secondClusterId=${secondClusterId || ''}`);
+};
+
+export const getClusterHaTopicsStatus = (firstClusterId: number, checkMetadata: boolean) => {
+  return fetch(`/rd/clusters/${firstClusterId}/ha-topics/status?checkMetadata=${checkMetadata}`);
+};
+
+export const setHaTopics = (params: any) => {
+  return fetch(`/op/ha-topics`, {
+    method: 'POST',
+    body: JSON.stringify(params),
+  });
+};
+
+export const getAppRelatedTopics = (params: any) => {
+  return fetch(`/rd/apps/relate-topics
+  `, {
+    method: 'POST',
+    body: JSON.stringify(params),
+  });
+};
+// 取消Topic高可用
+export const unbindHaTopics = (params: any) => {
+  return fetch(`/op/ha-topics`, {
+    method: 'DELETE',
+    body: JSON.stringify(params),
+  });
+};
+
+// 创建Topic主备切换任务
+export const createSwitchTask = (params: any) => {
+  return fetch(`/op/as-switch-jobs`, {
+    method: 'POST',
+    body: JSON.stringify(params),
+  });
+};
+
+export const getJobDetail = (jobId: number) => {
+  return fetch(`/op/as-switch-jobs/${jobId}/job-detail`);
+};
+
+export const getJobLog = (jobId: number, startLogId?: number) => {
+  return fetch(`/op/as-switch-jobs/${jobId}/job-logs?startLogId=${startLogId || ''}`);
+};
+
+export const getJobState = (jobId: number) => {
+  return fetch(`/op/as-switch-jobs/${jobId}/job-state`);
+};
+
+export const switchAsJobs = (jobId: number, params: any) => {
+  return fetch(`/op/as-switch-jobs/${jobId}/action`, {
+    method: 'PUT',
+    body: JSON.stringify(params),
+  });
+};
+
 export const getOperationRecordData = (params: any) => {
-  return fetch(`/rd/operate-record`,{
+  return fetch(`/rd/operate-record`, {
     method: 'POST',
     body: JSON.stringify(params),
   });
@@ -569,14 +634,14 @@ export const getCandidateController = (clusterId: number) => {
   return fetch(`/rd/clusters/${clusterId}/controller-preferred-candidates`);
 };
 
-export const addCandidateController = (params:any) => {
+export const addCandidateController = (params: any) => {
   return fetch(`/op/cluster-controller/preferred-candidates`, {
     method: 'POST',
     body: JSON.stringify(params),
   });
 };
 
-export const deleteCandidateCancel = (params:any)=>{
+export const deleteCandidateCancel = (params: any) => {
   return fetch(`/op/cluster-controller/preferred-candidates`, {
     method: 'DELETE',
     body: JSON.stringify(params),

kafka-manager-console/src/lib/fetch.ts

@@ -33,7 +33,6 @@ const checkStatus = (res: Response) => {
 };
 
 const filter = (init: IInit) => (res: IRes) => {
-  
   if (res.code !== 0 && res.code !== 200) {
     if (!init.errorNoTips) {
       notification.error({

kafka-manager-console/src/routers/page/index.less

@@ -1,4 +1,3 @@
-
 * {
   padding: 0;
   margin: 0;
@@ -13,7 +12,9 @@ li {
   list-style-type: none;
 }
 
-html, body, .router-nav {
+html,
+body,
+.router-nav {
   width: 100%;
   height: 100%;
   font-family: PingFangSC-Regular;
@@ -52,11 +53,12 @@ html, body, .router-nav {
   color: @primary-color;
 }
 
-.ant-table-thead > tr > th, .ant-table-tbody > tr > td {
+.ant-table-thead>tr>th,
+.ant-table-tbody>tr>td {
   padding: 13px;
 }
 
-.ant-table-tbody > tr > td {
+.ant-table-tbody>tr>td {
   background: #fff;
 }
 
@@ -72,15 +74,11 @@ html, body, .router-nav {
   overflow: auto;
 }
 
-.ant-form-item {
-  margin-bottom: 16px;
-}
-
 .mb-24 {
   margin-bottom: 24px;
 }
 
-.ant-table-thead > tr > th .ant-table-filter-icon {
+.ant-table-thead>tr>th .ant-table-filter-icon {
   right: initial;
 }
 
@@ -100,7 +98,7 @@ html, body, .router-nav {
   margin-left: 10px;
 }
 
-.config-info{
+.config-info {
   white-space: pre-line;
   height: 100%;
   overflow-y: scroll;
@@ -113,4 +111,3 @@ html, body, .router-nav {
   cursor: pointer;
   font-size: 12px;
 }
-

kafka-manager-console/src/routers/router.tsx

@@ -1,6 +1,7 @@
 import { BrowserRouter as Router, Route } from 'react-router-dom';
 import { hot } from 'react-hot-loader/root';
 import * as React from 'react';
+import zhCN from 'antd/lib/locale/zh_CN';
 
 import Home from './page/topic';
 import Admin from './page/admin';
@@ -12,10 +13,13 @@ import { urlPrefix } from 'constants/left-menu';
 import ErrorPage from './page/error';
 import Login from './page/login';
 import InfoPage from './page/info';
+import { ConfigProvider } from 'antd';
 
 class RouterDom extends React.Component {
   public render() {
     return (
+      <ConfigProvider locale={zhCN}>
+
         <Router basename={urlPrefix}>
           <Route path="/" exact={true} component={Home} />
           <Route path={`/topic`} exact={true} component={Home} />
@@ -64,6 +68,7 @@ class RouterDom extends React.Component {
           <Route path={`/error`} exact={true} component={ErrorPage} />
           <Route path={`/info`} exact={true} component={InfoPage} />
         </Router>
+      </ConfigProvider>
     );
   }
 }

kafka-manager-console/src/store/admin.ts

@@ -57,8 +57,9 @@ import {
   getBillStaffDetail,
   getCandidateController,
   addCandidateController,
-  deleteCandidateCancel
+  deleteCandidateCancel,
-  } from 'lib/api';
+  getHaMetaData,
+} from 'lib/api';
 import { getControlMetricOption, getClusterMetricOption } from 'lib/line-charts-config';
 
 import { copyValueMap } from 'constants/status-map';
@@ -104,12 +105,15 @@ class Admin {
   @observable
   public metaList: IMetaData[] = [];
 
+  @observable
+  public haMetaList: IMetaData[] = [];
+
   @observable
   public oRList: any[] = [];
 
   @observable
-  public oRparams:any={
+  public oRparams: any = {
-    moduleId:0
+    moduleId: 0
   };
 
   @observable
@@ -329,9 +333,20 @@ class Admin {
   }
 
   @action.bound
-  public setOperationRecordList(data:any){
+  public setHaMetaList(data: IMetaData[]) {
     this.setLoading(false);
-    this.oRList = data ? data.map((item:any, index: any) => {
+    this.haMetaList = data ? data.map((item, index) => {
+      item.key = index;
+      return item;
+    }) : [];
+    this.haMetaList = this.haMetaList.sort((a, b) => a.clusterId - b.clusterId);
+    return this.haMetaList;
+  }
+
+  @action.bound
+  public setOperationRecordList(data: any) {
+    this.setLoading(false);
+    this.oRList = data ? data.map((item: any, index: any) => {
       item.key = index;
       return item;
     }) : [];
@@ -394,9 +409,9 @@ class Admin {
       item.key = index;
       return item;
     }) : [];
-    this.filtercontrollerCandidate = data?data.map((item,index)=>{
+    this.filtercontrollerCandidate = data ? data.map((item, index) => {
       return item.brokerId
-    }).join(','):''
+    }).join(',') : ''
   }
 
   @action.bound
@@ -479,8 +494,8 @@ class Admin {
   }
 
   @action.bound
-  public setBrokersMetadata(data: IBrokersMetadata[]|any) {
+  public setBrokersMetadata(data: IBrokersMetadata[] | any) {
-    this.brokersMetadata = data ? data.map((item:any, index:any) => {
+    this.brokersMetadata = data ? data.map((item: any, index: any) => {
       item.key = index;
       return {
         ...item,
@@ -675,6 +690,11 @@ class Admin {
     getMetaData(needDetail).then(this.setMetaList);
   }
 
+  public getHaMetaData() {
+    this.setLoading(true);
+    return getHaMetaData().then(this.setHaMetaList);
+  }
+
   public getOperationRecordData(params: any) {
     this.setLoading(true);
     this.oRparams = params
@@ -738,17 +758,17 @@ class Admin {
   }
 
   public getCandidateController(clusterId: number) {
-    return getCandidateController(clusterId).then(data=>{
+    return getCandidateController(clusterId).then(data => {
       return this.setCandidateController(data)
     });
   }
 
   public addCandidateController(clusterId: number, brokerIdList: any) {
-    return addCandidateController({clusterId, brokerIdList}).then(()=>this.getCandidateController(clusterId));
+    return addCandidateController({ clusterId, brokerIdList }).then(() => this.getCandidateController(clusterId));
   }
 
-  public deleteCandidateCancel(clusterId: number, brokerIdList: any){
+  public deleteCandidateCancel(clusterId: number, brokerIdList: any) {
-    return deleteCandidateCancel({clusterId, brokerIdList}).then(()=>this.getCandidateController(clusterId));
+    return deleteCandidateCancel({ clusterId, brokerIdList }).then(() => this.getCandidateController(clusterId));
   }
 
   public getBrokersBasicInfo(clusterId: number, brokerId: number) {

kafka-manager-console/src/store/app.ts

@@ -1,5 +1,5 @@
 import { observable, action } from 'mobx';
-import { getAppList, getAppDetail, getAppTopicList, applyOrder, modfiyApplication, modfiyAdminApp, getAdminAppList, getAppsConnections, getTopicAppQuota } from 'lib/api';
+import { getAppList, getAppDetail, getAppTopicList, applyOrder, modfiyApplication, modfiyAdminApp, getAdminAppList, getAppsConnections, getTopicAppQuota, getAppListByClusterId } from 'lib/api';
 import { IAppItem, IAppQuota, ITopic, IOrderParams, IConnectionInfo } from 'types/base-type';
 
 class App {
@@ -12,6 +12,9 @@ class App {
   @observable
   public data: IAppItem[] = [];
 
+  @observable
+  public clusterAppData: IAppItem[] = [];
+
   @observable
   public adminAppData: IAppItem[] = [];
 
@@ -87,6 +90,16 @@ class App {
     this.setLoading(false);
   }
 
+  @action.bound
+  public setClusterAppData(data: IAppItem[] = []) {
+    this.clusterAppData = data.map((item, index) => ({
+      ...item,
+      key: index,
+      principalList: item.principals ? item.principals.split(',') : [],
+    }));
+    return this.clusterAppData;
+  }
+
   @action.bound
   public setAdminData(data: IAppItem[] = []) {
     this.adminAppData = data.map((item, index) => ({
@@ -133,6 +146,10 @@ class App {
     getAppList().then(this.setData);
   }
 
+  public getAppListByClusterId(clusterId: number) {
+    return getAppListByClusterId(clusterId).then(this.setClusterAppData);
+  }
+
   public getTopicAppQuota(clusterId: number, topicName: string) {
     return getTopicAppQuota(clusterId, topicName).then(this.setTopicAppQuota);
   }

kafka-manager-console/src/store/topic.ts

@@ -37,6 +37,7 @@ export interface ITopicBaseInfo {
   physicalClusterId: number;
   percentile: string;
   regionNameList: any;
+  haRelation: number;
 }
 
 export interface IRealTimeTraffic {
@@ -74,6 +75,8 @@ export interface IConnectionInfo {
   hostname: string;
   ip: string;
   topicName: string;
+  clientId?: string;
+  realConnectTime?: number;
   key?: number;
 }
 

kafka-manager-console/src/types/base-type.ts

@@ -474,7 +474,14 @@ export interface IMetaData {
   status: number;
   topicNum: number;
   zookeeper: string;
+  haRelation?: number;
+  haASSwitchJobId?: number;
+  haStatus?: number;
+  haClusterVO?: IMetaData;
+  activeTopicCount?: number;
+  standbyTopicCount?: number;
   key?: number;
+  mutualBackupClusterName?: string;
 }
 
 export interface IConfigure {
@@ -641,6 +648,7 @@ export interface IClusterTopics {
   properties: any;
   clusterName: string;
   logicalClusterId: number;
+  haRelation?: number;
   key?: number;
 }