From 01008acfcdf2f415ca7f397275c76c3f7aece86f Mon Sep 17 00:00:00 2001 From: shirenchuang Date: Mon, 19 Apr 2021 15:35:48 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=9C=AC=E5=9C=B0sql=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kafka-manager-web/src/main/resources/application.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/kafka-manager-web/src/main/resources/application.yml b/kafka-manager-web/src/main/resources/application.yml index 58ad509f..66b97bc1 100644 --- a/kafka-manager-web/src/main/resources/application.yml +++ b/kafka-manager-web/src/main/resources/application.yml @@ -11,9 +11,9 @@ spring: name: kafkamanager datasource: kafka-manager: - jdbc-url: jdbc:mysql://127.0.0.1:3306/logi_kafka_manager?characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8 - username: admin - password: admin + jdbc-url: jdbc:mysql://localhost:3306/logi_kafka_manager?characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8 + username: root + password: 123456 driver-class-name: com.mysql.cj.jdbc.Driver main: allow-bean-definition-overriding: true From b92ae7e47ea1f9c6cd487c42bb7044492956a660 Mon Sep 17 00:00:00 2001 From: shirenchuang Date: Fri, 23 Apr 2021 10:18:18 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kafka/manager/common/entity/vo/common/BrokerOverviewVO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/vo/common/BrokerOverviewVO.java b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/vo/common/BrokerOverviewVO.java index bf853853..b2cde3bf 100644 --- a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/vo/common/BrokerOverviewVO.java +++ b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/vo/common/BrokerOverviewVO.java @@ -33,7 +33,7 @@ public class BrokerOverviewVO { @ApiModelProperty(value = "分区数") private Integer partitionCount; - @ApiModelProperty(value = "已同步副本数") + @ApiModelProperty(value = "失效副本分区的个数") private Integer underReplicatedPartitions; @ApiModelProperty(value = "未同步") From d52eaafdbb787222fe3a3cb1aad1f462cdb23309 Mon Sep 17 00:00:00 2001 From: shirenchuang Date: Fri, 23 Apr 2021 10:25:36 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E4=B8=80=E4=B8=8B=20?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=89=8B=E5=86=8C=E4=B8=AD=E7=9A=84=20?= =?UTF-8?q?=E5=85=B1=E4=BA=AB=E9=9B=86=E7=BE=A4=E5=92=8C=E7=8B=AC=E4=BA=AB?= =?UTF-8?q?=E9=9B=86=E7=BE=A4=E7=9A=84=E6=A6=82=E5=BF=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/user_guide/user_guide_cn.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/user_guide/user_guide_cn.md b/docs/user_guide/user_guide_cn.md index 3d0519ea..caebf2b0 100644 --- a/docs/user_guide/user_guide_cn.md +++ b/docs/user_guide/user_guide_cn.md @@ -609,10 +609,10 @@ Lag：表示该消费客户端是否有堆积；等于 partition offset-consume 集群类型：选择创建的集群为“独享”还是“独立”。 -* 独享集群意味着，您独自拥有一个 -集群； +* 独享集群意味着， 您拥有一个集群中，部分broker的使用权限。 -* 独立集群意味着，您拥有一个集群中，部分broker的使用权限。 +* 独立集群意味着，您独自拥有一个 + 物理集群； * 共享集群意味着，大家共用一个集群及其中broker。 From fe5cf2d922f29b16bc05085444e4e1f55513077a Mon Sep 17 00:00:00 2001 From: zengqiao Date: Wed, 28 Apr 2021 10:10:16 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=BC=80=E6=94=BE=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E9=9B=86=E7=BE=A4ID=E5=BC=80=E5=A7=8B=E8=B0=83=E6=95=B4,=20op?= =?UTF-8?q?=E5=AF=B9=E5=BA=94=E7=9A=84=E6=98=AF=E7=89=A9=E7=90=86=E9=9B=86?= =?UTF-8?q?=E7=BE=A4ID,=20normal=E5=AF=B9=E5=BA=94=E7=9A=84=E6=98=AF?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E9=9B=86=E7=BE=A4ID,=20=E7=AC=AC=E4=B8=80?= =?UTF-8?q?=E6=AD=A5,=20util=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xiaojukeji/kafka/manager/common/constant/ApiPrefix.java | 6 ++++++ .../kafka/manager/account/impl/LoginServiceImpl.java | 2 ++ .../api/versionone/thirdpart/ThirdPartBrokerController.java | 4 ++-- ...PartOpController.java => ThirdPartOpUtilController.java} | 4 ++-- 4 files changed, 12 insertions(+), 4 deletions(-) rename kafka-manager-web/src/main/java/com/xiaojukeji/kafka/manager/web/api/versionone/thirdpart/{ThirdPartOpController.java => ThirdPartOpUtilController.java} (96%) diff --git a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/constant/ApiPrefix.java b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/constant/ApiPrefix.java index b90918eb..1aec18f2 100644 --- a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/constant/ApiPrefix.java +++ b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/constant/ApiPrefix.java @@ -20,6 +20,12 @@ public class ApiPrefix { // open public static final String API_V1_THIRD_PART_PREFIX = API_V1_PREFIX + "third-part/"; + // 开放给OP的接口, 后续对 应的接口的集群都需要是物理集群 + public static final String API_V1_THIRD_PART_OP_PREFIX = API_V1_THIRD_PART_PREFIX + "op/"; + + // 开放给Normal的接口, 后续对应的接口的集群，都需要是逻辑集群 + public static final String API_V1_THIRD_PART_NORMAL_PREFIX = API_V1_THIRD_PART_PREFIX + "normal/"; + // gateway public static final String GATEWAY_API_V1_PREFIX = "/gateway" + API_V1_PREFIX; } \ No newline at end of file diff --git a/kafka-manager-extends/kafka-manager-account/src/main/java/com/xiaojukeji/kafka/manager/account/impl/LoginServiceImpl.java b/kafka-manager-extends/kafka-manager-account/src/main/java/com/xiaojukeji/kafka/manager/account/impl/LoginServiceImpl.java index 61719b4f..6d963c52 100644 --- a/kafka-manager-extends/kafka-manager-account/src/main/java/com/xiaojukeji/kafka/manager/account/impl/LoginServiceImpl.java +++ b/kafka-manager-extends/kafka-manager-account/src/main/java/com/xiaojukeji/kafka/manager/account/impl/LoginServiceImpl.java @@ -72,6 +72,8 @@ public class LoginServiceImpl implements LoginService { if (classRequestMappingValue.equals(ApiPrefix.API_V1_SSO_PREFIX) || classRequestMappingValue.equals(ApiPrefix.API_V1_THIRD_PART_PREFIX) + || classRequestMappingValue.equals(ApiPrefix.API_V1_THIRD_PART_OP_PREFIX) + || classRequestMappingValue.equals(ApiPrefix.API_V1_THIRD_PART_NORMAL_PREFIX) || classRequestMappingValue.equals(ApiPrefix.GATEWAY_API_V1_PREFIX)) { // 白名单接口直接true return true; diff --git a/kafka-manager-web/src/main/java/com/xiaojukeji/kafka/manager/web/api/versionone/thirdpart/ThirdPartBrokerController.java b/kafka-manager-web/src/main/java/com/xiaojukeji/kafka/manager/web/api/versionone/thirdpart/ThirdPartBrokerController.java index e324be01..b8302180 100644 --- a/kafka-manager-web/src/main/java/com/xiaojukeji/kafka/manager/web/api/versionone/thirdpart/ThirdPartBrokerController.java +++ b/kafka-manager-web/src/main/java/com/xiaojukeji/kafka/manager/web/api/versionone/thirdpart/ThirdPartBrokerController.java @@ -32,8 +32,8 @@ import java.util.stream.Collectors; */ @Api(tags = "开放接口-Broker相关接口(REST)") @RestController -@RequestMapping(ApiPrefix.API_V1_THIRD_PART_PREFIX) -public class ThirdPartBrokerController { +@RequestMapping(ApiPrefix.API_V1_THIRD_PART_OP_PREFIX) +public class ThirdPartOpBrokerController { @Autowired private BrokerService brokerService; diff --git a/kafka-manager-web/src/main/java/com/xiaojukeji/kafka/manager/web/api/versionone/thirdpart/ThirdPartOpController.java b/kafka-manager-web/src/main/java/com/xiaojukeji/kafka/manager/web/api/versionone/thirdpart/ThirdPartOpUtilController.java similarity index 96% rename from kafka-manager-web/src/main/java/com/xiaojukeji/kafka/manager/web/api/versionone/thirdpart/ThirdPartOpController.java rename to kafka-manager-web/src/main/java/com/xiaojukeji/kafka/manager/web/api/versionone/thirdpart/ThirdPartOpUtilController.java index 3d31a5f0..b0d8ffd6 100644 --- a/kafka-manager-web/src/main/java/com/xiaojukeji/kafka/manager/web/api/versionone/thirdpart/ThirdPartOpController.java +++ b/kafka-manager-web/src/main/java/com/xiaojukeji/kafka/manager/web/api/versionone/thirdpart/ThirdPartOpUtilController.java @@ -21,8 +21,8 @@ import org.springframework.web.bind.annotation.*; */ @Api(tags = "开放接口-OP相关接口(REST)") @RestController -@RequestMapping(ApiPrefix.API_V1_THIRD_PART_PREFIX) -public class ThirdPartOpController { +@RequestMapping(ApiPrefix.API_V1_THIRD_PART_OP_PREFIX) +public class ThirdPartOpUtilController { @Autowired private AdminService adminService;