diff --git a/.gitignore b/.gitignore
index 2b668f4e093d3ca14e3f1a1062d95d1351f024e1..1ccf7caf8b6b61aa77d32529d4782cd793963624 100644
--- a/.gitignore
+++ b/.gitignore
@@ -108,4 +108,5 @@ workspace.xml
web/src/main/resources/templates/*
*/out/*
*/dist/*
-.DS_Store
\ No newline at end of file
+.DS_Store
+kafka-manager-web/src/main/resources/templates/*
diff --git a/docs/create_mysql_table.sql b/docs/create_mysql_table.sql
index 9b4bfe35556b549b2a22a799e02229f021e0f597..0a89247f0b98305ff60272e698fe8d47e9c895d9 100644
--- a/docs/create_mysql_table.sql
+++ b/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 '创建时间',
diff --git a/kafka-manager-common/pom.xml b/kafka-manager-common/pom.xml
index 2782e5eb98a1d9f53b8c3f78a46e7372cd9d2a83..daf647a7538b68bd75eabc063fa9b5393c1e655f 100644
--- a/kafka-manager-common/pom.xml
+++ b/kafka-manager-common/pom.xml
@@ -15,15 +15,23 @@
- 1.0.0-SNAPSHOT
true
true
1.8
1.8
UTF-8
UTF-8
+
+ 5.1.3.RELEASE
+
+
+ org.springframework
+ spring-web
+ ${spring-version}
+
+
org.apache.httpcomponents
@@ -42,33 +50,17 @@
httpmime
-
- commons-beanutils
- commons-beanutils
- 1.9.3
-
+
org.apache.curator
curator-recipes
- 2.10.0
org.apache.zookeeper
zookeeper
-
- com.alibaba
- fastjson
-
-
- org.apache.kafka
- kafka_2.10
-
-
- commons-lang
- commons-lang
-
+
io.springfox
springfox-swagger2
@@ -80,18 +72,29 @@
io.swagger
swagger-annotations
- 1.5.13
-
-
- org.springframework
- spring-web
- 5.0.9.RELEASE
- compile
+
+
com.fasterxml.jackson.core
jackson-databind
- 2.9.7
+
+
+ com.alibaba
+ fastjson
+
+
+
+ commons-beanutils
+ commons-beanutils
+
+
+ org.apache.kafka
+ kafka_2.10
+
+
+ commons-lang
+ commons-lang
org.apache.commons
diff --git a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/dto/rd/ClusterDTO.java b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/dto/rd/ClusterDTO.java
index 666ef6f701218d5d07706a6bde94d0d74da47854..c28bc8b615adc79b42d2e8992ec03942256ab66e 100644
--- a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/dto/rd/ClusterDTO.java
+++ b/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;
diff --git a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/pojo/ClusterDO.java b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/pojo/ClusterDO.java
index a594af33c793c79ca6be448a8af9c6a8e9195ec4..cefbc9f2dbf1b135eabc33680feb02538e0a3350 100644
--- a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/pojo/ClusterDO.java
+++ b/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 {
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 {
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 {
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 +
'}';
}
diff --git a/kafka-manager-console/pom.xml b/kafka-manager-console/pom.xml
index bebd6f93afb6199288fc6ec593fed6be31ad829a..81b4e933040fc4ee1da6ed75f7ee0d94f5adb1ee 100644
--- a/kafka-manager-console/pom.xml
+++ b/kafka-manager-console/pom.xml
@@ -2,13 +2,15 @@
+ 4.0.0
+ kafka-manager-console
+
kafka-manager
com.xiaojukeji.kafka
2.0.0-SNAPSHOT
- 4.0.0
- kafka-manager-console
+
diff --git a/kafka-manager-core/pom.xml b/kafka-manager-core/pom.xml
index 3729c1c2e70ff6041c6e804a5b4603fd8cd7aca8..8bcc9293bc00823934aaed4e9bc2da6fd72963aa 100644
--- a/kafka-manager-core/pom.xml
+++ b/kafka-manager-core/pom.xml
@@ -24,14 +24,14 @@
1.8
UTF-8
UTF-8
- 5.0.9.RELEASE
+ 5.1.3.RELEASE
com.xiaojukeji.kafka
kafka-manager-dao
- 2.0.0-SNAPSHOT
+ ${parent.version}
@@ -56,10 +56,7 @@
javax.annotation-api
-
- commons-lang
- commons-lang
-
+
org.apache.kafka
kafka_2.10
@@ -68,9 +65,10 @@
org.apache.kafka
kafka-clients
+
- com.alibaba
- fastjson
+ commons-lang
+ commons-lang
junit
@@ -80,23 +78,25 @@
commons-codec
commons-codec
- 1.11
org.eclipse.jetty
jetty-util
- 9.2.24.v20180105
com.github.ben-manes.caffeine
caffeine
- 2.6.2
+
+
+
+
+ com.alibaba
+ fastjson
com.fasterxml.jackson.core
jackson-databind
- 2.9.7
\ No newline at end of file
diff --git a/kafka-manager-core/src/main/java/com/xiaojukeji/kafka/manager/service/service/impl/ClusterServiceImpl.java b/kafka-manager-core/src/main/java/com/xiaojukeji/kafka/manager/service/service/impl/ClusterServiceImpl.java
index 469304361fe78fc03d516139fffdc655f8437ce9..4b3d3f9e841ca93f175b5fb3f5f934294461c24e 100644
--- a/kafka-manager-core/src/main/java/com/xiaojukeji/kafka/manager/service/service/impl/ClusterServiceImpl.java
+++ b/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());
diff --git a/kafka-manager-dao/pom.xml b/kafka-manager-dao/pom.xml
index f96a90a8a72559365906c56aa7a397606570fa51..e6c66272ff6f866358de03a789b2b845d5871a6f 100644
--- a/kafka-manager-dao/pom.xml
+++ b/kafka-manager-dao/pom.xml
@@ -29,13 +29,12 @@
com.xiaojukeji.kafka
kafka-manager-common
- 2.0.0-SNAPSHOT
+ ${parent.version}
org.mybatis.spring.boot
mybatis-spring-boot-starter
- 1.3.2
mysql
diff --git a/kafka-manager-dao/src/main/java/com/xiaojukeji/kafka/manager/dao/impl/AccountDaoImpl.java b/kafka-manager-dao/src/main/java/com/xiaojukeji/kafka/manager/dao/impl/AccountDaoImpl.java
index 5e5d0136542034576fe3246170e1cec5c44c96ac..5a69b79c94ca91ed75db9c09f915b965ce2f9ae7 100644
--- a/kafka-manager-dao/src/main/java/com/xiaojukeji/kafka/manager/dao/impl/AccountDaoImpl.java
+++ b/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 searchByNamePrefix(String prefix) {
return sqlSession.selectList("AccountDao.searchByNamePrefix", prefix);
}
-}
+}
\ No newline at end of file
diff --git a/kafka-manager-dao/src/main/resources/mapper/ClusterDao.xml b/kafka-manager-dao/src/main/resources/mapper/ClusterDao.xml
index 2033062a7e0679fa8220e0ba9a2e87ba6073f0b4..e5b1747be7e01c27f1ce7d6533771eab2a620103 100644
--- a/kafka-manager-dao/src/main/resources/mapper/ClusterDao.xml
+++ b/kafka-manager-dao/src/main/resources/mapper/ClusterDao.xml
@@ -11,9 +11,7 @@
-
-
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}
)
@@ -31,7 +29,6 @@
UPDATE cluster SET
cluster_name=#{clusterName},
bootstrap_servers=#{bootstrapServers},
- mode=#{mode},
security_properties=#{securityProperties},
status=#{status}
WHERE id = #{id}
diff --git a/kafka-manager-extends/kafka-manager-account/pom.xml b/kafka-manager-extends/kafka-manager-account/pom.xml
index 853db05342de03c4b6cdb23f038aed1e0a486f82..08c0047ed0258d22de58e86be1c221d437c01aea 100644
--- a/kafka-manager-extends/kafka-manager-account/pom.xml
+++ b/kafka-manager-extends/kafka-manager-account/pom.xml
@@ -5,6 +5,7 @@
4.0.0
kafka-manager-account
2.0.0-SNAPSHOT
+ jar
kafka-manager
@@ -17,12 +18,17 @@
com.xiaojukeji.kafka
kafka-manager-common
- 2.0.0-SNAPSHOT
+ ${parent.version}
com.xiaojukeji.kafka
kafka-manager-dao
- 2.0.0-SNAPSHOT
+ ${parent.version}
+
+
+ com.xiaojukeji.kafka
+ kafka-manager-core
+ ${parent.version}
@@ -33,10 +39,5 @@
com.github.ben-manes.caffeine
caffeine
-
- com.xiaojukeji.kafka
- kafka-manager-core
- 2.0.0-SNAPSHOT
-
\ No newline at end of file
diff --git a/kafka-manager-extends/kafka-manager-bpm/pom.xml b/kafka-manager-extends/kafka-manager-bpm/pom.xml
index 970ed822ca64204ad00338cebcb6ddf84edcd613..e8fb5f5d6212964c907361d4cf5dddb22acaf86f 100644
--- a/kafka-manager-extends/kafka-manager-bpm/pom.xml
+++ b/kafka-manager-extends/kafka-manager-bpm/pom.xml
@@ -2,37 +2,38 @@
+ 4.0.0
+ kafka-manager-bpm
+ 2.0.0-SNAPSHOT
+ jar
+
kafka-manager
com.xiaojukeji.kafka
2.0.0-SNAPSHOT
../../pom.xml
- 4.0.0
- kafka-manager-bpm
- 2.0.0-SNAPSHOT
- jar
com.xiaojukeji.kafka
kafka-manager-common
- 2.0.0-SNAPSHOT
+ ${parent.version}
com.xiaojukeji.kafka
kafka-manager-dao
- 2.0.0-SNAPSHOT
+ ${parent.version}
com.xiaojukeji.kafka
kafka-manager-core
- 2.0.0-SNAPSHOT
+ ${parent.version}
com.xiaojukeji.kafka
kafka-manager-account
- 2.0.0-SNAPSHOT
+ ${parent.version}
\ No newline at end of file
diff --git a/kafka-manager-extends/kafka-manager-kcm/pom.xml b/kafka-manager-extends/kafka-manager-kcm/pom.xml
index 9b2ae2073939af5cd6e2c7e144b6bf85d1352a07..413ee056663df133ae22b1f54b351b36cf66c9ec 100644
--- a/kafka-manager-extends/kafka-manager-kcm/pom.xml
+++ b/kafka-manager-extends/kafka-manager-kcm/pom.xml
@@ -2,6 +2,11 @@
+ 4.0.0
+ kafka-manager-kcm
+ 2.0.0-SNAPSHOT
+ jar
+
kafka-manager
com.xiaojukeji.kafka
@@ -9,49 +14,59 @@
../../pom.xml
- 4.0.0
- kafka-manager-kcm
- 2.0.0-SNAPSHOT
- jar
- kafka cluster manager
+ Kafka集群任务管理
+
+
+ true
+ true
+
+
+ 1.8
+ 1.8
+ UTF-8
+ UTF-8
+ 5.1.3.RELEASE
+
+
com.xiaojukeji.kafka
kafka-manager-dao
- 2.0.0-SNAPSHOT
+ ${parent.version}
com.xiaojukeji.kafka
kafka-manager-common
- 2.0.0-SNAPSHOT
+ ${parent.version}
org.slf4j
slf4j-api
+
+ junit
+ junit
+ test
+
+
org.springframework
spring-beans
- 5.0.9.RELEASE
+ ${spring-version}
org.springframework
spring-context
- 5.0.9.RELEASE
+ ${spring-version}
org.springframework
spring-test
- 5.0.9.RELEASE
-
-
- junit
- junit
- test
+ ${spring-version}
\ No newline at end of file
diff --git a/kafka-manager-extends/kafka-manager-monitor/pom.xml b/kafka-manager-extends/kafka-manager-monitor/pom.xml
index acd4657ec77d44d9b8299d6e1ee40fdb3da23017..a059261389db465f072cf7665131b2d162ffb87c 100644
--- a/kafka-manager-extends/kafka-manager-monitor/pom.xml
+++ b/kafka-manager-extends/kafka-manager-monitor/pom.xml
@@ -15,11 +15,24 @@
../../pom.xml
+
+
+ true
+ true
+
+
+ 1.8
+ 1.8
+ UTF-8
+ UTF-8
+ 5.1.3.RELEASE
+
+
com.xiaojukeji.kafka
kafka-manager-dao
- 2.0.0-SNAPSHOT
+ ${parent.version}
@@ -42,15 +55,16 @@
commons-lang
commons-lang
+
org.springframework
spring-beans
- 5.0.9.RELEASE
+ ${spring-version}
org.springframework
spring-context
- 5.0.9.RELEASE
+ ${spring-version}
\ No newline at end of file
diff --git a/kafka-manager-extends/kafka-manager-notify/pom.xml b/kafka-manager-extends/kafka-manager-notify/pom.xml
index 78b0615c0f435cdb057c22544839a342cb0643be..f0a80446fe3675ccc2bf8bb0a53c3946bda2ce6a 100644
--- a/kafka-manager-extends/kafka-manager-notify/pom.xml
+++ b/kafka-manager-extends/kafka-manager-notify/pom.xml
@@ -2,36 +2,53 @@
+ 4.0.0
+ com.xiaojukeji.kafka
+ kafka-manager-notify
+ 2.0.0-SNAPSHOT
+ jar
+
kafka-manager
com.xiaojukeji.kafka
2.0.0-SNAPSHOT
../../pom.xml
- 4.0.0
- kafka-manager-notify
+
+
+ true
+ true
+
+
+ 1.8
+ 1.8
+ UTF-8
+ UTF-8
+ 5.1.3.RELEASE
+
com.xiaojukeji.kafka
kafka-manager-common
- 2.0.0-SNAPSHOT
+ ${parent.version}
-
- org.springframework
- spring-context
- 5.0.9.RELEASE
+ com.xiaojukeji.kafka
+ kafka-manager-core
+ ${parent.version}
+
com.alibaba
fastjson
+
- com.xiaojukeji.kafka
- kafka-manager-core
- 2.0.0-SNAPSHOT
+ org.springframework
+ spring-context
+ ${spring-version}
\ No newline at end of file
diff --git a/kafka-manager-extends/kafka-manager-openapi/pom.xml b/kafka-manager-extends/kafka-manager-openapi/pom.xml
index 6b8388d0714243f98e58182ad28780313a9ce9c2..2ee65bc4163eb5b4ecea207722d2155d022751df 100644
--- a/kafka-manager-extends/kafka-manager-openapi/pom.xml
+++ b/kafka-manager-extends/kafka-manager-openapi/pom.xml
@@ -2,6 +2,11 @@
+ 4.0.0
+ kafka-manager-openapi
+ 2.0.0-SNAPSHOT
+ jar
+
kafka-manager
com.xiaojukeji.kafka
@@ -9,27 +14,39 @@
../../pom.xml
- 4.0.0
- kafka-manager-openapi
- 2.0.0-SNAPSHOT
- jar
-
+
+
+ true
+ true
+
+
+ 1.8
+ 1.8
+ UTF-8
+ UTF-8
+ 5.1.3.RELEASE
+
+
+
+ 开放接口
+
com.xiaojukeji.kafka
kafka-manager-core
- 2.0.0-SNAPSHOT
+ ${parent.version}
com.xiaojukeji.kafka
kafka-manager-bpm
- 2.0.0-SNAPSHOT
+ ${parent.version}
+
org.springframework
spring-context
- 5.0.9.RELEASE
+ ${spring-version}
\ No newline at end of file
diff --git a/kafka-manager-task/pom.xml b/kafka-manager-task/pom.xml
index 1deb38461ef1a5e366fe0e3a98b525e84ebd6801..f0b9c4840e956095b3fd6082b165c5cbf9dd7cf6 100644
--- a/kafka-manager-task/pom.xml
+++ b/kafka-manager-task/pom.xml
@@ -14,32 +14,45 @@
2.0.0-SNAPSHOT
+
+
+ true
+ true
+
+
+ 1.8
+ 1.8
+ UTF-8
+ UTF-8
+ 5.1.3.RELEASE
+
+
com.xiaojukeji.kafka
kafka-manager-core
- 2.0.0-SNAPSHOT
+ ${parent.version}
com.xiaojukeji.kafka
kafka-manager-kcm
- 2.0.0-SNAPSHOT
+ ${parent.version}
com.xiaojukeji.kafka
kafka-manager-monitor
- 2.0.0-SNAPSHOT
+ ${parent.version}
com.xiaojukeji.kafka
kafka-manager-bpm
- 2.0.0-SNAPSHOT
+ ${parent.version}
org.springframework
spring-context
- 5.0.9.RELEASE
+ ${spring-version}
\ No newline at end of file
diff --git a/kafka-manager-web/pom.xml b/kafka-manager-web/pom.xml
index 189bf21bcae25e78de1215ab6058d4e6c607fc98..ff7bd8b779b8ed009b7a25b7c1ad2d31dd917478 100644
--- a/kafka-manager-web/pom.xml
+++ b/kafka-manager-web/pom.xml
@@ -16,9 +16,8 @@
1.8
1.8
-
-
2.1.1.RELEASE
+ 5.1.3.RELEASE
false
@@ -26,27 +25,27 @@
com.xiaojukeji.kafka
kafka-manager-core
- ${project.parent.version}
+ ${parent.version}
com.xiaojukeji.kafka
kafka-manager-kcm
- ${project.parent.version}
+ ${parent.version}
com.xiaojukeji.kafka
kafka-manager-task
- ${project.parent.version}
+ ${parent.version}
com.xiaojukeji.kafka
kafka-manager-monitor
- ${project.parent.version}
+ ${parent.version}
com.xiaojukeji.kafka
kafka-manager-openapi
- ${project.parent.version}
+ ${parent.version}
com.xiaojukeji.kafka
@@ -104,7 +103,7 @@
org.springframework
spring-context-support
- 5.0.9.RELEASE
+ ${spring-version}
@@ -122,30 +121,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/kafka-manager-web/src/main/java/com/xiaojukeji/kafka/manager/web/api/versionone/op/OpClusterController.java b/kafka-manager-web/src/main/java/com/xiaojukeji/kafka/manager/web/api/versionone/op/OpClusterController.java
index 2c75bfd114083883e932d83a0f2349212ed3b10f..21547aa95566d329fb066d2d31b837073da90003 100644
--- a/kafka-manager-web/src/main/java/com/xiaojukeji/kafka/manager/web/api/versionone/op/OpClusterController.java
+++ b/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()
)
);
diff --git a/pom.xml b/pom.xml
index 423265eedd3b920bd480b9bd8cace33a53c5a46f..4000bdf735535bd2163805b48ec8396fcbc5ae41 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,14 +11,14 @@
org.springframework.boot
spring-boot-starter-parent
- 2.0.5.RELEASE
+ 2.1.1.RELEASE
- 1.0.0-SNAPSHOT
- 2.9.7
+ 2.0.0-SNAPSHOT
2.7.0
+ 1.5.13
true
@@ -57,6 +57,11 @@
springfox-swagger-ui
${swagger2.version}
+
+ io.swagger
+ swagger-annotations
+ ${swagger.version}
+
@@ -109,6 +114,11 @@
mybatis-spring
1.3.2
+
+ org.mybatis.spring.boot
+ mybatis-spring-boot-starter
+ 1.3.2
+
@@ -128,12 +138,19 @@
0.10.2.2
-
+
com.alibaba
fastjson
1.2.70
+
+ com.fasterxml.jackson.core
+ jackson-databind
+ 2.9.10.5
+
+
+
org.apache.zookeeper
zookeeper
@@ -176,6 +193,36 @@
commons-pool2
2.6.2
+
+
+ commons-codec
+ commons-codec
+ 1.11
+
+
+
+ org.eclipse.jetty
+ jetty-util
+ 9.2.24.v20180105
+
+
+
+ com.github.ben-manes.caffeine
+ caffeine
+ 2.6.2
+
+
+
+ commons-beanutils
+ commons-beanutils
+ 1.9.3
+
+
+
+ org.apache.curator
+ curator-recipes
+ 2.10.0
+
\ No newline at end of file