From 165c0a5866f30ef3a24397213083472bb03b8caf Mon Sep 17 00:00:00 2001
From: Peng <71620349+PenceX@users.noreply.github.com>
Date: Mon, 29 Nov 2021 19:32:54 +0800
Subject: [PATCH 1/6] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 739b2309..2e284136 100644
--- a/README.md
+++ b/README.md
@@ -82,7 +82,7 @@
 ✅知识星球首个【Kafka中文社区】，内测期免费加入～https://z.didi.cn/5gSF9  
 有问必答~！  
 互动有礼~！  
-1100+群友一起共建国内最专业的【Kafka中文社区】  
+1600+群友一起共建国内最专业的【Kafka中文社区】  
 PS:提问请尽量把问题一次性描述清楚，并告知环境信息情况哦～！如使用版本、操作步骤、报错/警告信息等，方便嘉宾们快速解答～
 
 ## 5 项目成员

From 396045177c4fb318fc4f719c50b275a89ecfdba1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E8=B6=85?= <joysunchao@didiglobal.com>
Date: Sat, 11 Dec 2021 14:25:43 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=A1=B6=E5=AF=BCV2.5.0?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 kafka-manager-console/src/container/header/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kafka-manager-console/src/container/header/index.tsx b/kafka-manager-console/src/container/header/index.tsx
index c668335a..d0b8febe 100644
--- a/kafka-manager-console/src/container/header/index.tsx
+++ b/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.4.2</a>
+        <a className='kafka-header-version' href="https://github.com/didi/Logi-KafkaManager/releases" target='_blank'>v2.5.0</a>
         {/* 添加版本超链接 */}
       </div>
       <div className="mid-content">

From 329a9b59c1de36aa1b011eb1ac9186c8f9d11cbe Mon Sep 17 00:00:00 2001
From: shirenchuang <shirenchuang@didiglobal.com>
Date: Thu, 16 Dec 2021 15:08:54 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E5=88=B02.5=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 235e8165..37669f8a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,7 @@
     </parent>
 
     <properties>
-        <kafka-manager.revision>2.4.3-SNAPSHOT</kafka-manager.revision>
+        <kafka-manager.revision>2.5</kafka-manager.revision>
         <swagger2.version>2.7.0</swagger2.version>
         <swagger.version>1.5.13</swagger.version>
 

From 5bc6eb6774c9ce1f7173049a80ad8ffa2ea95c44 Mon Sep 17 00:00:00 2001
From: shirenchuang <shirenchuang@didiglobal.com>
Date: Thu, 16 Dec 2021 18:28:51 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E5=88=B02.5=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 37669f8a..3aecddc6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,9 +32,7 @@
     </properties>
 
     <modules>
-<!--
         <module>kafka-manager-console</module>
--->
         <module>kafka-manager-common</module>
         <module>kafka-manager-dao</module>
         <module>kafka-manager-core</module>

From b5bd6438142c6c7c6581790046b8d00561d3a70d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E8=B6=85?= <joysunchao@didiglobal.com>
Date: Thu, 13 Jan 2022 11:13:26 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E5=A4=A7=E5=B0=8F=E5=86=99=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit ada2718b5e9ac0d150ce9c7c1256aecdbb03d276)
---
 kafka-manager-console/src/container/header/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kafka-manager-console/src/container/header/index.tsx b/kafka-manager-console/src/container/header/index.tsx
index d0b8febe..0205e1be 100644
--- a/kafka-manager-console/src/container/header/index.tsx
+++ b/kafka-manager-console/src/container/header/index.tsx
@@ -7,7 +7,7 @@ import { urlPrefix } from 'constants/left-menu';
 import { region, IRegionIdcs } from 'store/region';
 import logoUrl from '../../assets/image/kafka-logo.png';
 import userIcon from '../../assets/image/normal.png';
-import weChat from '../../assets/image/wechat.png';
+import weChat from '../../assets/image/weChat.png';
 import { users } from 'store/users';
 import { observer } from 'mobx-react';
 import { Link } from 'react-router-dom';

From b9ea3865a5a8933538de5e639971f43b5f2cc3f6 Mon Sep 17 00:00:00 2001
From: shirenchuang <shirenchuang@didiglobal.com>
Date: Thu, 16 Dec 2021 18:28:51 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E5=88=B02.5=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 5bc6eb6774c9ce1f7173049a80ad8ffa2ea95c44)
---
 pom.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 37669f8a..3aecddc6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,9 +32,7 @@
     </properties>
 
     <modules>
-<!--
         <module>kafka-manager-console</module>
--->
         <module>kafka-manager-common</module>
         <module>kafka-manager-dao</module>
         <module>kafka-manager-core</module>