From fe5cf2d922f29b16bc05085444e4e1f55513077a Mon Sep 17 00:00:00 2001 From: zengqiao Date: Wed, 28 Apr 2021 10:10:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E6=94=BE=E6=8E=A5=E5=8F=A3=E9=9B=86?= =?UTF-8?q?=E7=BE=A4ID=E5=BC=80=E5=A7=8B=E8=B0=83=E6=95=B4,=20op=E5=AF=B9?= =?UTF-8?q?=E5=BA=94=E7=9A=84=E6=98=AF=E7=89=A9=E7=90=86=E9=9B=86=E7=BE=A4?= =?UTF-8?q?ID,=20normal=E5=AF=B9=E5=BA=94=E7=9A=84=E6=98=AF=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E9=9B=86=E7=BE=A4ID,=20=E7=AC=AC=E4=B8=80=E6=AD=A5,?= =?UTF-8?q?=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;