mirror of
https://github.com/didi/KnowStreaming.git
synced 2026-01-03 02:52:08 +08:00
Merge branch 'dev' into dev_v2.6.0
This commit is contained in:
kingdomrushing
@@ -39,10 +39,9 @@ public class SwaggerConfig implements WebMvcConfigurer {
|
||||
|
||||
private ApiInfo apiInfo() {
|
||||
return new ApiInfoBuilder()
|
||||
.title("Logi-KafkaManager 接口文档")
|
||||
.description("欢迎使用滴滴Logi-KafkaManager")
|
||||
.contact("huangyiminghappy@163.com")
|
||||
.version("2.2.0")
|
||||
.title("LogiKM接口文档")
|
||||
.description("欢迎使用滴滴LogiKM")
|
||||
.version("2.5.0")
|
||||
.build();
|
||||
}
|
||||
|
||||
|
||||
@@ -1,15 +1,16 @@
|
||||
package com.xiaojukeji.kafka.manager.web.converters;
|
||||
|
||||
import com.xiaojukeji.kafka.manager.common.entity.ao.account.Account;
|
||||
import com.xiaojukeji.kafka.manager.bpm.common.OrderResult;
|
||||
import com.xiaojukeji.kafka.manager.bpm.common.OrderStatusEnum;
|
||||
import com.xiaojukeji.kafka.manager.bpm.common.entry.BaseOrderDetailData;
|
||||
import com.xiaojukeji.kafka.manager.common.entity.ao.account.Account;
|
||||
import com.xiaojukeji.kafka.manager.common.entity.pojo.OrderDO;
|
||||
import com.xiaojukeji.kafka.manager.common.entity.vo.common.AccountVO;
|
||||
import com.xiaojukeji.kafka.manager.common.entity.vo.normal.order.OrderResultVO;
|
||||
import com.xiaojukeji.kafka.manager.common.entity.vo.normal.order.OrderVO;
|
||||
import com.xiaojukeji.kafka.manager.common.entity.vo.normal.order.detail.OrderDetailBaseVO;
|
||||
import com.xiaojukeji.kafka.manager.common.utils.CopyUtils;
|
||||
import com.xiaojukeji.kafka.manager.common.utils.ValidateUtils;
|
||||
import com.xiaojukeji.kafka.manager.common.entity.pojo.OrderDO;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
@@ -41,7 +42,9 @@ public class OrderConverter {
|
||||
}
|
||||
OrderVO orderVO = new OrderVO();
|
||||
CopyUtils.copyProperties(orderVO, orderDO);
|
||||
orderVO.setGmtTime(orderDO.getGmtCreate());
|
||||
if (OrderStatusEnum.WAIT_DEAL.getCode().equals(orderDO.getStatus())) {
|
||||
orderVO.setGmtHandle(null);
|
||||
}
|
||||
return orderVO;
|
||||
}
|
||||
|
||||
|
||||
@@ -95,12 +95,21 @@ public class ReassignModelConverter {
|
||||
vo.setBeginTime(0L);
|
||||
vo.setEndTime(0L);
|
||||
|
||||
StringBuilder clusterAndTopicName = new StringBuilder();
|
||||
|
||||
Integer completedTopicNum = 0;
|
||||
Set<Integer> statusSet = new HashSet<>();
|
||||
for (ReassignTaskDO elem: doList) {
|
||||
vo.setGmtCreate(elem.getGmtCreate().getTime());
|
||||
vo.setOperator(elem.getOperator());
|
||||
vo.setDescription(elem.getDescription());
|
||||
|
||||
if (clusterAndTopicName.length() == 0) {
|
||||
clusterAndTopicName.append("-").append(elem.getClusterId()).append("-").append(elem.getTopicName());
|
||||
} else {
|
||||
clusterAndTopicName.append("等");
|
||||
}
|
||||
|
||||
if (TaskStatusReassignEnum.isFinished(elem.getStatus())) {
|
||||
completedTopicNum += 1;
|
||||
statusSet.add(elem.getStatus());
|
||||
@@ -114,6 +123,9 @@ public class ReassignModelConverter {
|
||||
vo.setBeginTime(elem.getBeginTime().getTime());
|
||||
}
|
||||
|
||||
// 任务名称上，增加展示集群ID和Topic名称，多个时，仅展示第一个. PR from Hongten
|
||||
vo.setTaskName(String.format("%s 数据迁移任务%s", DateUtils.getFormattedDate(taskId), clusterAndTopicName.toString()));
|
||||
|
||||
// 任务整体状态
|
||||
if (statusSet.contains(TaskStatusReassignEnum.RUNNING.getCode())) {
|
||||
vo.setStatus(TaskStatusReassignEnum.RUNNING.getCode());
|
||||
|
||||
@@ -29,6 +29,7 @@ public class TopicMineConverter {
|
||||
vo.setClusterName(data.getLogicalClusterName());
|
||||
vo.setBytesIn(data.getBytesIn());
|
||||
vo.setBytesOut(data.getBytesOut());
|
||||
vo.setDescription(data.getDescription());
|
||||
voList.add(vo);
|
||||
}
|
||||
return voList;
|
||||
|
||||
@@ -9,6 +9,8 @@ server:
|
||||
spring:
|
||||
application:
|
||||
name: kafkamanager
|
||||
profiles:
|
||||
active: dev
|
||||
datasource:
|
||||
kafka-manager:
|
||||
jdbc-url: jdbc:mysql://localhost:3306/logi_kafka_manager?characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
|
||||
@@ -18,8 +20,6 @@ spring:
|
||||
main:
|
||||
allow-bean-definition-overriding: true
|
||||
|
||||
profiles:
|
||||
active: dev
|
||||
servlet:
|
||||
multipart:
|
||||
max-file-size: 100MB
|
||||
@@ -30,25 +30,31 @@ logging:
|
||||
|
||||
custom:
|
||||
idc: cn
|
||||
jmx:
|
||||
max-conn: 10 # 2.3版本配置不在这个地方生效
|
||||
store-metrics-task:
|
||||
community:
|
||||
broker-metrics-enabled: true
|
||||
topic-metrics-enabled: true
|
||||
didi:
|
||||
didi: # 滴滴Kafka特有的指标
|
||||
app-topic-metrics-enabled: false
|
||||
topic-request-time-metrics-enabled: false
|
||||
topic-throttled-metrics: false
|
||||
save-days: 7
|
||||
topic-throttled-metrics-enabled: false
|
||||
|
||||
# 任务相关的开关
|
||||
# 任务相关的配置
|
||||
task:
|
||||
op:
|
||||
sync-topic-enabled: false # 未落盘的Topic定期同步到DB中
|
||||
order-auto-exec: # 工单自动化审批线程的开关
|
||||
topic-enabled: false # Topic工单自动化审批开关, false:关闭自动化审批, true:开启
|
||||
app-enabled: false # App工单自动化审批开关, false:关闭自动化审批, true:开启
|
||||
metrics:
|
||||
delete-metrics:
|
||||
delete-limit-size: 1000
|
||||
cluster-metrics-save-days: 14 # 集群指标保存天数
|
||||
broker-metrics-save-days: 14 # Broker指标保存天数
|
||||
topic-metrics-save-days: 7 # Topic指标保存天数
|
||||
topic-request-time-metrics-save-days: 7 # Topic请求耗时指标保存天数
|
||||
topic-throttled-metrics-save-days: 7 # Topic限流指标保存天数
|
||||
app-topic-metrics-save-days: 7 # App+Topic指标保存天数
|
||||
|
||||
account:
|
||||
ldap:
|
||||
|
||||
Reference in New Issue
Block a user