合并Master分支

2025-12-24 11:52:08 +08:00 · 2023-07-07 13:09:28 +08:00
parent 9f6882cf0d 42195c3180
commit b1aa12bfa5
108 changed files with 2418 additions and 926 deletions
--- a/km-rest/pom.xml
+++ b/km-rest/pom.xml
@@ -4,13 +4,13 @@
         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>km-rest</artifactId>
-    <version>${km.revision}</version>
+    <version>${revision}</version>
    <packaging>jar</packaging>

    <parent>
        <artifactId>km</artifactId>
        <groupId>com.xiaojukeji.kafka</groupId>
-        <version>${km.revision}</version>
+        <version>${revision}</version>
    </parent>

    <properties>
--- a/km-rest/src/main/java/com/xiaojukeji/know/streaming/km/rest/api/v3/connect/KafkaConnectorController.java
+++ b/km-rest/src/main/java/com/xiaojukeji/know/streaming/km/rest/api/v3/connect/KafkaConnectorController.java
@@ -14,6 +14,7 @@ import com.xiaojukeji.know.streaming.km.common.constant.ApiPrefix;
 import com.xiaojukeji.know.streaming.km.common.constant.Constant;
 import com.xiaojukeji.know.streaming.km.common.enums.connect.ConnectActionEnum;
 import com.xiaojukeji.know.streaming.km.common.utils.ConvertUtil;
+import com.xiaojukeji.know.streaming.km.common.utils.ValidateUtils;
 import com.xiaojukeji.know.streaming.km.core.service.connect.connector.ConnectorService;
 import com.xiaojukeji.know.streaming.km.core.service.connect.plugin.PluginService;
 import io.swagger.annotations.Api;
