Merge branch 'master' into dev

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">

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>
 
@@ -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>