没有编辑权限，隐藏集群属性;打印全部操作日志.

2023-08-20 20:04:47 +08:00
parent b529dc313e
commit f5b27d9b40
18 changed files with 159 additions and 19 deletions
--- a/src/main/java/com/xuxd/kafka/console/controller/AclAuthController.java
+++ b/src/main/java/com/xuxd/kafka/console/controller/AclAuthController.java
@@ -1,5 +1,6 @@
 package com.xuxd.kafka.console.controller;

+import com.xuxd.kafka.console.aspect.annotation.ControllerLog;
 import com.xuxd.kafka.console.aspect.annotation.Permission;
 import com.xuxd.kafka.console.beans.AclEntry;
 import com.xuxd.kafka.console.beans.dto.AddAuthDTO;
@@ -46,6 +47,7 @@ public class AclAuthController {
        return aclService.getAclList(param.toEntry());
    }

+    @ControllerLog("增加Acl")
    @Permission({"acl:authority:add-principal", "acl:authority:add", "acl:sasl-scram:add-auth"})
    @PostMapping
    public Object addAcl(@RequestBody AddAuthDTO param) {
@@ -58,6 +60,7 @@ public class AclAuthController {
     * @param param entry.topic && entry.username must.
     * @return
     */
+    @ControllerLog("增加ProducerAcl")
    @Permission({"acl:authority:producer", "acl:sasl-scram:producer"})
    @PostMapping("/producer")
    public Object addProducerAcl(@RequestBody ProducerAuthDTO param) {
@@ -71,6 +74,7 @@ public class AclAuthController {
     * @param param entry.topic && entry.groupId entry.username must.
     * @return
     */
+    @ControllerLog("增加ConsumerAcl")
    @Permission({"acl:authority:consumer", "acl:sasl-scram:consumer"})
    @PostMapping("/consumer")
    public Object addConsumerAcl(@RequestBody ConsumerAuthDTO param) {
@@ -84,6 +88,7 @@ public class AclAuthController {
     * @param entry entry
     * @return
     */
+    @ControllerLog("删除Acl")
    @Permission({"acl:authority:clean", "acl:sasl-scram:pure"})
    @DeleteMapping
    public Object deleteAclByUser(@RequestBody AclEntry entry) {
@@ -96,6 +101,7 @@ public class AclAuthController {
     * @param param entry.username
     * @return
     */
+    @ControllerLog("删除Acl")
    @Permission({"acl:authority:clean", "acl:sasl-scram:pure"})
    @DeleteMapping("/user")
    public Object deleteAclByUser(@RequestBody DeleteAclDTO param) {
@@ -103,11 +109,12 @@ public class AclAuthController {
    }

    /**
-     * add producer acl.
+     * delete producer acl.
     *
     * @param param entry.topic && entry.username must.
     * @return
     */
+    @ControllerLog("删除ProducerAcl")
    @Permission({"acl:authority:clean", "acl:sasl-scram:pure"})
    @DeleteMapping("/producer")
    public Object deleteProducerAcl(@RequestBody ProducerAuthDTO param) {
@@ -116,11 +123,12 @@ public class AclAuthController {
    }

    /**
-     * add consumer acl.
+     * delete consumer acl.
     *
     * @param param entry.topic && entry.groupId entry.username must.
     * @return
     */
+    @ControllerLog("删除ConsumerAcl")
    @Permission({"acl:authority:clean", "acl:sasl-scram:pure"})
    @DeleteMapping("/consumer")
    public Object deleteConsumerAcl(@RequestBody ConsumerAuthDTO param) {
@@ -134,6 +142,7 @@ public class AclAuthController {
     * @param param acl principal.
     * @return true or false.
     */
+    @ControllerLog("清除Acl")
    @Permission({"acl:authority:clean", "acl:sasl-scram:pure"})
    @DeleteMapping("/clear")
    public Object clearAcl(@RequestBody DeleteAclDTO param) {
--- a/src/main/java/com/xuxd/kafka/console/controller/AclUserController.java
+++ b/src/main/java/com/xuxd/kafka/console/controller/AclUserController.java
@@ -1,5 +1,6 @@
 package com.xuxd.kafka.console.controller;

+import com.xuxd.kafka.console.aspect.annotation.ControllerLog;
 import com.xuxd.kafka.console.aspect.annotation.Permission;
 import com.xuxd.kafka.console.beans.AclEntry;
 import com.xuxd.kafka.console.beans.AclUser;
@@ -33,12 +34,14 @@ public class AclUserController {
        return aclService.getUserList();
    }

+    @ControllerLog("增加SaslUser")
    @Permission({"acl:sasl-scram:add-update", "acl:sasl-scram:add-auth"})
    @PostMapping
    public Object addOrUpdateUser(@RequestBody AclUser user) {
        return aclService.addOrUpdateUser(user.getUsername(), user.getPassword());
    }

+    @ControllerLog("删除SaslUser")
    @Permission({"acl:sasl-scram:del", "acl:sasl-scram:pure"})
    @DeleteMapping
    public Object deleteUser(@RequestBody AclUser user) {
@@ -46,6 +49,7 @@ public class AclUserController {
    }


+    @ControllerLog("删除SaslUser和Acl")
    @Permission({"acl:sasl-scram:del", "acl:sasl-scram:pure"})
    @DeleteMapping("/auth")
    public Object deleteUserAndAuth(@RequestBody AclUser user) {
--- a/src/main/java/com/xuxd/kafka/console/controller/ClientQuotaController.java
+++ b/src/main/java/com/xuxd/kafka/console/controller/ClientQuotaController.java
@@ -1,5 +1,6 @@
 package com.xuxd.kafka.console.controller;

+import com.xuxd.kafka.console.aspect.annotation.ControllerLog;
 import com.xuxd.kafka.console.aspect.annotation.Permission;
 import com.xuxd.kafka.console.beans.ResponseData;
 import com.xuxd.kafka.console.beans.dto.AlterClientQuotaDTO;
@@ -28,6 +29,7 @@ public class ClientQuotaController {
        return clientQuotaService.getClientQuotaConfigs(request.getTypes(), request.getNames());
    }

+    @ControllerLog("增加限流配额")
    @Permission({"quota:user:add", "quota:client:add", "quota:user-client:add", "quota:edit"})
    @PostMapping
    public Object alterClientQuotaConfigs(@RequestBody AlterClientQuotaDTO request) {
@@ -41,6 +43,7 @@ public class ClientQuotaController {
        return clientQuotaService.alterClientQuotaConfigs(request);
    }

+    @ControllerLog("删除限流配额")
    @Permission("quota:del")
    @DeleteMapping
    public Object deleteClientQuotaConfigs(@RequestBody AlterClientQuotaDTO request) {
--- a/src/main/java/com/xuxd/kafka/console/controller/ClusterController.java
+++ b/src/main/java/com/xuxd/kafka/console/controller/ClusterController.java
@@ -1,5 +1,6 @@
 package com.xuxd.kafka.console.controller;

+import com.xuxd.kafka.console.aspect.annotation.ControllerLog;
 import com.xuxd.kafka.console.aspect.annotation.Permission;
 import com.xuxd.kafka.console.beans.dto.ClusterInfoDTO;
 import com.xuxd.kafka.console.service.ClusterService;
@@ -30,23 +31,27 @@ public class ClusterController {
        return clusterService.getClusterInfo();
    }

+    @Permission("op:cluster-switch")
    @GetMapping("/info")
    public Object getClusterInfoList() {
        return clusterService.getClusterInfoList();
    }

+    @ControllerLog("增加集群信息")
    @Permission("op:cluster-switch:add")
    @PostMapping("/info")
    public Object addClusterInfo(@RequestBody ClusterInfoDTO dto) {
        return clusterService.addClusterInfo(dto.to());
    }

+    @ControllerLog("删除集群信息")
    @Permission("op:cluster-switch:del")
    @DeleteMapping("/info")
    public Object deleteClusterInfo(@RequestBody ClusterInfoDTO dto) {
        return clusterService.deleteClusterInfo(dto.getId());
    }

+    @ControllerLog("编辑集群信息")
    @Permission("op:cluster-switch:edit")
    @PutMapping("/info")
    public Object updateClusterInfo(@RequestBody ClusterInfoDTO dto) {
--- a/src/main/java/com/xuxd/kafka/console/controller/ConfigController.java
+++ b/src/main/java/com/xuxd/kafka/console/controller/ConfigController.java
@@ -1,5 +1,6 @@
 package com.xuxd.kafka.console.controller;

+import com.xuxd.kafka.console.aspect.annotation.ControllerLog;
 import com.xuxd.kafka.console.aspect.annotation.Permission;
 import com.xuxd.kafka.console.beans.ResponseData;
 import com.xuxd.kafka.console.beans.dto.AlterConfigDTO;
@@ -48,12 +49,14 @@ public class ConfigController {
        return configService.getTopicConfig(topic);
    }

+    @ControllerLog("编辑topic配置")
    @Permission("topic:property-config:edit")
    @PostMapping("/topic")
    public Object setTopicConfig(@RequestBody AlterConfigDTO dto) {
        return configService.alterTopicConfig(dto.getEntity(), dto.to(), AlterType.SET);
    }

+    @ControllerLog("删除topic配置")
    @Permission("topic:property-config:del")
    @DeleteMapping("/topic")
    public Object deleteTopicConfig(@RequestBody AlterConfigDTO dto) {
@@ -66,12 +69,14 @@ public class ConfigController {
        return configService.getBrokerConfig(brokerId);
    }

+    @ControllerLog("设置broker配置")
    @Permission("cluster:edit")
    @PostMapping("/broker")
    public Object setBrokerConfig(@RequestBody AlterConfigDTO dto) {
        return configService.alterBrokerConfig(dto.getEntity(), dto.to(), AlterType.SET);
    }

+    @ControllerLog("编辑broker配置")
    @Permission("cluster:edit")
    @DeleteMapping("/broker")
    public Object deleteBrokerConfig(@RequestBody AlterConfigDTO dto) {
@@ -84,12 +89,14 @@ public class ConfigController {
        return configService.getBrokerLoggerConfig(brokerId);
    }

+    @ControllerLog("编辑broker日志配置")
    @Permission("cluster:edit")
    @PostMapping("/broker/logger")
    public Object setBrokerLoggerConfig(@RequestBody AlterConfigDTO dto) {
        return configService.alterBrokerLoggerConfig(dto.getEntity(), dto.to(), AlterType.SET);
    }

+    @ControllerLog("删除broker日志配置")
    @Permission("cluster:edit")
    @DeleteMapping("/broker/logger")
    public Object deleteBrokerLoggerConfig(@RequestBody AlterConfigDTO dto) {
--- a/src/main/java/com/xuxd/kafka/console/controller/ConsumerController.java
+++ b/src/main/java/com/xuxd/kafka/console/controller/ConsumerController.java
@@ -1,5 +1,6 @@
 package com.xuxd.kafka.console.controller;

+import com.xuxd.kafka.console.aspect.annotation.ControllerLog;
 import com.xuxd.kafka.console.aspect.annotation.Permission;
 import com.xuxd.kafka.console.beans.ResponseData;
 import com.xuxd.kafka.console.beans.dto.AddSubscriptionDTO;
@@ -43,6 +44,7 @@ public class ConsumerController {
        return consumerService.getConsumerGroupList(groupIdList, stateSet);
    }

+    @ControllerLog("删除消费组")
    @Permission("group:del")
    @DeleteMapping("/group")
    public Object deleteConsumerGroup(@RequestParam("groupId") String groupId) {
@@ -61,12 +63,14 @@ public class ConsumerController {
        return consumerService.getConsumerDetail(groupId);
    }

+    @ControllerLog("新增消费组")
    @Permission("group:add")
    @PostMapping("/subscription")
    public Object addSubscription(@RequestBody AddSubscriptionDTO subscriptionDTO) {
        return consumerService.addSubscription(subscriptionDTO.getGroupId(), subscriptionDTO.getTopic());
    }

+    @ControllerLog("重置消费位点")
    @Permission({"group:consumer-detail:min",
            "group:consumer-detail:last",
            "group:consumer-detail:timestamp",
--- a/src/main/java/com/xuxd/kafka/console/controller/MessageController.java
+++ b/src/main/java/com/xuxd/kafka/console/controller/MessageController.java
@@ -1,5 +1,6 @@
 package com.xuxd.kafka.console.controller;

+import com.xuxd.kafka.console.aspect.annotation.ControllerLog;
 import com.xuxd.kafka.console.aspect.annotation.Permission;
 import com.xuxd.kafka.console.beans.QueryMessage;
 import com.xuxd.kafka.console.beans.ResponseData;
@@ -48,18 +49,21 @@ public class MessageController {
        return messageService.deserializerList();
    }

+    @ControllerLog("在线发送消息")
    @Permission("message:send")
    @PostMapping("/send")
    public Object send(@RequestBody SendMessage message) {
        return messageService.send(message);
    }

+    @ControllerLog("重新发送消息")
    @Permission("message:resend")
    @PostMapping("/resend")
    public Object resend(@RequestBody SendMessage message) {
        return messageService.resend(message);
    }

+    @ControllerLog("在线删除消息")
    @Permission("message:del")
    @DeleteMapping
    public Object delete(@RequestBody List<QueryMessage> messages) {
--- a/src/main/java/com/xuxd/kafka/console/controller/OperationController.java
+++ b/src/main/java/com/xuxd/kafka/console/controller/OperationController.java
@@ -1,5 +1,6 @@
 package com.xuxd.kafka.console.controller;

+import com.xuxd.kafka.console.aspect.annotation.ControllerLog;
 import com.xuxd.kafka.console.aspect.annotation.Permission;
 import com.xuxd.kafka.console.beans.TopicPartition;
 import com.xuxd.kafka.console.beans.dto.BrokerThrottleDTO;
@@ -24,12 +25,14 @@ public class OperationController {
    @Autowired
    private OperationService operationService;

+    @ControllerLog("同步消费位点")
    @PostMapping("/sync/consumer/offset")
    public Object syncConsumerOffset(@RequestBody SyncDataDTO dto) {
        dto.getProperties().put(AdminClientConfig.BOOTSTRAP_SERVERS_CONFIG, dto.getAddress());
        return operationService.syncConsumerOffset(dto.getGroupId(), dto.getTopic(), dto.getProperties());
    }

+    @ControllerLog("重新位点对齐")
    @PostMapping("/sync/min/offset/alignment")
    public Object minOffsetAlignment(@RequestBody SyncDataDTO dto) {
        dto.getProperties().put(AdminClientConfig.BOOTSTRAP_SERVERS_CONFIG, dto.getAddress());
@@ -41,23 +44,27 @@ public class OperationController {
        return operationService.getAlignmentList();
    }

+    @ControllerLog("deleteAlignment")
    @DeleteMapping("/sync/alignment")
    public Object deleteAlignment(@RequestParam("id") Long id) {
        return operationService.deleteAlignmentById(id);
    }

+    @ControllerLog("优先副本leader")
    @Permission({"topic:partition-detail:preferred", "op:replication-preferred"})
    @PostMapping("/replication/preferred")
    public Object electPreferredLeader(@RequestBody ReplicationDTO dto) {
        return operationService.electPreferredLeader(dto.getTopic(), dto.getPartition());
    }

+    @ControllerLog("配置同步限流")
    @Permission("op:config-throttle")
    @PostMapping("/broker/throttle")
    public Object configThrottle(@RequestBody BrokerThrottleDTO dto) {
        return operationService.configThrottle(dto.getBrokerList(), dto.getUnit().toKb(dto.getThrottle()));
    }

+    @ControllerLog("移除限流配置")
    @Permission("op:remove-throttle")
    @DeleteMapping("/broker/throttle")
    public Object removeThrottle(@RequestBody BrokerThrottleDTO dto) {
@@ -70,6 +77,7 @@ public class OperationController {
        return operationService.currentReassignments();
    }

+    @ControllerLog("取消副本重分配")
    @Permission("op:replication-update-detail:cancel")
    @DeleteMapping("/replication/reassignments")
    public Object cancelReassignment(@RequestBody TopicPartition partition) {
--- a/src/main/java/com/xuxd/kafka/console/controller/TopicController.java
+++ b/src/main/java/com/xuxd/kafka/console/controller/TopicController.java
@@ -1,5 +1,6 @@
 package com.xuxd.kafka.console.controller;

+import com.xuxd.kafka.console.aspect.annotation.ControllerLog;
 import com.xuxd.kafka.console.aspect.annotation.Permission;
 import com.xuxd.kafka.console.beans.ReplicaAssignment;
 import com.xuxd.kafka.console.beans.dto.AddPartitionDTO;
@@ -39,6 +40,7 @@ public class TopicController {
        return topicService.getTopicList(topic, TopicType.valueOf(type.toUpperCase()));
    }

+    @ControllerLog("删除topic")
    @Permission({"topic:batch-del", "topic:del"})
    @DeleteMapping
    public Object deleteTopic(@RequestBody List<String> topics) {
@@ -51,12 +53,14 @@ public class TopicController {
        return topicService.getTopicPartitionInfo(topic.trim());
    }

+    @ControllerLog("创建topic")
    @Permission("topic:add")
    @PostMapping("/new")
    public Object createNewTopic(@RequestBody NewTopicDTO topicDTO) {
        return topicService.createTopic(topicDTO.toNewTopic());
    }

+    @ControllerLog("增加topic分区")
    @Permission("topic:partition-add")
    @PostMapping("/partition/new")
    public Object addPartition(@RequestBody AddPartitionDTO partitionDTO) {
@@ -80,12 +84,14 @@ public class TopicController {
        return topicService.getCurrentReplicaAssignment(topic);
    }

+    @ControllerLog("更新副本")
    @Permission({"topic:replication-modify", "op:replication-reassign"})
    @PostMapping("/replica/assignment")
    public Object updateReplicaAssignment(@RequestBody ReplicaAssignment assignment) {
        return topicService.updateReplicaAssignment(assignment);
    }

+    @ControllerLog("配置限流")
    @Permission("topic:replication-sync-throttle")
    @PostMapping("/replica/throttle")
    public Object configThrottle(@RequestBody TopicThrottleDTO dto) {