From c3a0dbbe485eb23a1f764c5a289461c100b917ea Mon Sep 17 00:00:00 2001 From: zengqiao Date: Tue, 18 May 2021 11:45:15 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E7=BB=95=E8=BF=87=E7=9A=84=E6=8E=A5=E5=8F=A3=E8=B0=83=E7=94=A8?= =?UTF-8?q?=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/user_guide/call_api_bypass_login.md | 49 ++++++++++++++++++ docs/user_guide/faq.md | 5 ++ .../common/constant/TrickLoginConstant.java | 21 ++++++++ .../manager/common/utils/SpringTool.java | 24 +++++---- .../kafka/manager/account/LoginService.java | 20 ++++++++ .../component/AbstractSingleSignOn.java | 2 +- .../login/trick/TrickLoginService.java | 50 +++++++++++++++++++ .../account/impl/LoginServiceImpl.java | 6 ++- 8 files changed, 164 insertions(+), 13 deletions(-) create mode 100644 docs/user_guide/call_api_bypass_login.md create mode 100644 kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/constant/TrickLoginConstant.java create mode 100644 kafka-manager-extends/kafka-manager-account/src/main/java/com/xiaojukeji/kafka/manager/account/component/login/trick/TrickLoginService.java diff --git a/docs/user_guide/call_api_bypass_login.md b/docs/user_guide/call_api_bypass_login.md new file mode 100644 index 00000000..7a2feac8 --- /dev/null +++ b/docs/user_guide/call_api_bypass_login.md @@ -0,0 +1,49 @@ + +--- + +![kafka-manager-logo](../assets/images/common/logo_name.png) + +**一站式`Apache Kafka`集群指标监控与运维管控平台** + +--- + +# 登录绕过 + +## 背景 + +现在除了开放出来的第三方接口，其他接口都需要走登录认证。 + +但是第三方接口不多，开放出来的能力有限，但是登录的接口又需要登录，非常的麻烦。 + +因此，新增了一个登录绕过的功能，为一些紧急临时的需求，提供一个调用不需要登录的能力。 + +## 使用方式 + +步骤一：接口调用时，在header中，增加如下信息： +```shell +# 表示开启登录绕过 +Trick-Login-Switch : on + +# 登录绕过的用户, 这里可以是admin, 或者是其他的, 但是必须在运维管控->平台管理->用户管理中设置了该用户。 +Trick-Login-User : admin +``` + +  + +步骤二：在运维管控->平台管理->平台配置上，设置允许了该用户以绕过的方式登录 +```shell +# 设置的key，必须是这个 +SECURITY.TRICK_USERS + +# 设置的value，是json数组的格式，例如 +[ "admin", "logi"] +``` + +  + +步骤三：解释说明 + +设置完成上面两步之后，就可以直接调用需要登录的接口了。 + +但是还有一点需要注意，绕过的用户仅能调用他有权限的接口，比如一个普通用户，那么他就只能调用普通的接口，不能去调用运维人员的接口。 + diff --git a/docs/user_guide/faq.md b/docs/user_guide/faq.md index 54ac5543..7fec9050 100644 --- a/docs/user_guide/faq.md +++ b/docs/user_guide/faq.md @@ -27,6 +27,7 @@ - 15、APP(应用)如何被使用起来？ - 16、为什么下线应用提示operation forbidden？ - 17、删除Topic成功，为什么过一会儿之后又出现了？ +- 18、如何在不登录的情况下，调用一些需要登录的接口？ --- @@ -195,3 +196,7 @@ for (int i= 0; i < 100000; ++i) { producer.send(new ProducerRecord("logi_km" + i,"hello logi_km")); } ``` + +### 18、如何在不登录的情况下，调用一些需要登录的接口？ + +具体见：[登录绕过](./call_api_bypass_login.md) diff --git a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/constant/TrickLoginConstant.java b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/constant/TrickLoginConstant.java new file mode 100644 index 00000000..159e1c61 --- /dev/null +++ b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/constant/TrickLoginConstant.java @@ -0,0 +1,21 @@ +package com.xiaojukeji.kafka.manager.common.constant; + +public class TrickLoginConstant { + /** + * HTTP Header key + */ + public static final String TRICK_LOGIN_SWITCH = "Trick-Login-Switch"; + + public static final String TRICK_LOGIN_USER = "Trick-Login-User"; + + /** + * 配置允许 trick 登录用户名单 + */ + public static final String TRICK_LOGIN_LEGAL_USER_CONFIG_KEY = "SECURITY.TRICK_USERS"; + + /** + * 开关状态值 + */ + public static final String TRICK_LOGIN_SWITCH_ON = "on"; + public static final String TRICK_LOGIN_SWITCH_OFF = "off"; +} diff --git a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/utils/SpringTool.java b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/utils/SpringTool.java index de0783d2..50723ebf 100644 --- a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/utils/SpringTool.java +++ b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/utils/SpringTool.java @@ -2,6 +2,7 @@ package com.xiaojukeji.kafka.manager.common.utils; import com.xiaojukeji.kafka.manager.common.constant.Constant; import com.xiaojukeji.kafka.manager.common.constant.LoginConstant; +import com.xiaojukeji.kafka.manager.common.constant.TrickLoginConstant; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.BeansException; @@ -53,13 +54,6 @@ public class SpringTool implements ApplicationContextAware, DisposableBean { return getApplicationContext().getBeansOfType(type); } -// /** -// * 从静态变量applicationContext中去的Bean，自动转型为所复制对象的类型 -// */ -// public static T getBean(Class requiredType) { -// return (T) applicationContext.getBean(requiredType); -// } - /** * 清除SpringContextHolder中的ApplicationContext为Null */ @@ -87,10 +81,18 @@ public class SpringTool implements ApplicationContextAware, DisposableBean { } public static String getUserName(){ - HttpServletRequest request = - ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); - HttpSession session = request.getSession(); - String username = (String) session.getAttribute(LoginConstant.SESSION_USERNAME_KEY); + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + + String username = null; + if (TrickLoginConstant.TRICK_LOGIN_SWITCH_ON.equals(request.getHeader(TrickLoginConstant.TRICK_LOGIN_SWITCH))) { + // trick登录方式的获取用户 + username = request.getHeader(TrickLoginConstant.TRICK_LOGIN_USER); + } else { + // 走页面登录方式登录的获取用户 + HttpSession session = request.getSession(); + username = (String) session.getAttribute(LoginConstant.SESSION_USERNAME_KEY); + } + if (ValidateUtils.isNull(username)) { return Constant.DEFAULT_USER_NAME; } diff --git a/kafka-manager-extends/kafka-manager-account/src/main/java/com/xiaojukeji/kafka/manager/account/LoginService.java b/kafka-manager-extends/kafka-manager-account/src/main/java/com/xiaojukeji/kafka/manager/account/LoginService.java index 707d4908..48d3f710 100644 --- a/kafka-manager-extends/kafka-manager-account/src/main/java/com/xiaojukeji/kafka/manager/account/LoginService.java +++ b/kafka-manager-extends/kafka-manager-account/src/main/java/com/xiaojukeji/kafka/manager/account/LoginService.java @@ -12,9 +12,29 @@ import javax.servlet.http.HttpServletResponse; * @date 20/8/20 */ public interface LoginService { + /** + * 登录 + * @param request HttpServletRequest + * @param response HttpServletResponse + * @param dto 登录信息 + * @return 登录结果 + */ Result login(HttpServletRequest request, HttpServletResponse response, LoginDTO dto); + /** + * 登出 + * @param request HttpServletRequest + * @param response HttpServletResponse + * @param needJump2LoginPage 是否需要跳转到登录页 + */ void logout(HttpServletRequest request, HttpServletResponse response, Boolean needJump2LoginPage); + /** + * 检查是否登录 + * @param request HttpServletRequest + * @param response HttpServletResponse + * @param classRequestMappingValue request-mapping的value + * @return 检查结果, false:未登录或无权限, true:已登录并且有权限 + */ boolean checkLogin(HttpServletRequest request, HttpServletResponse response, String classRequestMappingValue); } \ No newline at end of file diff --git a/kafka-manager-extends/kafka-manager-account/src/main/java/com/xiaojukeji/kafka/manager/account/component/AbstractSingleSignOn.java b/kafka-manager-extends/kafka-manager-account/src/main/java/com/xiaojukeji/kafka/manager/account/component/AbstractSingleSignOn.java index d6257364..4a67f8f4 100644 --- a/kafka-manager-extends/kafka-manager-account/src/main/java/com/xiaojukeji/kafka/manager/account/component/AbstractSingleSignOn.java +++ b/kafka-manager-extends/kafka-manager-account/src/main/java/com/xiaojukeji/kafka/manager/account/component/AbstractSingleSignOn.java @@ -7,7 +7,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; /** - * 单点登录抽象类 + * 登录抽象类 * @author zengqiao * @date 20/8/20 */ diff --git a/kafka-manager-extends/kafka-manager-account/src/main/java/com/xiaojukeji/kafka/manager/account/component/login/trick/TrickLoginService.java b/kafka-manager-extends/kafka-manager-account/src/main/java/com/xiaojukeji/kafka/manager/account/component/login/trick/TrickLoginService.java new file mode 100644 index 00000000..08195664 --- /dev/null +++ b/kafka-manager-extends/kafka-manager-account/src/main/java/com/xiaojukeji/kafka/manager/account/component/login/trick/TrickLoginService.java @@ -0,0 +1,50 @@ +package com.xiaojukeji.kafka.manager.account.component.login.trick; + +import com.xiaojukeji.kafka.manager.common.constant.TrickLoginConstant; +import com.xiaojukeji.kafka.manager.service.service.ConfigService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.servlet.http.HttpServletRequest; +import java.util.Optional; + + +/** + * @author zengqiao + * @date 21/5/18 + */ +@Service +public class TrickLoginService { + private final static Logger LOGGER = LoggerFactory.getLogger(TrickLoginService.class); + + @Autowired + private ConfigService configService; + + /** + * 是否开启trick的方式登录 + */ + public boolean isTrickLoginOn(HttpServletRequest request) { + return TrickLoginConstant.TRICK_LOGIN_SWITCH_ON.equals(request.getHeader(TrickLoginConstant.TRICK_LOGIN_SWITCH)); + } + + /** + * 开启trick方式登录后，当前用户是否可以登录 + */ + public String checkTrickLogin(HttpServletRequest request) { + String trickLoginUser = request.getHeader(TrickLoginConstant.TRICK_LOGIN_USER); + LOGGER.info("class=TrickLoginService||method=checkTrickLogin||user={}||uri={}||msg=try trick login", trickLoginUser, request.getRequestURI()); + if (!checkTrickLogin(trickLoginUser)) { + LOGGER.warn("class=TrickLoginService||method=checkTrickLogin||user={}||uri={}||msg=trick login failed", trickLoginUser, request.getRequestURI()); + return null; + } + return trickLoginUser; + } + + private boolean checkTrickLogin(String trickLoginUser) { + return Optional.ofNullable(configService.getArrayByKey(TrickLoginConstant.TRICK_LOGIN_LEGAL_USER_CONFIG_KEY, String.class)) + .filter(names -> names.contains(trickLoginUser)) + .isPresent(); + } +} 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 7a803603..8f079fde 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 @@ -3,6 +3,7 @@ package com.xiaojukeji.kafka.manager.account.impl; import com.xiaojukeji.kafka.manager.account.AccountService; import com.xiaojukeji.kafka.manager.account.component.AbstractSingleSignOn; import com.xiaojukeji.kafka.manager.account.LoginService; +import com.xiaojukeji.kafka.manager.account.component.login.trick.TrickLoginService; import com.xiaojukeji.kafka.manager.common.bizenum.AccountRoleEnum; import com.xiaojukeji.kafka.manager.common.constant.ApiPrefix; import com.xiaojukeji.kafka.manager.common.constant.LoginConstant; @@ -31,6 +32,9 @@ public class LoginServiceImpl implements LoginService { @Autowired private AccountService accountService; + @Autowired + private TrickLoginService trickLoginService; + @Autowired private AbstractSingleSignOn singleSignOn; @@ -80,7 +84,7 @@ public class LoginServiceImpl implements LoginService { return true; } - String username = singleSignOn.checkLoginAndGetLdap(request); + String username = trickLoginService.isTrickLoginOn(request)? trickLoginService.checkTrickLogin(request): singleSignOn.checkLoginAndGetLdap(request); if (ValidateUtils.isBlank(username)) { // 未登录, 则返回false, 同时重定向到登录页面 singleSignOn.setRedirectToLoginPage(response); From c5b1bed7dcddb071830bad1a3fe794dd7f1b6e58 Mon Sep 17 00:00:00 2001 From: zengqiao Date: Tue, 18 May 2021 14:13:23 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=AE=80=E5=8C=96sd=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E7=B1=BB=E7=9A=84=E9=95=BF=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/install_guide/create_mysql_table.sql | 10 +++++----- .../common/bizenum/gateway/GatewayConfigKeyEnum.java | 10 +++++----- .../service/gateway/impl/GatewayConfigServiceImpl.java | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/install_guide/create_mysql_table.sql b/docs/install_guide/create_mysql_table.sql index 065532eb..12910ae1 100644 --- a/docs/install_guide/create_mysql_table.sql +++ b/docs/install_guide/create_mysql_table.sql @@ -210,11 +210,11 @@ CREATE TABLE `gateway_config` ( PRIMARY KEY (`id`), UNIQUE KEY `uniq_type_name` (`type`,`name`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='gateway配置'; -INSERT INTO gateway_config(type, name, value, `version`) values('SERVICE_DISCOVERY_QUEUE_SIZE', 'SERVICE_DISCOVERY_QUEUE_SIZE', 100000000, 1); -INSERT INTO gateway_config(type, name, value, `version`) values('SERVICE_DISCOVERY_APPID_RATE', 'SERVICE_DISCOVERY_APPID_RATE', 100000000, 1); -INSERT INTO gateway_config(type, name, value, `version`) values('SERVICE_DISCOVERY_IP_RATE', 'SERVICE_DISCOVERY_IP_RATE', 100000000, 1); -INSERT INTO gateway_config(type, name, value, `version`) values('SERVICE_DISCOVERY_SP_RATE', 'app_01234567', 100000000, 1); -INSERT INTO gateway_config(type, name, value, `version`) values('SERVICE_DISCOVERY_SP_RATE', '192.168.0.1', 100000000, 1); +INSERT INTO gateway_config(type, name, value, `version`, `description`) values('SD_QUEUE_SIZE', 'SD_QUEUE_SIZE', 100000000, 1, '任意集群队列大小'); +INSERT INTO gateway_config(type, name, value, `version`, `description`) values('SD_APP_RATE', 'SD_APP_RATE', 100000000, 1, '任意一个App限速'); +INSERT INTO gateway_config(type, name, value, `version`, `description`) values('SD_IP_RATE', 'SD_IP_RATE', 100000000, 1, '任意一个IP限速'); +INSERT INTO gateway_config(type, name, value, `version`, `description`) values('SD_SP_RATE', 'app_01234567', 100000000, 1, '指定App限速'); +INSERT INTO gateway_config(type, name, value, `version`, `description`) values('SD_SP_RATE', '192.168.0.1', 100000000, 1, '指定IP限速'); -- -- Table structure for table `heartbeat` diff --git a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/bizenum/gateway/GatewayConfigKeyEnum.java b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/bizenum/gateway/GatewayConfigKeyEnum.java index 226cc5c6..5562138f 100644 --- a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/bizenum/gateway/GatewayConfigKeyEnum.java +++ b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/bizenum/gateway/GatewayConfigKeyEnum.java @@ -5,11 +5,11 @@ package com.xiaojukeji.kafka.manager.common.bizenum.gateway; * @date 20/7/28 */ public enum GatewayConfigKeyEnum { - SD_CLUSTER_ID("SERVICE_DISCOVERY_CLUSTER_ID", "SERVICE_DISCOVERY_CLUSTER_ID"), - SD_QUEUE_SIZE("SERVICE_DISCOVERY_QUEUE_SIZE", "SERVICE_DISCOVERY_QUEUE_SIZE"), - SD_APP_ID_RATE("SERVICE_DISCOVERY_APPID_RATE", "SERVICE_DISCOVERY_APPID_RATE"), - SD_IP_RATE("SERVICE_DISCOVERY_IP_RATE", "SERVICE_DISCOVERY_IP_RATE"), - SD_SP_RATE("SERVICE_DISCOVERY_SP_RATE", "SERVICE_DISCOVERY_SP_RATE"), + SD_CLUSTER_ID("SD_CLUSTER_ID", "SD_CLUSTER_ID"), + SD_QUEUE_SIZE("SD_QUEUE_SIZE", "SD_QUEUE_SIZE"), + SD_APP_RATE("SD_APP_RATE", "SD_APP_RATE"), + SD_IP_RATE("SD_IP_RATE", "SD_IP_RATE"), + SD_SP_RATE("SD_SP_RATE", "SD_SP_RATE"), ; diff --git a/kafka-manager-core/src/main/java/com/xiaojukeji/kafka/manager/service/service/gateway/impl/GatewayConfigServiceImpl.java b/kafka-manager-core/src/main/java/com/xiaojukeji/kafka/manager/service/service/gateway/impl/GatewayConfigServiceImpl.java index 18ee0a0d..0ceb3b30 100644 --- a/kafka-manager-core/src/main/java/com/xiaojukeji/kafka/manager/service/service/gateway/impl/GatewayConfigServiceImpl.java +++ b/kafka-manager-core/src/main/java/com/xiaojukeji/kafka/manager/service/service/gateway/impl/GatewayConfigServiceImpl.java @@ -86,8 +86,8 @@ public class GatewayConfigServiceImpl implements GatewayConfigService { GatewayConfigDO configDO = null; try { configDO = gatewayConfigDao.getByConfigTypeAndName( - GatewayConfigKeyEnum.SD_APP_ID_RATE.getConfigType(), - GatewayConfigKeyEnum.SD_APP_ID_RATE.getConfigName() + GatewayConfigKeyEnum.SD_APP_RATE.getConfigType(), + GatewayConfigKeyEnum.SD_APP_RATE.getConfigName() ); if (ValidateUtils.isNull(configDO) || configDO.getVersion() <= requestVersion) { return new AppRateConfig(Long.MIN_VALUE, null); From 892e195f0e10e26786dd49ff0184dc22aef60f49 Mon Sep 17 00:00:00 2001 From: zengqiao Date: Tue, 18 May 2021 14:33:02 +0800 Subject: [PATCH 3/3] code format --- .../manager/common/bizenum/ApiLevelEnum.java | 19 ------------------- .../common/bizenum/ConsumeHealthEnum.java | 8 -------- .../manager/common/bizenum/DBStatusEnum.java | 7 +++++-- .../kafka/manager/common/bizenum/IDCEnum.java | 8 -------- .../common/bizenum/KafkaBrokerRoleEnum.java | 4 ---- .../common/bizenum/KafkaClientEnum.java | 8 -------- .../common/bizenum/OffsetResetTypeEnum.java | 7 +++++++ .../common/bizenum/OperationStatusEnum.java | 8 ++++++++ .../common/bizenum/PeakFlowStatusEnum.java | 12 ++---------- .../bizenum/RebalanceDimensionEnum.java | 8 ++++++++ .../common/bizenum/TaskStatusEnum.java | 13 +------------ .../bizenum/TaskStatusReassignEnum.java | 7 +------ .../common/bizenum/TopicAuthorityEnum.java | 8 ++++++++ .../bizenum/TopicExpiredStatusEnum.java | 8 ++++++++ .../bizenum/TopicOffsetChangedEnum.java | 8 -------- .../bizenum/gateway/GatewayConfigKeyEnum.java | 8 -------- .../common/constant/ApiLevelContent.java | 3 +++ .../manager/common/constant/ApiPrefix.java | 3 +++ .../common/constant/ConfigConstant.java | 3 +++ .../manager/common/constant/Constant.java | 3 +++ .../common/constant/KafkaConstant.java | 3 +++ .../constant/KafkaMetricsCollections.java | 3 +++ .../manager/common/constant/LogConstant.java | 3 +++ .../common/constant/LoginConstant.java | 3 +++ .../common/constant/SystemCodeConstant.java | 3 +++ .../constant/TopicCreationConstant.java | 3 +++ .../common/constant/TopicSampleConstant.java | 3 +++ .../common/constant/TrickLoginConstant.java | 3 +++ .../manager/common/zookeeper/ZkPathUtil.java | 3 +++ .../service/impl/BrokerServiceImpl.java | 2 +- 30 files changed, 88 insertions(+), 94 deletions(-) delete mode 100644 kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/bizenum/ApiLevelEnum.java diff --git a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/bizenum/ApiLevelEnum.java b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/bizenum/ApiLevelEnum.java deleted file mode 100644 index 73be0d16..00000000 --- a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/bizenum/ApiLevelEnum.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.xiaojukeji.kafka.manager.common.bizenum; - -/** - * @author zengqiao - * @date 20/7/27 - */ -public enum ApiLevelEnum { - LEVEL_0(0), - LEVEL_1(1), - LEVEL_2(2), - LEVEL_3(3) - ; - - private int level; - - ApiLevelEnum(int level) { - this.level = level; - } -} \ No newline at end of file diff --git a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/bizenum/ConsumeHealthEnum.java b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/bizenum/ConsumeHealthEnum.java index 74d2d8ab..f5cda2ed 100644 --- a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/bizenum/ConsumeHealthEnum.java +++ b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/bizenum/ConsumeHealthEnum.java @@ -24,18 +24,10 @@ public enum ConsumeHealthEnum { return code; } - public void setCode(Integer code) { - this.code = code; - } - public String getMessage() { return message; } - public void setMessage(String message) { - this.message = message; - } - @Override public String toString() { return "ConsumeHealthEnum{" + diff --git a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/bizenum/DBStatusEnum.java b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/bizenum/DBStatusEnum.java index 4f6fb1cf..89518f83 100644 --- a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/bizenum/DBStatusEnum.java +++ b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/bizenum/DBStatusEnum.java @@ -19,7 +19,10 @@ public enum DBStatusEnum { return status; } - public void setStatus(int status) { - this.status = status; + @Override + public String toString() { + return "DBStatusEnum{" + + "status=" + status + + '}'; } } \ No newline at end of file diff --git a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/bizenum/IDCEnum.java b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/bizenum/IDCEnum.java index 73569d56..2b3cad7c 100644 --- a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/bizenum/IDCEnum.java +++ b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/bizenum/IDCEnum.java @@ -21,18 +21,10 @@ public enum IDCEnum { return idc; } - public void setIdc(String idc) { - this.idc = idc; - } - public String getName() { return name; } - public void setName(String name) { - this.name = name; - } - @Override public String toString() { return "IDCEnum{" + diff --git a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/bizenum/KafkaBrokerRoleEnum.java b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/bizenum/KafkaBrokerRoleEnum.java index befd5257..246b4b5e 100644 --- a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/bizenum/KafkaBrokerRoleEnum.java +++ b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/bizenum/KafkaBrokerRoleEnum.java @@ -21,10 +21,6 @@ public enum KafkaBrokerRoleEnum { return role; } - public void setRole(String role) { - this.role = role; - } - @Override public String toString() { return "KafkaBrokerRoleEnum{" + diff --git a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/bizenum/KafkaClientEnum.java b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/bizenum/KafkaClientEnum.java index 6e5bea6f..0b35277e 100644 --- a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/bizenum/KafkaClientEnum.java +++ b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/bizenum/KafkaClientEnum.java @@ -24,18 +24,10 @@ public enum KafkaClientEnum { return code; } - public void setCode(Integer code) { - this.code = code; - } - public String getName() { return name; } - public void setName(String name) { - this.name = name; - } - @Override public String toString() { return "KafkaClientEnum{" + diff --git a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/bizenum/OffsetResetTypeEnum.java b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/bizenum/OffsetResetTypeEnum.java index b69a8a25..170946e8 100644 --- a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/bizenum/OffsetResetTypeEnum.java +++ b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/bizenum/OffsetResetTypeEnum.java @@ -18,4 +18,11 @@ public enum OffsetResetTypeEnum { public Integer getCode() { return code; } + + @Override + public String toString() { + return "OffsetResetTypeEnum{" + + "code=" + code + + '}'; + } } diff --git a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/bizenum/OperationStatusEnum.java b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/bizenum/OperationStatusEnum.java index cf8f53d2..b88135a5 100644 --- a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/bizenum/OperationStatusEnum.java +++ b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/bizenum/OperationStatusEnum.java @@ -27,4 +27,12 @@ public enum OperationStatusEnum { public String getMessage() { return message; } + + @Override + public String toString() { + return "OperationStatusEnum{" + + "code=" + code + + ", message='" + message + '\'' + + '}'; + } } \ No newline at end of file diff --git a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/bizenum/PeakFlowStatusEnum.java b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/bizenum/PeakFlowStatusEnum.java index 9b71f038..f39ac91a 100644 --- a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/bizenum/PeakFlowStatusEnum.java +++ b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/bizenum/PeakFlowStatusEnum.java @@ -15,9 +15,9 @@ public enum PeakFlowStatusEnum { ; - public Integer code; + private Integer code; - public String message; + private String message; PeakFlowStatusEnum(Integer code, String message) { this.code = code; @@ -28,18 +28,10 @@ public enum PeakFlowStatusEnum { return code; } - public void setCode(Integer code) { - this.code = code; - } - public String getMessage() { return message; } - public void setMessage(String message) { - this.message = message; - } - @Override public String toString() { return "PeakFlowStatusEnum{" + diff --git a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/bizenum/RebalanceDimensionEnum.java b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/bizenum/RebalanceDimensionEnum.java index e196e8c2..c5259461 100644 --- a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/bizenum/RebalanceDimensionEnum.java +++ b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/bizenum/RebalanceDimensionEnum.java @@ -29,4 +29,12 @@ public enum RebalanceDimensionEnum { public String getMessage() { return message; } + + @Override + public String toString() { + return "RebalanceDimensionEnum{" + + "code=" + code + + ", message='" + message + '\'' + + '}'; + } } \ No newline at end of file diff --git a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/bizenum/TaskStatusEnum.java b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/bizenum/TaskStatusEnum.java index ebf3dc82..a478eafe 100644 --- a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/bizenum/TaskStatusEnum.java +++ b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/bizenum/TaskStatusEnum.java @@ -43,18 +43,10 @@ public enum TaskStatusEnum { return code; } - public void setCode(Integer code) { - this.code = code; - } - public String getMessage() { return message; } - public void setMessage(String message) { - this.message = message; - } - @Override public String toString() { return "TaskStatusEnum{" + @@ -64,9 +56,6 @@ public enum TaskStatusEnum { } public static Boolean isFinished(Integer code) { - if (code >= FINISHED.getCode()) { - return true; - } - return false; + return code >= FINISHED.getCode(); } } diff --git a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/bizenum/TaskStatusReassignEnum.java b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/bizenum/TaskStatusReassignEnum.java index 7fd6ef8f..fc8adcc1 100644 --- a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/bizenum/TaskStatusReassignEnum.java +++ b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/bizenum/TaskStatusReassignEnum.java @@ -45,11 +45,6 @@ public enum TaskStatusReassignEnum { } public static Boolean isFinished(Integer code) { - if (SUCCEED.getCode().equals(code) - || FAILED.getCode().equals(code) - || CANCELED.getCode().equals(code)) { - return true; - } - return false; + return SUCCEED.getCode().equals(code) || FAILED.getCode().equals(code) || CANCELED.getCode().equals(code); } } \ No newline at end of file diff --git a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/bizenum/TopicAuthorityEnum.java b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/bizenum/TopicAuthorityEnum.java index 2cfba027..7abafb8c 100644 --- a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/bizenum/TopicAuthorityEnum.java +++ b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/bizenum/TopicAuthorityEnum.java @@ -33,4 +33,12 @@ public enum TopicAuthorityEnum { public String getMessage() { return message; } + + @Override + public String toString() { + return "TopicAuthorityEnum{" + + "code=" + code + + ", message='" + message + '\'' + + '}'; + } } diff --git a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/bizenum/TopicExpiredStatusEnum.java b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/bizenum/TopicExpiredStatusEnum.java index bac44235..6a2f32c1 100644 --- a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/bizenum/TopicExpiredStatusEnum.java +++ b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/bizenum/TopicExpiredStatusEnum.java @@ -29,4 +29,12 @@ public enum TopicExpiredStatusEnum { public String getMessage() { return message; } + + @Override + public String toString() { + return "TopicExpiredStatusEnum{" + + "status=" + status + + ", message='" + message + '\'' + + '}'; + } } diff --git a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/bizenum/TopicOffsetChangedEnum.java b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/bizenum/TopicOffsetChangedEnum.java index ecb6b2f1..4c88f25c 100644 --- a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/bizenum/TopicOffsetChangedEnum.java +++ b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/bizenum/TopicOffsetChangedEnum.java @@ -23,18 +23,10 @@ public enum TopicOffsetChangedEnum { return code; } - public void setCode(Integer code) { - this.code = code; - } - public String getMessage() { return message; } - public void setMessage(String message) { - this.message = message; - } - @Override public String toString() { return "TopicOffsetChangedEnum{" + diff --git a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/bizenum/gateway/GatewayConfigKeyEnum.java b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/bizenum/gateway/GatewayConfigKeyEnum.java index 5562138f..b3403e69 100644 --- a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/bizenum/gateway/GatewayConfigKeyEnum.java +++ b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/bizenum/gateway/GatewayConfigKeyEnum.java @@ -26,18 +26,10 @@ public enum GatewayConfigKeyEnum { return configType; } - public void setConfigType(String configType) { - this.configType = configType; - } - public String getConfigName() { return configName; } - public void setConfigName(String configName) { - this.configName = configName; - } - @Override public String toString() { return "GatewayConfigKeyEnum{" + diff --git a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/constant/ApiLevelContent.java b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/constant/ApiLevelContent.java index 2447564f..8136cd16 100644 --- a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/constant/ApiLevelContent.java +++ b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/constant/ApiLevelContent.java @@ -12,4 +12,7 @@ public class ApiLevelContent { public static final int LEVEL_NORMAL_3 = 3; public static final int LEVEL_DEFAULT_4 = 4; + + private ApiLevelContent() { + } } \ No newline at end of file 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 1aec18f2..b0f84405 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 @@ -28,4 +28,7 @@ public class ApiPrefix { // gateway public static final String GATEWAY_API_V1_PREFIX = "/gateway" + API_V1_PREFIX; + + private ApiPrefix() { + } } \ No newline at end of file diff --git a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/constant/ConfigConstant.java b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/constant/ConfigConstant.java index faca17b0..361c841f 100644 --- a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/constant/ConfigConstant.java +++ b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/constant/ConfigConstant.java @@ -30,4 +30,7 @@ public class ConfigConstant { public static final String BROKER_CAPACITY_LIMIT_CONFIG_KEY = "BROKER_CAPACITY_LIMIT_CONFIG"; public static final String KAFKA_CLUSTER_DO_CONFIG_KEY = "KAFKA_CLUSTER_DO_CONFIG"; + + private ConfigConstant() { + } } diff --git a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/constant/Constant.java b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/constant/Constant.java index 81c1dc89..7ecc295b 100644 --- a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/constant/Constant.java +++ b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/constant/Constant.java @@ -45,4 +45,7 @@ public class Constant { public static final Integer DEFAULT_MAX_CAL_TOPIC_EXPIRED_DAY = 90; public static final Integer INVALID_CODE = -1; + + private Constant() { + } } diff --git a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/constant/KafkaConstant.java b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/constant/KafkaConstant.java index 92425303..4d69f914 100644 --- a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/constant/KafkaConstant.java +++ b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/constant/KafkaConstant.java @@ -16,4 +16,7 @@ public class KafkaConstant { public static final String CLIENT_VERSION_NAME_UNKNOWN = "unknown"; public static final String RETENTION_MS_KEY = "retention.ms"; + + private KafkaConstant() { + } } \ No newline at end of file diff --git a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/constant/KafkaMetricsCollections.java b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/constant/KafkaMetricsCollections.java index 9c7f59e3..be82317a 100644 --- a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/constant/KafkaMetricsCollections.java +++ b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/constant/KafkaMetricsCollections.java @@ -39,4 +39,7 @@ public class KafkaMetricsCollections { * Broker信息 */ public static final int BROKER_VERSION = 400; + + private KafkaMetricsCollections() { + } } diff --git a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/constant/LogConstant.java b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/constant/LogConstant.java index 55fa756f..bba7670c 100644 --- a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/constant/LogConstant.java +++ b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/constant/LogConstant.java @@ -10,4 +10,7 @@ public class LogConstant { public static final String API_METRICS_LOGGER = "API_METRICS_LOGGER"; public static final String SCHEDULED_TASK_LOGGER = "SCHEDULED_TASK_LOGGER"; + + private LogConstant() { + } } \ No newline at end of file diff --git a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/constant/LoginConstant.java b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/constant/LoginConstant.java index bc95dbc2..8c9b47aa 100644 --- a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/constant/LoginConstant.java +++ b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/constant/LoginConstant.java @@ -11,4 +11,7 @@ public class LoginConstant { public static final String COOKIE_CHINESE_USERNAME_KEY = "chineseName"; public static final Integer COOKIE_OR_SESSION_MAX_AGE_UNIT_MS = 24 * 60 * 60 * 1000; + + private LoginConstant() { + } } \ No newline at end of file diff --git a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/constant/SystemCodeConstant.java b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/constant/SystemCodeConstant.java index c3162a4b..510a90c1 100644 --- a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/constant/SystemCodeConstant.java +++ b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/constant/SystemCodeConstant.java @@ -6,4 +6,7 @@ package com.xiaojukeji.kafka.manager.common.constant; */ public class SystemCodeConstant { public static final String KAFKA_MANAGER = "kafka-manager"; + + private SystemCodeConstant() { + } } \ No newline at end of file diff --git a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/constant/TopicCreationConstant.java b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/constant/TopicCreationConstant.java index b8c361b3..3a6dd478 100644 --- a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/constant/TopicCreationConstant.java +++ b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/constant/TopicCreationConstant.java @@ -54,4 +54,7 @@ public class TopicCreationConstant { * 单次自动化审批, 最多允许的通过单子 */ public static final Integer MAX_PASSED_ORDER_NUM_PER_TASK = 200; + + private TopicCreationConstant() { + } } \ No newline at end of file diff --git a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/constant/TopicSampleConstant.java b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/constant/TopicSampleConstant.java index 5ee15331..d409e862 100644 --- a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/constant/TopicSampleConstant.java +++ b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/constant/TopicSampleConstant.java @@ -16,4 +16,7 @@ public class TopicSampleConstant { public static final Integer MAX_TIMEOUT_UNIT_MS = 10000; public static final Integer POLL_TIME_OUT_UNIT_MS = 2000; public static final Integer MAX_DATA_LENGTH_UNIT_BYTE = 2048; + + private TopicSampleConstant() { + } } \ No newline at end of file diff --git a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/constant/TrickLoginConstant.java b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/constant/TrickLoginConstant.java index 159e1c61..0bb92d2e 100644 --- a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/constant/TrickLoginConstant.java +++ b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/constant/TrickLoginConstant.java @@ -18,4 +18,7 @@ public class TrickLoginConstant { */ public static final String TRICK_LOGIN_SWITCH_ON = "on"; public static final String TRICK_LOGIN_SWITCH_OFF = "off"; + + private TrickLoginConstant() { + } } diff --git a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/zookeeper/ZkPathUtil.java b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/zookeeper/ZkPathUtil.java index 6705f435..0410a553 100644 --- a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/zookeeper/ZkPathUtil.java +++ b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/zookeeper/ZkPathUtil.java @@ -119,4 +119,7 @@ public class ZkPathUtil { public static String getControllerCandidatePath(Integer brokerId) { return D_CONTROLLER_CANDIDATES + ZOOKEEPER_SEPARATOR + brokerId; } + + private ZkPathUtil() { + } } diff --git a/kafka-manager-core/src/main/java/com/xiaojukeji/kafka/manager/service/service/impl/BrokerServiceImpl.java b/kafka-manager-core/src/main/java/com/xiaojukeji/kafka/manager/service/service/impl/BrokerServiceImpl.java index 12af2e18..24eea55f 100644 --- a/kafka-manager-core/src/main/java/com/xiaojukeji/kafka/manager/service/service/impl/BrokerServiceImpl.java +++ b/kafka-manager-core/src/main/java/com/xiaojukeji/kafka/manager/service/service/impl/BrokerServiceImpl.java @@ -91,7 +91,7 @@ public class BrokerServiceImpl implements BrokerService { for (BrokerDO brokerDO : brokerDOList) { PeakFlowStatusEnum peakFlowStatus = getPeakFlowStatus(brokerDO.getMaxAvgBytesIn(), peakFlow); peakFlowStatusMap.put( - peakFlowStatus.code, + peakFlowStatus.getCode(), peakFlowStatusMap.getOrDefault(peakFlowStatus.getCode(), 0) + 1 ); }