8x48/KnowStreaming
1
0
Fork 0
mirror of https://github.com/didi/KnowStreaming.git synced 2025-12-24 11:52:08 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

统一pom包版本

Browse Source
This commit is contained in:
zengqiao
2020-09-29 17:25:04 +08:00
parent 788468054a
commit 1a4ef3d9c1
21 changed files with 265 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
kafka-manager-web/pom.xml
View File

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

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

@@ -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()
)
);