Merge pull request #70 from didi/master

merge master

.gitignore

@@ -108,4 +108,5 @@ workspace.xml
 web/src/main/resources/templates/*
 */out/*
 */dist/*
-.DS_Store
+.DS_Store
\ No newline at end of file
+kafka-manager-web/src/main/resources/templates/*

docs/create_mysql_table.sql

@@ -105,8 +105,6 @@ CREATE TABLE `cluster` (
   `zookeeper` varchar(512) NOT NULL DEFAULT '' COMMENT 'zk地址',
   `bootstrap_servers` varchar(512) NOT NULL DEFAULT '' COMMENT 'server地址',
   `kafka_version` varchar(32) NOT NULL DEFAULT '' COMMENT 'kafka版本',
-  `idc` varchar(64) NOT NULL DEFAULT '' COMMENT '数据中心',
-  `mode` tinyint(4) NOT NULL DEFAULT '0' COMMENT '集群模式, 0:共享, 1:独享, 2:独立',
   `security_properties` text COMMENT '安全认证参数',
   `status` tinyint(4) NOT NULL DEFAULT '1' COMMENT ' 监控标记, 0表示未监控, 1表示监控中',
   `gmt_create` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',

kafka-manager-common/pom.xml

@@ -15,15 +15,23 @@
     </parent>
 
     <properties>
-        <kafka-manager.revision>1.0.0-SNAPSHOT</kafka-manager.revision>
         <maven.test.skip>true</maven.test.skip>
         <downloadSources>true</downloadSources>
         <java_source_version>1.8</java_source_version>
         <java_target_version>1.8</java_target_version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <file_encoding>UTF-8</file_encoding>
+
+        <spring-version>5.1.3.RELEASE</spring-version>
     </properties>
+
     <dependencies>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+            <version>${spring-version}</version>
+        </dependency>
+
         <!-- http -->
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
@@ -42,33 +50,17 @@
             <artifactId>httpmime</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>commons-beanutils</groupId>
-            <artifactId>commons-beanutils</artifactId>
-            <version>1.9.3</version>
-        </dependency>
+        <!-- zookeeper -->
         <dependency>
             <groupId>org.apache.curator</groupId>
             <artifactId>curator-recipes</artifactId>
-            <version>2.10.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.zookeeper</groupId>
             <artifactId>zookeeper</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>fastjson</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.kafka</groupId>
-            <artifactId>kafka_2.10</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
-        </dependency>
 
+        <!-- swagger -->
         <dependency>
             <groupId>io.springfox</groupId>
             <artifactId>springfox-swagger2</artifactId>
@@ -80,18 +72,29 @@
         <dependency>
             <groupId>io.swagger</groupId>
             <artifactId>swagger-annotations</artifactId>
-            <version>1.5.13</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-            <version>5.0.9.RELEASE</version>
-            <scope>compile</scope>
         </dependency>
+
+        <!-- json -->
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.9.7</version>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-beanutils</groupId>
+            <artifactId>commons-beanutils</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.kafka</groupId>
+            <artifactId>kafka_2.10</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>

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

@@ -24,12 +24,6 @@ public class ClusterDTO {
     @ApiModelProperty(value="bootstrap地址")
     private String bootstrapServers;
 
-    @ApiModelProperty(value="kafka版本")
-    private String kafkaVersion;
-
-    @ApiModelProperty(value="集群类型")
-    private Integer mode;
-
     @ApiModelProperty(value="数据中心")
     private String idc;
 
@@ -68,14 +62,6 @@ public class ClusterDTO {
         this.bootstrapServers = bootstrapServers;
     }
 
-    public String getKafkaVersion() {
-        return kafkaVersion;
-    }
-
-    public void setKafkaVersion(String kafkaVersion) {
-        this.kafkaVersion = kafkaVersion;
-    }
-
     public String getIdc() {
         return idc;
     }
@@ -84,14 +70,6 @@ public class ClusterDTO {
         this.idc = idc;
     }
 
-    public Integer getMode() {
-        return mode;
-    }
-
-    public void setMode(Integer mode) {
-        this.mode = mode;
-    }
-
     public String getSecurityProperties() {
         return securityProperties;
     }
@@ -107,9 +85,7 @@ public class ClusterDTO {
                 ", clusterName='" + clusterName + '\'' +
                 ", zookeeper='" + zookeeper + '\'' +
                 ", bootstrapServers='" + bootstrapServers + '\'' +
-                ", kafkaVersion='" + kafkaVersion + '\'' +
                 ", idc='" + idc + '\'' +
-                ", mode='" + mode + '\'' +
                 ", securityProperties='" + securityProperties + '\'' +
                 '}';
     }
@@ -118,7 +94,6 @@ public class ClusterDTO {
         if (ValidateUtils.isNull(clusterName)
                 || ValidateUtils.isNull(zookeeper)
                 || ValidateUtils.isNull(idc)
-                || ValidateUtils.isNull(mode)
                 || ValidateUtils.isNull(bootstrapServers)
                 ) {
             return false;

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

@@ -9,23 +9,19 @@ import java.util.Date;
 public class ClusterDO implements Comparable<ClusterDO> {
     private Long id;
 
-    private Integer status;
-
-    private Date gmtCreate;
-
-    private Date gmtModify;
-
     private String clusterName;
 
     private String zookeeper;
 
     private String bootstrapServers;
 
-    private Integer mode;
-
     private String securityProperties;
 
-    private String kafkaVersion;
+    private Integer status;
+
+    private Date gmtCreate;
+
+    private Date gmtModify;
 
     public Long getId() {
         return id;
@@ -83,14 +79,6 @@ public class ClusterDO implements Comparable<ClusterDO> {
         this.bootstrapServers = bootstrapServers;
     }
 
-    public Integer getMode() {
-        return mode;
-    }
-
-    public void setMode(Integer mode) {
-        this.mode = mode;
-    }
-
     public String getSecurityProperties() {
         return securityProperties;
     }
@@ -99,27 +87,17 @@ public class ClusterDO implements Comparable<ClusterDO> {
         this.securityProperties = securityProperties;
     }
 
-    public String getKafkaVersion() {
-        return kafkaVersion;
-    }
-
-    public void setKafkaVersion(String kafkaVersion) {
-        this.kafkaVersion = kafkaVersion;
-    }
-
     @Override
     public String toString() {
         return "ClusterDO{" +
                 "id=" + id +
-                ", status=" + status +
-                ", gmtCreate=" + gmtCreate +
-                ", gmtModify=" + gmtModify +
                 ", clusterName='" + clusterName + '\'' +
                 ", zookeeper='" + zookeeper + '\'' +
                 ", bootstrapServers='" + bootstrapServers + '\'' +
-                ", mode=" + mode +
                 ", securityProperties='" + securityProperties + '\'' +
-                ", kafkaVersion='" + kafkaVersion + '\'' +
+                ", status=" + status +
+                ", gmtCreate=" + gmtCreate +
+                ", gmtModify=" + gmtModify +
                 '}';
     }
 

kafka-manager-console/pom.xml

@@ -2,13 +2,15 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>kafka-manager-console</artifactId>
+
     <parent>
         <artifactId>kafka-manager</artifactId>
         <groupId>com.xiaojukeji.kafka</groupId>
         <version>2.0.0-SNAPSHOT</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>kafka-manager-console</artifactId>
+
     <build>
         <plugins>
             <plugin>

kafka-manager-core/pom.xml

@@ -24,14 +24,14 @@
         <java_target_version>1.8</java_target_version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <file_encoding>UTF-8</file_encoding>
-        <spring-version>5.0.9.RELEASE</spring-version>
+        <spring-version>5.1.3.RELEASE</spring-version>
     </properties>
 
     <dependencies>
         <dependency>
             <groupId>com.xiaojukeji.kafka</groupId>
             <artifactId>kafka-manager-dao</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
+            <version>${parent.version}</version>
         </dependency>
 
         <!-- spring -->
@@ -56,10 +56,7 @@
             <artifactId>javax.annotation-api</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
-        </dependency>
+        <!-- kafka -->
         <dependency>
             <groupId>org.apache.kafka</groupId>
             <artifactId>kafka_2.10</artifactId>
@@ -68,9 +65,10 @@
             <groupId>org.apache.kafka</groupId>
             <artifactId>kafka-clients</artifactId>
         </dependency>
+
         <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>fastjson</artifactId>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
@@ -80,23 +78,25 @@
         <dependency>
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>
-            <version>1.11</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-util</artifactId>
-            <version>9.2.24.v20180105</version>
         </dependency>
 
         <dependency>
             <groupId>com.github.ben-manes.caffeine</groupId>
             <artifactId>caffeine</artifactId>
-            <version>2.6.2</version>
+        </dependency>
+
+        <!-- json -->
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.9.7</version>
         </dependency>
     </dependencies>
 </project>
\ No newline at end of file

kafka-manager-core/src/main/java/com/xiaojukeji/kafka/manager/service/service/impl/ClusterServiceImpl.java

@@ -288,7 +288,6 @@ public class ClusterServiceImpl implements ClusterService {
         dto.setBootstrapServers(clusterDO.getBootstrapServers());
         dto.setKafkaVersion(physicalClusterMetadataManager.getKafkaVersion(clusterDO.getId()));
         dto.setIdc(configUtils.getIdc());
-        dto.setMode(clusterDO.getMode());
         dto.setSecurityProperties(clusterDO.getSecurityProperties());
         dto.setStatus(clusterDO.getStatus());
         dto.setGmtCreate(clusterDO.getGmtCreate());

kafka-manager-dao/pom.xml

@@ -29,13 +29,12 @@
         <dependency>
             <groupId>com.xiaojukeji.kafka</groupId>
             <artifactId>kafka-manager-common</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
+            <version>${parent.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.mybatis.spring.boot</groupId>
             <artifactId>mybatis-spring-boot-starter</artifactId>
-            <version>1.3.2</version>
         </dependency>
         <dependency>
             <groupId>mysql</groupId>

kafka-manager-dao/src/main/java/com/xiaojukeji/kafka/manager/dao/impl/AccountDaoImpl.java

@@ -50,4 +50,4 @@ public class AccountDaoImpl implements AccountDao {
     public List<AccountDO> searchByNamePrefix(String prefix) {
         return sqlSession.selectList("AccountDao.searchByNamePrefix", prefix);
     }
-}
+}
\ No newline at end of file

kafka-manager-dao/src/main/resources/mapper/ClusterDao.xml

@@ -11,9 +11,7 @@
     <result column="cluster_name"         property="clusterName" />
     <result column="zookeeper"            property="zookeeper" />
     <result column="bootstrap_servers"    property="bootstrapServers" />
-    <result column="mode"                 property="mode" />
     <result column="security_properties"  property="securityProperties" />
-    <result column="kafka_version"        property="kafkaVersion" />
   </resultMap>
 
   <insert id="insert"
@@ -21,9 +19,9 @@
           useGeneratedKeys="true"
           keyProperty="id">
     INSERT INTO cluster (
-      cluster_name, zookeeper, bootstrap_servers, mode, security_properties
+      cluster_name, zookeeper, bootstrap_servers, security_properties
     ) VALUES (
-      #{clusterName}, #{zookeeper}, #{bootstrapServers}, #{mode}, #{securityProperties}
+      #{clusterName}, #{zookeeper}, #{bootstrapServers}, #{securityProperties}
     )
   </insert>
 
@@ -31,7 +29,6 @@
     UPDATE cluster SET
       cluster_name=#{clusterName},
       bootstrap_servers=#{bootstrapServers},
-      mode=#{mode},
       security_properties=#{securityProperties},
       status=#{status}
     WHERE id = #{id}

kafka-manager-extends/kafka-manager-account/pom.xml

@@ -5,6 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>kafka-manager-account</artifactId>
     <version>2.0.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
 
     <parent>
         <artifactId>kafka-manager</artifactId>
@@ -17,12 +18,17 @@
         <dependency>
             <groupId>com.xiaojukeji.kafka</groupId>
             <artifactId>kafka-manager-common</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
+            <version>${parent.version}</version>
         </dependency>
         <dependency>
             <groupId>com.xiaojukeji.kafka</groupId>
             <artifactId>kafka-manager-dao</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
+            <version>${parent.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.xiaojukeji.kafka</groupId>
+            <artifactId>kafka-manager-core</artifactId>
+            <version>${parent.version}</version>
         </dependency>
 
         <dependency>
@@ -33,10 +39,5 @@
             <groupId>com.github.ben-manes.caffeine</groupId>
             <artifactId>caffeine</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.xiaojukeji.kafka</groupId>
-            <artifactId>kafka-manager-core</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
-        </dependency>
     </dependencies>
 </project>
\ No newline at end of file

kafka-manager-extends/kafka-manager-bpm/pom.xml

@@ -2,37 +2,38 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>kafka-manager-bpm</artifactId>
+    <version>2.0.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
+
     <parent>
         <artifactId>kafka-manager</artifactId>
         <groupId>com.xiaojukeji.kafka</groupId>
         <version>2.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>kafka-manager-bpm</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
-    <packaging>jar</packaging>
 
     <dependencies>
         <dependency>
             <groupId>com.xiaojukeji.kafka</groupId>
             <artifactId>kafka-manager-common</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
+            <version>${parent.version}</version>
         </dependency>
         <dependency>
             <groupId>com.xiaojukeji.kafka</groupId>
             <artifactId>kafka-manager-dao</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
+            <version>${parent.version}</version>
         </dependency>
         <dependency>
             <groupId>com.xiaojukeji.kafka</groupId>
             <artifactId>kafka-manager-core</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
+            <version>${parent.version}</version>
         </dependency>
         <dependency>
             <groupId>com.xiaojukeji.kafka</groupId>
             <artifactId>kafka-manager-account</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
+            <version>${parent.version}</version>
         </dependency>
     </dependencies>
 </project>
\ No newline at end of file

kafka-manager-extends/kafka-manager-kcm/pom.xml

@@ -2,6 +2,11 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>kafka-manager-kcm</artifactId>
+    <version>2.0.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
+
     <parent>
         <artifactId>kafka-manager</artifactId>
         <groupId>com.xiaojukeji.kafka</groupId>
@@ -9,49 +14,59 @@
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>kafka-manager-kcm</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
-    <packaging>jar</packaging>
     <description>
-        kafka cluster manager
+        Kafka集群任务管理
     </description>
 
+    <properties>
+        <!-- maven properties -->
+        <maven.test.skip>true</maven.test.skip>
+        <downloadSources>true</downloadSources>
+
+        <!-- compiler settings properties -->
+        <java_source_version>1.8</java_source_version>
+        <java_target_version>1.8</java_target_version>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <file_encoding>UTF-8</file_encoding>
+        <spring-version>5.1.3.RELEASE</spring-version>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>com.xiaojukeji.kafka</groupId>
             <artifactId>kafka-manager-dao</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
+            <version>${parent.version}</version>
         </dependency>
         <dependency>
             <groupId>com.xiaojukeji.kafka</groupId>
             <artifactId>kafka-manager-common</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
+            <version>${parent.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-beans</artifactId>
-            <version>5.0.9.RELEASE</version>
+            <version>${spring-version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
-            <version>5.0.9.RELEASE</version>
+            <version>${spring-version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>
-            <version>5.0.9.RELEASE</version>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
+            <version>${spring-version}</version>
         </dependency>
     </dependencies>
 </project>
\ No newline at end of file

kafka-manager-extends/kafka-manager-monitor/pom.xml

@@ -15,11 +15,24 @@
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
+    <properties>
+        <!-- maven properties -->
+        <maven.test.skip>true</maven.test.skip>
+        <downloadSources>true</downloadSources>
+
+        <!-- compiler settings properties -->
+        <java_source_version>1.8</java_source_version>
+        <java_target_version>1.8</java_target_version>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <file_encoding>UTF-8</file_encoding>
+        <spring-version>5.1.3.RELEASE</spring-version>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>com.xiaojukeji.kafka</groupId>
             <artifactId>kafka-manager-dao</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
+            <version>${parent.version}</version>
         </dependency>
 
         <dependency>
@@ -42,15 +55,16 @@
             <groupId>commons-lang</groupId>
             <artifactId>commons-lang</artifactId>
         </dependency>
+
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-beans</artifactId>
-            <version>5.0.9.RELEASE</version>
+            <version>${spring-version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
-            <version>5.0.9.RELEASE</version>
+            <version>${spring-version}</version>
         </dependency>
     </dependencies>
 </project>
\ No newline at end of file

kafka-manager-extends/kafka-manager-notify/pom.xml

@@ -2,36 +2,53 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.xiaojukeji.kafka</groupId>
+    <artifactId>kafka-manager-notify</artifactId>
+    <version>2.0.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
+
     <parent>
         <artifactId>kafka-manager</artifactId>
         <groupId>com.xiaojukeji.kafka</groupId>
         <version>2.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>kafka-manager-notify</artifactId>
+    <properties>
+        <!-- maven properties -->
+        <maven.test.skip>true</maven.test.skip>
+        <downloadSources>true</downloadSources>
+
+        <!-- compiler settings properties -->
+        <java_source_version>1.8</java_source_version>
+        <java_target_version>1.8</java_target_version>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <file_encoding>UTF-8</file_encoding>
+        <spring-version>5.1.3.RELEASE</spring-version>
+    </properties>
 
     <dependencies>
         <dependency>
             <groupId>com.xiaojukeji.kafka</groupId>
             <artifactId>kafka-manager-common</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
+            <version>${parent.version}</version>
         </dependency>
-
         <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context</artifactId>
-            <version>5.0.9.RELEASE</version>
+            <groupId>com.xiaojukeji.kafka</groupId>
+            <artifactId>kafka-manager-core</artifactId>
+            <version>${parent.version}</version>
         </dependency>
+
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>
         </dependency>
+
         <dependency>
-            <groupId>com.xiaojukeji.kafka</groupId>
-            <artifactId>kafka-manager-core</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+            <version>${spring-version}</version>
         </dependency>
     </dependencies>
 </project>
\ No newline at end of file

kafka-manager-extends/kafka-manager-openapi/pom.xml

@@ -2,6 +2,11 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>kafka-manager-openapi</artifactId>
+    <version>2.0.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
+
     <parent>
         <artifactId>kafka-manager</artifactId>
         <groupId>com.xiaojukeji.kafka</groupId>
@@ -9,27 +14,39 @@
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>kafka-manager-openapi</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
-    <packaging>jar</packaging>
-    <description></description>
+    <properties>
+        <!-- maven properties -->
+        <maven.test.skip>true</maven.test.skip>
+        <downloadSources>true</downloadSources>
+
+        <!-- compiler settings properties -->
+        <java_source_version>1.8</java_source_version>
+        <java_target_version>1.8</java_target_version>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <file_encoding>UTF-8</file_encoding>
+        <spring-version>5.1.3.RELEASE</spring-version>
+    </properties>
+
+    <description>
+        开放接口
+    </description>
 
     <dependencies>
         <dependency>
             <groupId>com.xiaojukeji.kafka</groupId>
             <artifactId>kafka-manager-core</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
+            <version>${parent.version}</version>
         </dependency>
         <dependency>
             <groupId>com.xiaojukeji.kafka</groupId>
             <artifactId>kafka-manager-bpm</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
+            <version>${parent.version}</version>
         </dependency>
+
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
-            <version>5.0.9.RELEASE</version>
+            <version>${spring-version}</version>
         </dependency>
     </dependencies>
 </project>
\ No newline at end of file

kafka-manager-task/pom.xml

@@ -14,32 +14,45 @@
         <version>2.0.0-SNAPSHOT</version>
     </parent>
 
+    <properties>
+        <!-- maven properties -->
+        <maven.test.skip>true</maven.test.skip>
+        <downloadSources>true</downloadSources>
+
+        <!-- compiler settings properties -->
+        <java_source_version>1.8</java_source_version>
+        <java_target_version>1.8</java_target_version>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <file_encoding>UTF-8</file_encoding>
+        <spring-version>5.1.3.RELEASE</spring-version>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>com.xiaojukeji.kafka</groupId>
             <artifactId>kafka-manager-core</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
+            <version>${parent.version}</version>
         </dependency>
         <dependency>
             <groupId>com.xiaojukeji.kafka</groupId>
             <artifactId>kafka-manager-kcm</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
+            <version>${parent.version}</version>
         </dependency>
         <dependency>
             <groupId>com.xiaojukeji.kafka</groupId>
             <artifactId>kafka-manager-monitor</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
+            <version>${parent.version}</version>
         </dependency>
         <dependency>
             <groupId>com.xiaojukeji.kafka</groupId>
             <artifactId>kafka-manager-bpm</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
+            <version>${parent.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
-            <version>5.0.9.RELEASE</version>
+            <version>${spring-version}</version>
         </dependency>
     </dependencies>
 </project>
\ No newline at end of file

kafka-manager-web/pom.xml

@@ -16,9 +16,8 @@
     <properties>
         <java_source_version>1.8</java_source_version>
         <java_target_version>1.8</java_target_version>
-        <!--<swagger2.version>2.7.0</swagger2.version>-->
-
         <springframework.boot.version>2.1.1.RELEASE</springframework.boot.version>
+        <spring-version>5.1.3.RELEASE</spring-version>
         <failOnMissingWebXml>false</failOnMissingWebXml>
     </properties>
 
@@ -26,27 +25,27 @@
         <dependency>
             <groupId>com.xiaojukeji.kafka</groupId>
             <artifactId>kafka-manager-core</artifactId>
-            <version>${project.parent.version}</version>
+            <version>${parent.version}</version>
         </dependency>
         <dependency>
             <groupId>com.xiaojukeji.kafka</groupId>
             <artifactId>kafka-manager-kcm</artifactId>
-            <version>${project.parent.version}</version>
+            <version>${parent.version}</version>
         </dependency>
         <dependency>
             <groupId>com.xiaojukeji.kafka</groupId>
             <artifactId>kafka-manager-task</artifactId>
-            <version>${project.parent.version}</version>
+            <version>${parent.version}</version>
         </dependency>
         <dependency>
             <groupId>com.xiaojukeji.kafka</groupId>
             <artifactId>kafka-manager-monitor</artifactId>
-            <version>${project.parent.version}</version>
+            <version>${parent.version}</version>
         </dependency>
         <dependency>
             <groupId>com.xiaojukeji.kafka</groupId>
             <artifactId>kafka-manager-openapi</artifactId>
-            <version>${project.parent.version}</version>
+            <version>${parent.version}</version>
         </dependency>
         <dependency>
             <groupId>com.xiaojukeji.kafka</groupId>
@@ -104,7 +103,7 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context-support</artifactId>
-            <version>5.0.9.RELEASE</version>
+            <version>${spring-version}</version>
         </dependency>
     </dependencies>
 
@@ -122,30 +121,6 @@
                     </execution>
                 </executions>
             </plugin>
-
-            <!--<plugin>-->
-                <!--<artifactId>maven-resources-plugin</artifactId>-->
-                <!--<version>2.5</version>-->
-                <!--<executions>-->
-                    <!--<execution>-->
-                        <!--<id>copy-resources</id>-->
-                        <!--<phase>validate</phase>-->
-                        <!--<goals>-->
-                            <!--<goal>copy-resources</goal>-->
-                        <!--</goals>-->
-                        <!--<configuration>-->
-                            <!--<outputDirectory>src/main/resources/templates</outputDirectory>-->
-                            <!--<overwrite>true</overwrite>-->
-                            <!--<resources>-->
-                                <!--<resource>-->
-                                    <!--<directory>../console/dist</directory>-->
-                                    <!--<filtering>true</filtering>-->
-                                <!--</resource>-->
-                            <!--</resources>-->
-                        <!--</configuration>-->
-                    <!--</execution>-->
-                <!--</executions>-->
-            <!--</plugin>-->
         </plugins>
     </build>
 </project>

kafka-manager-web/src/main/java/com/xiaojukeji/kafka/manager/web/api/versionone/op/OpClusterController.java

@@ -27,13 +27,13 @@ public class OpClusterController {
     @ApiOperation(value = "接入集群")
     @RequestMapping(value = "clusters", method = RequestMethod.POST)
     @ResponseBody
-    public Result addNew(@RequestBody ClusterDTO reqObj) {
-        if (ValidateUtils.isNull(reqObj) || !reqObj.legal()) {
+    public Result addNew(@RequestBody ClusterDTO dto) {
+        if (ValidateUtils.isNull(dto) || !dto.legal()) {
             return Result.buildFrom(ResultStatus.PARAM_ILLEGAL);
         }
         return Result.buildFrom(
                 clusterService.addNew(
-                        ClusterModelConverter.convert2ClusterDO(reqObj),
+                        ClusterModelConverter.convert2ClusterDO(dto),
                         SpringTool.getUserName()
                 )
         );

pom.xml

@@ -11,14 +11,14 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.0.5.RELEASE</version>  <!-- 莫要修改该版本, 否则可能会导致自自定义的schedule不生效 -->
+        <version>2.1.1.RELEASE</version>  <!-- 莫要修改该版本, 否则可能会导致自自定义的schedule不生效 -->
         <!--<relativePath/>-->
     </parent>
 
     <properties>
-        <kafka-manager.revision>1.0.0-SNAPSHOT</kafka-manager.revision>
-        <jackson.version>2.9.7</jackson.version>
+        <kafka-manager.revision>2.0.0-SNAPSHOT</kafka-manager.revision>
         <swagger2.version>2.7.0</swagger2.version>
+        <swagger.version>1.5.13</swagger.version>
 
         <!-- maven properties -->
         <maven.test.skip>true</maven.test.skip>
@@ -57,6 +57,11 @@
                 <artifactId>springfox-swagger-ui</artifactId>
                 <version>${swagger2.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.swagger</groupId>
+                <artifactId>swagger-annotations</artifactId>
+                <version>${swagger.version}</version>
+            </dependency>
 
             <!-- javax -->
             <dependency>
@@ -109,6 +114,11 @@
                 <artifactId>mybatis-spring</artifactId>
                 <version>1.3.2</version>
             </dependency>
+            <dependency>
+                <groupId>org.mybatis.spring.boot</groupId>
+                <artifactId>mybatis-spring-boot-starter</artifactId>
+                <version>1.3.2</version>
+            </dependency>
 
             <!-- kafka -->
             <dependency>
@@ -128,12 +138,19 @@
                 <version>0.10.2.2</version>
             </dependency>
 
-            <!-- commons -->
+            <!-- json -->
             <dependency>
                 <groupId>com.alibaba</groupId>
                 <artifactId>fastjson</artifactId>
                 <version>1.2.70</version>
             </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.core</groupId>
+                <artifactId>jackson-databind</artifactId>
+                <version>2.9.10.5</version>
+            </dependency>
+
+            <!-- commons -->
             <dependency>
                 <groupId>org.apache.zookeeper</groupId>
                 <artifactId>zookeeper</artifactId>
@@ -176,6 +193,36 @@
                 <artifactId>commons-pool2</artifactId>
                 <version>2.6.2</version>
             </dependency>
+
+            <dependency>
+                <groupId>commons-codec</groupId>
+                <artifactId>commons-codec</artifactId>
+                <version>1.11</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-util</artifactId>
+                <version>9.2.24.v20180105</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.github.ben-manes.caffeine</groupId>
+                <artifactId>caffeine</artifactId>
+                <version>2.6.2</version>
+            </dependency>
+
+            <dependency>
+                <groupId>commons-beanutils</groupId>
+                <artifactId>commons-beanutils</artifactId>
+                <version>1.9.3</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.curator</groupId>
+                <artifactId>curator-recipes</artifactId>
+                <version>2.10.0</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 </project>
\ No newline at end of file