- 增加topic配置管理功能 close # 29

- 关闭延时消息时自动删除内置topic
- 优化国际化

Author: dushixiang

pom.xml

@@ -10,7 +10,7 @@
     </parent>
     <groupId>cn.typesafe</groupId>
     <artifactId>kafka-map</artifactId>
-    <version>1.2.0</version>
+    <version>1.2.1</version>
     <name>kafka-map</name>
     <description>a simple kafka manager</description>
     <properties>

src/main/java/cn/typesafe/km/controller/TopicController.java

@@ -10,6 +10,7 @@
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ExecutionException;
 
@@ -105,5 +106,9 @@ public List<TopicConfig> getConfigs(@PathVariable String topic, @RequestParam St
         return topicService.getConfigs(topic, clusterId);
     }
 
+    @PutMapping("/{topic}/configs")
+    public void updateConfigs(@PathVariable String topic, @RequestParam String clusterId, @RequestBody Map<String, String> configs) throws ExecutionException, InterruptedException {
+        topicService.setConfigs(topic, clusterId, configs);
+    }
 
 }

src/main/java/cn/typesafe/km/controller/handle/GlobalExceptionHandler.java

@@ -1,5 +1,6 @@
 package cn.typesafe.km.controller.handle;
 
+import org.apache.kafka.common.errors.InvalidRequestException;
 import org.apache.kafka.common.errors.TimeoutException;
 import org.apache.kafka.common.errors.TopicExistsException;
 import org.springframework.http.HttpStatus;