@@ -44,6 +45,10 @@ public class KafkaConnectorController {
    @PostMapping(value = "connectors")
    @ResponseBody
    public Result<Void> createConnector(@Validated @RequestBody ConnectorCreateDTO dto) {
+        if (ValidateUtils.isNull(dto.getSuitableConfig())) {
+            return Result.buildFromRSAndMsg(ResultStatus.PARAM_ILLEGAL, "config字段不能为空");
+        }
+
        return connectorManager.createConnector(dto, HttpRequestUtil.getOperator());
    }

@@ -73,14 +78,27 @@ public class KafkaConnectorController {
    @PutMapping(value ="connectors-config")
    @ResponseBody
    public Result<Void> modifyConnectors(@Validated @RequestBody ConnectorCreateDTO dto) {
-        return connectorManager.updateConnectorConfig(dto.getConnectClusterId(), dto.getConnectorName(), dto.getConfigs(), HttpRequestUtil.getOperator());
+        if (ValidateUtils.isNull(dto.getSuitableConfig())) {
+            return Result.buildFromRSAndMsg(ResultStatus.PARAM_ILLEGAL, "config字段不能为空");
+        }
+
+        return connectorManager.updateConnectorConfig(
+                dto.getConnectClusterId(),
+                dto.getConnectorName(),
+                dto.getSuitableConfig(),
+                HttpRequestUtil.getOperator()
+        );
    }

    @ApiOperation(value = "校验Connector配置", notes = "")
    @PutMapping(value ="connectors-config/validate")
    @ResponseBody
    public Result<ConnectConfigInfosVO> validateConnectors(@Validated @RequestBody ConnectorCreateDTO dto) {
-        Result<ConnectConfigInfos> infoResult = pluginService.validateConfig(dto.getConnectClusterId(), dto.getConfigs());
+        if (ValidateUtils.isNull(dto.getSuitableConfig())) {
+            return Result.buildFromRSAndMsg(ResultStatus.PARAM_ILLEGAL, "config字段不能为空");
+        }
+
+        Result<ConnectConfigInfos> infoResult = pluginService.validateConfig(dto.getConnectClusterId(), dto.getSuitableConfig());
        if (infoResult.failed()) {
            return Result.buildFromIgnoreData(infoResult);
        }
--- a/km-rest/src/main/java/com/xiaojukeji/know/streaming/km/rest/api/v3/group/GroupController.java
+++ b/km-rest/src/main/java/com/xiaojukeji/know/streaming/km/rest/api/v3/group/GroupController.java
@@ -2,6 +2,7 @@ package com.xiaojukeji.know.streaming.km.rest.api.v3.group;

 import com.didiglobal.logi.security.util.HttpRequestUtil;
 import com.xiaojukeji.know.streaming.km.biz.group.GroupManager;
+import com.xiaojukeji.know.streaming.km.common.bean.dto.group.GroupOffsetDeleteDTO;
 import com.xiaojukeji.know.streaming.km.common.bean.dto.group.GroupOffsetResetDTO;
 import com.xiaojukeji.know.streaming.km.common.bean.dto.group.GroupTopicConsumedDTO;
 import com.xiaojukeji.know.streaming.km.common.bean.entity.result.PaginationResult;
@@ -32,13 +33,20 @@ public class GroupController {
    @Autowired
    private GroupService groupService;

-    @ApiOperation(value = "重置组消费偏移", notes = "")
+    @ApiOperation(value = "重置消费偏移", notes = "")
    @PutMapping(value = "group-offsets")
    @ResponseBody
    public Result<Void> resetGroupOffsets(@Validated @RequestBody GroupOffsetResetDTO dto) throws Exception {
        return groupManager.resetGroupOffsets(dto, HttpRequestUtil.getOperator());
    }

+    @ApiOperation(value = "删除消费偏移", notes = "")
+    @DeleteMapping(value = "group-offsets")
+    @ResponseBody
+    public Result<Void> deleteGroupOffsets(@Validated @RequestBody GroupOffsetDeleteDTO dto) throws Exception {
+        return groupManager.deleteGroupOffsets(dto, HttpRequestUtil.getOperator());
+    }
+
    @ApiOperation(value = "Group-Topic指标信息", notes = "")
    @PostMapping(value = "clusters/{clusterId}/topics/{topicName}/groups/{groupName}/metric")
    @ResponseBody
--- a/km-rest/src/main/java/com/xiaojukeji/know/streaming/km/rest/api/v3/topic/TopicController.java
+++ b/km-rest/src/main/java/com/xiaojukeji/know/streaming/km/rest/api/v3/topic/TopicController.java
@@ -61,6 +61,13 @@ public class TopicController {
        return opTopicManager.expandTopic(dto, HttpRequestUtil.getOperator());
    }

+    @ApiOperation(value = "Topic数据清空", notes = "")
+    @PostMapping(value = "topics/truncate-topic")
+    @ResponseBody
+    public Result<Void> truncateTopic(@Validated @RequestBody ClusterTopicDTO dto) {
+        return opTopicManager.truncateTopic(dto.getClusterId(), dto.getTopicName(), HttpRequestUtil.getOperator());
+    }
+
    @ApiOperation(value = "Topic元信息", notes = "带是否存在信息")
    @GetMapping(value = "clusters/{clusterPhyId}/topics/{topicName}/metadata-combine-exist")
    @ResponseBody
--- a/km-rest/src/main/java/com/xiaojukeji/know/streaming/km/rest/api/v3/topic/TopicStateController.java
+++ b/km-rest/src/main/java/com/xiaojukeji/know/streaming/km/rest/api/v3/topic/TopicStateController.java
@@ -74,7 +74,7 @@ public class TopicStateController {
    @GetMapping(value = "clusters/{clusterPhyId}/topics/{topicName}/brokers-partitions-summary")
    @ResponseBody
    public Result<TopicBrokersPartitionsSummaryVO> getTopicBrokersPartitionsSummary(@PathVariable Long clusterPhyId,
-                                                                                    @PathVariable String topicName) throws Exception {
+                                                                                    @PathVariable String topicName) {
        return topicStateManager.getTopicBrokersPartitionsSummary(clusterPhyId, topicName);
    }

@@ -83,7 +83,7 @@ public class TopicStateController {
    @ResponseBody
    public Result<List<TopicPartitionVO>> getTopicPartitions(@PathVariable Long clusterPhyId,
                                                             @PathVariable String topicName,
-                                                             @RequestBody List<String> metricsNames) throws Exception {
+                                                             @RequestBody List<String> metricsNames) {
        return topicStateManager.getTopicPartitions(clusterPhyId, topicName, metricsNames);
    }

--- a/km-rest/src/main/resources/application.yml
+++ b/km-rest/src/main/resources/application.yml
@@ -95,12 +95,14 @@ es:
  index:
    expire: 15                    # 索引过期天数，15表示超过15天的索引会被KS过期删除

-
 # 集群自动均衡相关配置
 cluster-balance:
  ignored-topics:
    time-second: 300

+request:                          # 请求相关的配置
+  api-call:                       # api调用
+    timeout-unit-ms: 8000         # 超时时间，默认8000毫秒

 # 普罗米修斯指标导出相关配置
 management: