diff --git a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/utils/HttpUtils.java b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/utils/HttpUtils.java index 2a0d1eac..03904058 100644 --- a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/utils/HttpUtils.java +++ b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/utils/HttpUtils.java @@ -30,7 +30,7 @@ public class HttpUtils { private static int CONNECT_TIME_OUT = 15000; // 读取超时时间, 单位: ms - private static int READ_TIME_OUT = 2000; + private static int READ_TIME_OUT = 3000; private static final String METHOD_GET = "GET"; private static final String METHOD_POST = "POST"; diff --git a/kafka-manager-console/src/container/admin/cluster-list/index.tsx b/kafka-manager-console/src/container/admin/cluster-list/index.tsx index 2a87c69e..1dc246ca 100644 --- a/kafka-manager-console/src/container/admin/cluster-list/index.tsx +++ b/kafka-manager-console/src/container/admin/cluster-list/index.tsx @@ -134,19 +134,19 @@ export class ClusterList extends SearchAndFilterContainer { formData: item ? item : {}, visible: true, width: 590, - title: '注册集群', + title: item ? '编辑' : '接入集群', onSubmit: (value: IRegister) => { value.idc = region.currentRegion; if (item) { value.clusterId = item.clusterId; registerCluster(value).then(data => { admin.getMetaData(true); - notification.success({ message: '修改集群成功' }); + notification.success({ message: '编辑集群成功' }); }); } else { createCluster(value).then(data => { admin.getMetaData(true); - notification.success({ message: '注册集群成功' }); + notification.success({ message: '接入集群成功' }); }); } @@ -256,7 +256,7 @@ export class ClusterList extends SearchAndFilterContainer { 修改 + >编辑 {this.renderSearch('', '请输入集群名称')}
  • - +
    • diff --git a/kafka-manager-console/src/container/admin/config.tsx b/kafka-manager-console/src/container/admin/config.tsx index 8f7ec86c..098d0b49 100644 --- a/kafka-manager-console/src/container/admin/config.tsx +++ b/kafka-manager-console/src/container/admin/config.tsx @@ -26,7 +26,7 @@ export const getUserColumns = () => { render: (text: string, record: IUser) => { return ( - showApplyModal(record)}>修改 + showApplyModal(record)}>编辑 users.deleteUser(record.username)} @@ -105,7 +105,7 @@ export const getVersionColumns = () => { render: (text: string, record: IUploadFile) => { return ( - showModifyModal(record)}>修改 + showModifyModal(record)}>编辑 version.deleteFile(record.id)} @@ -164,7 +164,7 @@ export const getConfigureColumns = () => { render: (text: string, record: IConfigure) => { return ( - showConfigureModal(record)}>修改 + showConfigureModal(record)}>编辑 admin.deleteConfigure(record.configKey)} diff --git a/kafka-manager-console/src/container/admin/operation-management/config.tsx b/kafka-manager-console/src/container/admin/operation-management/config.tsx index ff551092..d21370f7 100644 --- a/kafka-manager-console/src/container/admin/operation-management/config.tsx +++ b/kafka-manager-console/src/container/admin/operation-management/config.tsx @@ -45,7 +45,7 @@ export const migrationTaskColumns = (migrationUrl: string) => { 开始 } {[0, 1].indexOf(item.status) > -1 && - modifyMigrationTask(item, 'modify')} style={{ marginRight: 16 }}>修改} + modifyMigrationTask(item, 'modify')} style={{ marginRight: 16 }}>编辑} {item.status === 0 && ( <> this.renderRessignDetail(item)} style={{ marginRight: 16 }}>详情 - modifyTransferTask(item, 'modify', this.taskId)}>修改 + modifyTransferTask(item, 'modify', this.taskId)}>编辑 ), }, diff --git a/kafka-manager-console/src/container/alarm/add-alarm/alarm-select.tsx b/kafka-manager-console/src/container/alarm/add-alarm/alarm-select.tsx index 95e93fc7..6d19ec26 100644 --- a/kafka-manager-console/src/container/alarm/add-alarm/alarm-select.tsx +++ b/kafka-manager-console/src/container/alarm/add-alarm/alarm-select.tsx @@ -52,7 +52,7 @@ export class AlarmSelect extends React.Component { target="_blank" href="https://github.com/didi/kafka-manager" > - 新建告警组？ + 新增规则组？ ); diff --git a/kafka-manager-console/src/container/alarm/add-alarm/config.tsx b/kafka-manager-console/src/container/alarm/add-alarm/config.tsx index 6bed50c3..de611ba1 100644 --- a/kafka-manager-console/src/container/alarm/add-alarm/config.tsx +++ b/kafka-manager-console/src/container/alarm/add-alarm/config.tsx @@ -14,7 +14,7 @@ import { region } from 'store/region'; export const getAlarmColumns = (urlPrefix: string) => { const columns = [ { - title: '告警名称', + title: '告警规则', dataIndex: 'name', key: 'name', width: '25%', @@ -32,7 +32,7 @@ export const getAlarmColumns = (urlPrefix: string) => { ); }, }, { - title: '应用名称', + title: '所属应用', dataIndex: 'appName', key: 'appName', width: '25%', @@ -72,7 +72,7 @@ export const getAlarmColumns = (urlPrefix: string) => { width: '10%', render: (text: string, item: IMonitorStrategies) => ( <> - 修改 + 编辑 deteleMonitor(item)} @@ -205,8 +205,8 @@ export const xActionFormMap = [{ export const xTypeFormMap = [{ key: 'alarmName', - label: '告警名称', - rules: [{ required: true, message: '请输入告警名称' }], + label: '告警规则', + rules: [{ required: true, message: '请输入告警规则' }], attrs: {placeholder: '请输入', disabled: isDetailPage}, }, { key: 'app', diff --git a/kafka-manager-console/src/container/alarm/add-alarm/index.tsx b/kafka-manager-console/src/container/alarm/add-alarm/index.tsx index 03347f5f..ae201823 100644 --- a/kafka-manager-console/src/container/alarm/add-alarm/index.tsx +++ b/kafka-manager-console/src/container/alarm/add-alarm/index.tsx @@ -152,7 +152,7 @@ export class AddAlarm extends SearchAndFilterContainer { handlePageBack('/alarm')} - title={(this.id || this.id === 0) ? '修改告警配置' : '新建告警配置'} + title={(this.id || this.id === 0) ? '编辑告警规则' : '新建告警规则'} extra={[ , , diff --git a/kafka-manager-console/src/container/alarm/alarm-detail/shield-history.tsx b/kafka-manager-console/src/container/alarm/alarm-detail/shield-history.tsx index 154bd4c0..71ec4877 100644 --- a/kafka-manager-console/src/container/alarm/alarm-detail/shield-history.tsx +++ b/kafka-manager-console/src/container/alarm/alarm-detail/shield-history.tsx @@ -34,7 +34,7 @@ export class ShieldHistory extends React.Component { title: '详情', content: (
      -
    • 告警名称：{record.monitorName}
      • +
    • 告警规则：{record.monitorName}
    • 开始时间：{moment(record.startTime).format(timeFormat)}
    • 结束时间：{moment(record.endTime).format(timeFormat)}
    • 说明：{record.description}
      • @@ -48,10 +48,10 @@ export class ShieldHistory extends React.Component { formMap: [ { key: 'monitorName', - label: '告警名称', + label: '告警规则', rules: [{ required: true, - message: '请输入告警名称', + message: '请输入告警规则', }], attrs: { disabled: true, @@ -112,7 +112,7 @@ export class ShieldHistory extends React.Component { monitorId: record.monitorId, } as IMonitorSilences; alarm.modifyMask(params, this.id).then(data => { - notification.success({ message: '修改成功' }); + notification.success({ message: '编辑成功' }); }); }, }; @@ -158,7 +158,7 @@ export class ShieldHistory extends React.Component { render: (action: any, record: IMonitorSilences) => { return( <> - this.modifyMonitor(record)} className="action-button">修改 + this.modifyMonitor(record)} className="action-button">编辑 this.silencesDetail(record)} className="action-button">详情 {this.renderApp('应用：')} - {this.renderSearch('名称：', '请输入告警名称或者操作人')} + {this.renderSearch('名称：', '请输入告警规则或者操作人')}
      • diff --git a/kafka-manager-console/src/container/app/app-list.tsx b/kafka-manager-console/src/container/app/app-list.tsx index e5db757c..ef897246 100644 --- a/kafka-manager-console/src/container/app/app-list.tsx +++ b/kafka-manager-console/src/container/app/app-list.tsx @@ -92,7 +92,7 @@ export class CommonAppList extends SearchAndFilterContainer { render: (text: any, record: IAppItem) => { return ( - showEditModal(record, this.from)}>修改 + showEditModal(record, this.from)}>编辑 showEditModal(record, this.from, true)}>详情 this.getOnlineConnect(record)}>申请下线 ); diff --git a/kafka-manager-console/src/container/modal/admin/cluster.ts b/kafka-manager-console/src/container/modal/admin/cluster.ts index e2b0616f..43b8a333 100644 --- a/kafka-manager-console/src/container/modal/admin/cluster.ts +++ b/kafka-manager-console/src/container/modal/admin/cluster.ts @@ -25,9 +25,10 @@ export const showEditClusterTopic = (item: IClusterTopics) => { label: '应用ID', rules: [{ required: true, + message: '请输入应用ID', }], attrs: { - disabled: true, + placeholder: '请输入应用ID', }, }, { diff --git a/kafka-manager-console/src/container/modal/admin/migration.ts b/kafka-manager-console/src/container/modal/admin/migration.ts index f27cb455..da89b003 100644 --- a/kafka-manager-console/src/container/modal/admin/migration.ts +++ b/kafka-manager-console/src/container/modal/admin/migration.ts @@ -104,7 +104,7 @@ export const modifyTransferTask = (item: IReassign, action: string, taskId: numb minThrottle: transBToMB(item.minThrottle), }, visible: true, - title: '修改', + title: '编辑', onSubmit: (value: IExecute) => { const params = { action, diff --git a/kafka-manager-console/src/container/modal/admin/user.ts b/kafka-manager-console/src/container/modal/admin/user.ts index 381b2f8f..dcfc69ae 100644 --- a/kafka-manager-console/src/container/modal/admin/user.ts +++ b/kafka-manager-console/src/container/modal/admin/user.ts @@ -30,7 +30,7 @@ export const showApplyModal = (record?: IUser) => { ], formData: record || {}, visible: true, - title: record ? '修改用户信息' : '新增用户', + title: record ? '修改用户' : '新增用户', onSubmit: (value: IUser) => { if (record) { return users.modfiyUser(value).then(() => { diff --git a/kafka-manager-console/src/container/modal/admin/version.ts b/kafka-manager-console/src/container/modal/admin/version.ts index a0e7a296..07e592af 100644 --- a/kafka-manager-console/src/container/modal/admin/version.ts +++ b/kafka-manager-console/src/container/modal/admin/version.ts @@ -133,7 +133,7 @@ export const showModifyModal = (record: IUploadFile) => { formData: record || {}, visible: true, isWaitting: true, - title: '修改', + title: '编辑', onSubmit: async (value: IUploadFile) => { value.file = value.uploadFile[0].originFileObj; const md5 = await computeChecksumMd5(value.file); @@ -175,11 +175,11 @@ export const showConfigureModal = (record?: IConfigure) => { formData: record || {}, visible: true, isWaitting: true, - title: `${record ? '修改配置' : '新建配置'}`, + title: `${record ? '编辑配置' : '新建配置'}`, onSubmit: async (value: IConfigure) => { if (record) { return admin.editConfigure(value).then(data => { - notification.success({ message: '修改配置成功' }); + notification.success({ message: '编辑配置成功' }); }); } return admin.addNewConfigure(value).then(data => { diff --git a/kafka-manager-console/src/container/modal/alarm.tsx b/kafka-manager-console/src/container/modal/alarm.tsx index 512e9a93..02742ab2 100644 --- a/kafka-manager-console/src/container/modal/alarm.tsx +++ b/kafka-manager-console/src/container/modal/alarm.tsx @@ -11,10 +11,10 @@ export const createMonitorSilences = (monitorId: number, monitorName: string) = formMap: [ { key: 'monitorName', - label: '告警名称', + label: '告警规则', rules: [{ required: true, - message: '请输入告警名称', + message: '请输入告警规则', }], attrs: { disabled: true, diff --git a/kafka-manager-console/src/container/modal/app.tsx b/kafka-manager-console/src/container/modal/app.tsx index f11779f8..64556c0d 100644 --- a/kafka-manager-console/src/container/modal/app.tsx +++ b/kafka-manager-console/src/container/modal/app.tsx @@ -85,7 +85,7 @@ export const showEditModal = (record?: IAppItem, from?: string, isDisabled?: boo ], formData: record, visible: true, - title: `${isDisabled ? '详情' : record ? '修改' : '应用申请'}`, + title: `${isDisabled ? '详情' : record ? '编辑' : '应用申请'}`, onSubmit: (value: IAppItem) => { if (isDisabled) { return; diff --git a/kafka-manager-core/pom.xml b/kafka-manager-core/pom.xml index 8bcc9293..966f7c93 100644 --- a/kafka-manager-core/pom.xml +++ b/kafka-manager-core/pom.xml @@ -31,7 +31,7 @@ com.xiaojukeji.kafka kafka-manager-dao - ${parent.version} + ${project.parent.version} diff --git a/kafka-manager-dao/pom.xml b/kafka-manager-dao/pom.xml index e6c66272..9db31a3e 100644 --- a/kafka-manager-dao/pom.xml +++ b/kafka-manager-dao/pom.xml @@ -29,7 +29,7 @@ com.xiaojukeji.kafka kafka-manager-common - ${parent.version} + ${project.parent.version} diff --git a/kafka-manager-extends/kafka-manager-account/pom.xml b/kafka-manager-extends/kafka-manager-account/pom.xml index 08c0047e..e112b5bf 100644 --- a/kafka-manager-extends/kafka-manager-account/pom.xml +++ b/kafka-manager-extends/kafka-manager-account/pom.xml @@ -18,17 +18,17 @@ com.xiaojukeji.kafka kafka-manager-common - ${parent.version} + ${project.parent.version} com.xiaojukeji.kafka kafka-manager-dao - ${parent.version} + ${project.parent.version} com.xiaojukeji.kafka kafka-manager-core - ${parent.version} + ${project.parent.version} diff --git a/kafka-manager-extends/kafka-manager-bpm/pom.xml b/kafka-manager-extends/kafka-manager-bpm/pom.xml index e8fb5f5d..3cf1c501 100644 --- a/kafka-manager-extends/kafka-manager-bpm/pom.xml +++ b/kafka-manager-extends/kafka-manager-bpm/pom.xml @@ -18,22 +18,22 @@ com.xiaojukeji.kafka kafka-manager-common - ${parent.version} + ${project.parent.version} com.xiaojukeji.kafka kafka-manager-dao - ${parent.version} + ${project.parent.version} com.xiaojukeji.kafka kafka-manager-core - ${parent.version} + ${project.parent.version} com.xiaojukeji.kafka kafka-manager-account - ${parent.version} + ${project.parent.version} \ No newline at end of file diff --git a/kafka-manager-extends/kafka-manager-kcm/pom.xml b/kafka-manager-extends/kafka-manager-kcm/pom.xml index 413ee056..ea581c86 100644 --- a/kafka-manager-extends/kafka-manager-kcm/pom.xml +++ b/kafka-manager-extends/kafka-manager-kcm/pom.xml @@ -35,12 +35,12 @@ com.xiaojukeji.kafka kafka-manager-dao - ${parent.version} + ${project.parent.version} com.xiaojukeji.kafka kafka-manager-common - ${parent.version} + ${project.parent.version} diff --git a/kafka-manager-extends/kafka-manager-monitor/pom.xml b/kafka-manager-extends/kafka-manager-monitor/pom.xml index a0592613..4def3e66 100644 --- a/kafka-manager-extends/kafka-manager-monitor/pom.xml +++ b/kafka-manager-extends/kafka-manager-monitor/pom.xml @@ -32,7 +32,7 @@ com.xiaojukeji.kafka kafka-manager-dao - ${parent.version} + ${project.parent.version} diff --git a/kafka-manager-extends/kafka-manager-openapi/pom.xml b/kafka-manager-extends/kafka-manager-openapi/pom.xml index 2ee65bc4..ca37d012 100644 --- a/kafka-manager-extends/kafka-manager-openapi/pom.xml +++ b/kafka-manager-extends/kafka-manager-openapi/pom.xml @@ -35,12 +35,12 @@ com.xiaojukeji.kafka kafka-manager-core - ${parent.version} + ${project.parent.version} com.xiaojukeji.kafka kafka-manager-bpm - ${parent.version} + ${project.parent.version} diff --git a/kafka-manager-task/pom.xml b/kafka-manager-task/pom.xml index f0b9c484..4741a948 100644 --- a/kafka-manager-task/pom.xml +++ b/kafka-manager-task/pom.xml @@ -31,12 +31,12 @@ com.xiaojukeji.kafka kafka-manager-core - ${parent.version} + ${project.parent.version} com.xiaojukeji.kafka kafka-manager-kcm - ${parent.version} + ${project.parent.version} com.xiaojukeji.kafka @@ -46,7 +46,7 @@ com.xiaojukeji.kafka kafka-manager-bpm - ${parent.version} + ${project.parent.version} diff --git a/kafka-manager-web/pom.xml b/kafka-manager-web/pom.xml index ff7bd8b7..17875676 100644 --- a/kafka-manager-web/pom.xml +++ b/kafka-manager-web/pom.xml @@ -19,28 +19,29 @@ 2.1.1.RELEASE 5.1.3.RELEASE false + 8.5.37 com.xiaojukeji.kafka kafka-manager-core - ${parent.version} + ${project.parent.version} com.xiaojukeji.kafka kafka-manager-kcm - ${parent.version} + ${project.parent.version} com.xiaojukeji.kafka kafka-manager-task - ${parent.version} + ${project.parent.version} com.xiaojukeji.kafka kafka-manager-monitor - ${parent.version} + ${project.parent.version} com.xiaojukeji.kafka diff --git a/kafka-manager-web/src/main/java/com/xiaojukeji/kafka/manager/web/api/versionone/gateway/GatewayServiceDiscoveryController.java b/kafka-manager-web/src/main/java/com/xiaojukeji/kafka/manager/web/api/versionone/gateway/GatewayServiceDiscoveryController.java index 699b30f0..0d4e899b 100644 --- a/kafka-manager-web/src/main/java/com/xiaojukeji/kafka/manager/web/api/versionone/gateway/GatewayServiceDiscoveryController.java +++ b/kafka-manager-web/src/main/java/com/xiaojukeji/kafka/manager/web/api/versionone/gateway/GatewayServiceDiscoveryController.java @@ -60,6 +60,9 @@ public class GatewayServiceDiscoveryController { if (ValidateUtils.isNull(config) || ValidateUtils.isNull(config.getClusterIdBootstrapServersMap())) { return Result.buildFailure("call init kafka bootstrap servers failed"); } + if (ValidateUtils.isEmptyMap(config.getClusterIdBootstrapServersMap())) { + return Result.buildSuc(); + } return Result.buildSuc(JSON.toJSONString(config.getClusterIdBootstrapServersMap())); } @@ -73,7 +76,9 @@ public class GatewayServiceDiscoveryController { if (ValidateUtils.isNull(config) || ValidateUtils.isNull(config.getClusterIdBootstrapServersMap())) { return Result.buildFailure("call update kafka bootstrap servers failed"); } - + if (ValidateUtils.isEmptyMap(config.getClusterIdBootstrapServersMap())) { + return Result.buildSuc(); + } return Result.buildSuc(JSON.toJSONString(new GatewayConfigVO( String.valueOf(config.getVersion()), JSON.toJSONString(config.getClusterIdBootstrapServersMap()) @@ -89,7 +94,9 @@ public class GatewayServiceDiscoveryController { if (ValidateUtils.isNull(config)) { return Result.buildFailure("call get request queue size config failed"); } - + if (ValidateUtils.isNull(config.getMaxRequestQueueSize())) { + return Result.buildSuc(); + } return Result.buildSuc(JSON.toJSONString( new GatewayConfigVO( String.valueOf(config.getVersion()), @@ -107,7 +114,9 @@ public class GatewayServiceDiscoveryController { if (ValidateUtils.isNull(config)) { return Result.buildFailure("call get app rate config failed"); } - + if (ValidateUtils.isNull(config.getAppRateLimit())) { + return Result.buildSuc(); + } return Result.buildSuc(JSON.toJSONString( new GatewayConfigVO( String.valueOf(config.getVersion()), @@ -125,6 +134,9 @@ public class GatewayServiceDiscoveryController { if (ValidateUtils.isNull(config)) { return Result.buildFailure("call get ip rate config failed"); } + if (ValidateUtils.isNull(config.getIpRateLimit())) { + return Result.buildSuc(); + } return Result.buildSuc(JSON.toJSONString( new GatewayConfigVO( String.valueOf(config.getVersion()), @@ -143,7 +155,9 @@ public class GatewayServiceDiscoveryController { if (ValidateUtils.isNull(config) || ValidateUtils.isNull(config.getSpRateMap())) { return Result.buildFailure("call update kafka bootstrap servers failed"); } - + if (ValidateUtils.isEmptyMap(config.getSpRateMap())) { + return Result.buildSuc(); + } List strList = new ArrayList<>(); for (Map.Entry entry: config.getSpRateMap().entrySet()) { strList.add(entry.getKey() + "#" + String.valueOf(entry.getValue())); diff --git a/kafka-manager-web/src/main/java/com/xiaojukeji/kafka/manager/web/api/versionone/thirdpart/ThirdPartConsumeController.java b/kafka-manager-web/src/main/java/com/xiaojukeji/kafka/manager/web/api/versionone/thirdpart/ThirdPartConsumeController.java index e14ed81d..d07e35ca 100644 --- a/kafka-manager-web/src/main/java/com/xiaojukeji/kafka/manager/web/api/versionone/thirdpart/ThirdPartConsumeController.java +++ b/kafka-manager-web/src/main/java/com/xiaojukeji/kafka/manager/web/api/versionone/thirdpart/ThirdPartConsumeController.java @@ -4,6 +4,7 @@ import com.xiaojukeji.kafka.manager.common.bizenum.ConsumeHealthEnum; import com.xiaojukeji.kafka.manager.common.bizenum.OffsetLocationEnum; import com.xiaojukeji.kafka.manager.common.constant.ApiPrefix; import com.xiaojukeji.kafka.manager.common.constant.Constant; +import com.xiaojukeji.kafka.manager.common.constant.SystemCodeConstant; import com.xiaojukeji.kafka.manager.common.entity.Result; import com.xiaojukeji.kafka.manager.common.entity.ResultStatus; import com.xiaojukeji.kafka.manager.common.entity.ao.consumer.ConsumeDetailDTO; @@ -29,6 +30,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; /** @@ -56,6 +58,8 @@ public class ThirdPartConsumeController { @Autowired private ThirdPartService thirdPartService; + private static final List WHITE_SYS_CODES_LIST = Arrays.asList(SystemCodeConstant.KAFKA_MANAGER); + @ApiOperation(value = "消费组健康", notes = "消费组是否健康") @RequestMapping(value = "clusters/consumer-health", method = RequestMethod.POST) @ResponseBody @@ -97,18 +101,20 @@ public class ThirdPartConsumeController { return Result.buildFrom(ResultStatus.CLUSTER_NOT_EXIST); } - // 检查AppID权限 - if (!appService.verifyAppIdByPassword(dto.getAppId(), dto.getPassword())) { - return Result.buildFrom(ResultStatus.PARAM_ILLEGAL); - } - // 检查权限 - AuthorityDO authority = + if (!WHITE_SYS_CODES_LIST.contains(dto.getSystemCode())) { + // 检查AppID权限 + if (!appService.verifyAppIdByPassword(dto.getAppId(), dto.getPassword())) { + return Result.buildFrom(ResultStatus.PARAM_ILLEGAL); + } + // 检查权限 + AuthorityDO authority = authorityService.getAuthority(dto.getClusterId(), dto.getTopicName(), dto.getAppId()); - if (ValidateUtils.isNull(authority) || (authority.getAccess() & 1) <= 0) { - authority = authorityService.getAuthority(dto.getClusterId(), "*", dto.getAppId()); - } - if (authority == null || (authority.getAccess() & 1) <= 0) { - return Result.buildFrom(ResultStatus.USER_WITHOUT_AUTHORITY); + if (ValidateUtils.isNull(authority) || (authority.getAccess() & 1) <= 0) { + authority = authorityService.getAuthority(dto.getClusterId(), "*", dto.getAppId()); + } + if (authority == null || (authority.getAccess() & 1) <= 0) { + return Result.buildFrom(ResultStatus.USER_WITHOUT_AUTHORITY); + } } List resultList = thirdPartService.resetOffsets(clusterDO, dto); diff --git a/pom.xml b/pom.xml index 4000bdf7..e7d9bed0 100644 --- a/pom.xml +++ b/pom.xml @@ -27,6 +27,7 @@ 1.8 UTF-8 UTF-8 + 8.5.37 @@ -67,7 +68,7 @@ javax.servlet javax.servlet-api - 4.0.1 + 3.1.0 javax.annotation @@ -124,7 +125,7 @@ org.apache.kafka kafka_2.10 - 0.10.2.2 + 0.10.2.0 org.slf4j @@ -135,7 +136,7 @@ org.apache.kafka kafka-clients - 0.10.2.2 + 0.10.2.0