8x48/KnowStreaming
1
0
Fork 0
mirror of https://github.com/didi/KnowStreaming.git synced 2026-01-03 02:52:08 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'shirc_dev' into dev

Browse Source
This commit is contained in:
shirenchuang
2021-04-19 10:19:11 +08:00
parent 2a57c260cc 1fdecf8def
commit 8bfde9fbaf
4 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/ResultStatus.java
View File

@@ -25,6 +25,9 @@ public enum ResultStatus {
CHANGE_ZOOKEEPER_FORBIDDEN(1405, "change zookeeper forbidden"), CHANGE_ZOOKEEPER_FORBIDDEN(1405, "change zookeeper forbidden"),
APP_OFFLINE_FORBIDDEN(1406, "先下线topic，才能下线应用～"),
TOPIC_OPERATION_PARAM_NULL_POINTER(1450, "参数错误"), TOPIC_OPERATION_PARAM_NULL_POINTER(1450, "参数错误"),
TOPIC_OPERATION_PARTITION_NUM_ILLEGAL(1451, "分区数错误"), TOPIC_OPERATION_PARTITION_NUM_ILLEGAL(1451, "分区数错误"),
TOPIC_OPERATION_BROKER_NUM_NOT_ENOUGH(1452, "Broker数不足错误"), TOPIC_OPERATION_BROKER_NUM_NOT_ENOUGH(1452, "Broker数不足错误"),

2
kafka-manager-extends/kafka-manager-bpm/src/main/java/com/xiaojukeji/kafka/manager/bpm/order/impl/DeleteAppOrder.java
View File

@@ -95,7 +95,7 @@ public class DeleteAppOrder extends AbstractAppOrder {
// 判断app是否对topic有权限 // 判断app是否对topic有权限
List<AuthorityDO> authorityList = authorityService.getAuthority(orderAppExtension.getAppId()); List<AuthorityDO> authorityList = authorityService.getAuthority(orderAppExtension.getAppId());
if (!ValidateUtils.isEmptyList(authorityList)) { if (!ValidateUtils.isEmptyList(authorityList)) {
return ResultStatus.OPERATION_FORBIDDEN; return ResultStatus.APP_OFFLINE_FORBIDDEN;
} }
if (appService.deleteApp(appDO, userName) > 0) { if (appService.deleteApp(appDO, userName) > 0) {
return ResultStatus.SUCCESS; return ResultStatus.SUCCESS;

2
kafka-manager-web/src/main/resources/application.yml
View File

@@ -14,7 +14,7 @@ spring:
jdbc-url: jdbc:mysql://127.0.0.1:3306/logi_kafka_manager?characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8 jdbc-url: jdbc:mysql://127.0.0.1:3306/logi_kafka_manager?characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
username: admin username: admin
password: admin password: admin
driver-class-name: com.mysql.jdbc.Driver driver-class-name: com.mysql.cj.jdbc.Driver
main: main:
allow-bean-definition-overriding: true allow-bean-definition-overriding: true

2
pom.xml
View File

@@ -180,7 +180,7 @@
<dependency> <dependency>
<groupId>mysql</groupId> <groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId> <artifactId>mysql-connector-java</artifactId>
<version>5.1.41</version> <version>8.0.11</version>
</dependency> </dependency>
<dependency> <dependency>