@@ -17,7 +18,17 @@ public class GlobalExceptionHandler {
     @ResponseStatus(value = HttpStatus.BAD_REQUEST)
     @ResponseBody
     @ExceptionHandler(value = TopicExistsException.class)
-    public Map<String, Object> exceptionHandler(TopicExistsException e) {
+    public Map<String, Object> topicExistsException(TopicExistsException e) {
+        String message = e.getMessage();
+        Map<String, Object> data = new HashMap<>();
+        data.put("message", message);
+        return data;
+    }
+
+    @ResponseStatus(value = HttpStatus.BAD_REQUEST)
+    @ResponseBody
+    @ExceptionHandler(value = InvalidRequestException.class)
+    public Map<String, Object> invalidRequestException(InvalidRequestException e) {
         String message = e.getMessage();
         Map<String, Object> data = new HashMap<>();
         data.put("message", message);

src/main/java/cn/typesafe/km/service/ClusterService.java

@@ -204,6 +204,32 @@ public void disableDelayMessage(String id) {
         delayMessageHelper.stop();
         cluster.setDelayMessageStatus(Constant.DELAY_MESSAGE_DISABLED);
         clusterRepository.saveAndFlush(cluster);
+
+        List<String> topics = List.of(
+            "delay-message",
+            "__delay-seconds-1",
+            "__delay-seconds-5",
+            "__delay-seconds-10",
+            "__delay-seconds-30",
+            "__delay-minutes-1",
+            "__delay-minutes-2",
+            "__delay-minutes-3",
+            "__delay-minutes-4",
+            "__delay-minutes-5",
+            "__delay-minutes-6",
+            "__delay-minutes-7",
+            "__delay-minutes-8",
+            "__delay-minutes-9",
+            "__delay-minutes-10",
+            "__delay-minutes-20",
+            "__delay-minutes-30",
+            "__delay-hours-1",
+            "__delay-hours-2");
+        try {
+            topicService.deleteTopic(id, topics);
+        } catch (ExecutionException | InterruptedException ignored) {
+
+        }
     }
 
     public void restore() {

src/main/web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kafka-map",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "private": true,
   "dependencies": {
     "@testing-library/jest-dom": "^5.11.4",

src/main/web/src/App.js

@@ -18,7 +18,7 @@ import en_US from './locales/en_US';
 import dayjs from "dayjs";
 import relativeTime from "dayjs/plugin/relativeTime";
 import 'dayjs/locale/zh-cn';
-import {IntlProvider} from 'react-intl';
+import {FormattedMessage, IntlProvider} from 'react-intl';
 import Login from "./components/Login";
 import request from "./common/request";
 import {
@@ -105,14 +105,14 @@ class App extends Component {
             <Menu>
                 <Menu.Item>
                     <Link to={`/info`}>
-                        修改密码
+                        <FormattedMessage id="change-password"/>
                     </Link>
                 </Menu.Item>
                 <Menu.Item>
                     <a href="/#" onClick={() => {
                         this.logout();
                     }}>
-                        退出登录
+                        <FormattedMessage id="logout"/>
                     </a>
                 </Menu.Item>
             </Menu>

src/main/web/src/common/request.js

@@ -9,6 +9,7 @@ import {getHeaders} from "../utils/utils";
 axios.defaults.baseURL = server;
 
 const handleError = (error) => {
+    console.log(error)
     if ("Network Error" === error.toString()) {
         message.error('网络异常');
         return false;
@@ -17,6 +18,7 @@ const handleError = (error) => {
         window.location.href = '#/login';
         return false;
     }
+
     if (error.response !== undefined) {
         let data = error.response.data;
         message.error(`${data.message}`, 10);

src/main/web/src/components/Cluster.js

@@ -12,7 +12,7 @@ import {
     Input,
     Divider,
     Popconfirm,
-    Switch, Popover
+    Switch, Popover, Alert
 } from "antd";
 import dayjs from "dayjs";
 import request from "../common/request";
@@ -34,15 +34,16 @@ const {Title, Text} = Typography;
 
 const content = (
     <div>
-        <p>基于kafka的延迟消息服务，支持18个级别，1s 5s 10s 30s 1m 2m 3m 4m 5m 6m 7m 8m 9m 10m 20m 30m 1h 2h。</p>
-        <p>向主题：delay-message 投递以下格式的消息即可，level 范围:0-17 。</p>
+        <Alert style={{marginTop: 5, marginBottom: 10}} message={<FormattedMessage id="delay-message-information1"/>} type="info" showIcon/>
+        <p><FormattedMessage id="delay-message-information2"/></p>
+        <p><FormattedMessage id="delay-message-information3"/></p>
         <pre>
             {JSON.stringify({
                 "level": 0,
                 "topic": "target",
                 "key": "key",
                 "value": "value"
-            }, null,4)}
+            }, null, 4)}
         </pre>
     </div>
 );
@@ -262,8 +263,8 @@ class Cluster extends Component {
             dataIndex: 'delayMessageStatus',
             key: 'delayMessageStatus',
             render: (delayMessageStatus, record, index) => {
-                return <Popover content={content} title="如何使用延迟消息服务？">
-                    <Switch checkedChildren="开启" unCheckedChildren="关闭" checked={delayMessageStatus === 'enabled'}
+                return <Popover content={content}>
+                    <Switch checked={delayMessageStatus === 'enabled'}
                             onChange={async (checked) => {
                                 let url = `/clusters/${record['id']}/disableDelayMessage`;
                                 if (checked) {
@@ -396,8 +397,8 @@ class Cluster extends Component {
                                             loading={this.state.delBtnLoading}
                                             onClick={() => {
                                                 const content = <div>
-                                                    您确定要删除选中的<Text style={{color: '#1890FF'}}
-                                                                   strong>{this.state.selectedRowKeys.length}</Text>条记录吗？
+                                                    Are you sure delete <Text style={{color: '#1890FF'}}
+                                                                              strong>{this.state.selectedRowKeys.length}</Text> items?
                                                 </div>;
                                                 confirm({
                                                     icon: <ExclamationCircleOutlined/>,

src/main/web/src/components/ClusterModal.js

@@ -59,7 +59,7 @@ const ClusterModal = ({title, handleOk, handleCancel, confirmLoading, model}) =>
                         </Form.Item> : undefined
                 }
 
-                <Form.Item label={'安全协议'} name='securityProtocol'>
+                <Form.Item label={<FormattedMessage id="security-protocol"/>} name='securityProtocol'>
                     <Select allowClear>
                         <Select.Option value="PLAINTEXT">PLAINTEXT</Select.Option>
                         <Select.Option value="SSL">SSL</Select.Option>
@@ -68,7 +68,7 @@ const ClusterModal = ({title, handleOk, handleCancel, confirmLoading, model}) =>
                     </Select>
                 </Form.Item>
 
-                <Form.Item label={'协议机制'} name='saslMechanism'>
+                <Form.Item label={<FormattedMessage id="sasl-mechanism"/>} name='saslMechanism'>
                     <Select allowClear>
                         <Select.Option value="GSSAPI">GSSAPI</Select.Option>
                         <Select.Option value="PLAIN">PLAIN</Select.Option>
@@ -78,11 +78,11 @@ const ClusterModal = ({title, handleOk, handleCancel, confirmLoading, model}) =>
                     </Select>
                 </Form.Item>
 
-                <Form.Item label={'username'} name='authUsername'>
+                <Form.Item label={<FormattedMessage id="username"/>} name='authUsername'>
                     <Input placeholder="" maxLength={200}/>
                 </Form.Item>
 
-                <Form.Item label={'password'} name='authPassword'>
+                <Form.Item label={<FormattedMessage id="password"/>} name='authPassword'>
                     <Input placeholder="" maxLength={200}/>
                 </Form.Item>
             </Form>