Merge branch 'shirc_dev' into dev

This commit is contained in:
shirenchuang
2021-04-23 10:20:01 +08:00
2 changed files with 4 additions and 4 deletions

View File

@@ -33,7 +33,7 @@ public class BrokerOverviewVO {
@ApiModelProperty(value = "分区数") @ApiModelProperty(value = "分区数")
private Integer partitionCount; private Integer partitionCount;
@ApiModelProperty(value = "已同步副本") @ApiModelProperty(value = "失效副本分区的个")
private Integer underReplicatedPartitions; private Integer underReplicatedPartitions;
@ApiModelProperty(value = "未同步") @ApiModelProperty(value = "未同步")

View File

@@ -11,9 +11,9 @@ spring:
name: kafkamanager name: kafkamanager
datasource: datasource:
kafka-manager: kafka-manager:
jdbc-url: jdbc:mysql://127.0.0.1:3306/logi_kafka_manager?characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8 jdbc-url: jdbc:mysql://localhost:3306/logi_kafka_manager?characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
username: admin username: root
password: admin password: 123456
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: com.mysql.cj.jdbc.Driver
main: main:
allow-bean-definition-overriding: true allow-bean-definition-overriding: true