diff --git a/src/main/java/com/xuxd/kafka/console/controller/MessageController.java b/src/main/java/com/xuxd/kafka/console/controller/MessageController.java
index 98dd5de..ef9be13 100644
--- a/src/main/java/com/xuxd/kafka/console/controller/MessageController.java
+++ b/src/main/java/com/xuxd/kafka/console/controller/MessageController.java
@@ -49,17 +49,10 @@ public class MessageController {
return messageService.deserializerList();
}
- @ControllerLog("在线发送消息")
- @Permission("message:send")
@PostMapping("/send")
- public Object send(@RequestBody SendMessage message) {
- return messageService.send(message);
- }
-
- @PostMapping("/sendWithHeader")
@ControllerLog("在线发送消息")
@Permission("message:send")
- public Object sendWithHeader(@RequestBody SendMessage message) {
+ public Object send(@RequestBody SendMessage message) {
return messageService.sendWithHeader(message);
}
diff --git a/src/main/scala/kafka/console/ConsumerConsole.scala b/src/main/scala/kafka/console/ConsumerConsole.scala
index 631fd98..51f739d 100644
--- a/src/main/scala/kafka/console/ConsumerConsole.scala
+++ b/src/main/scala/kafka/console/ConsumerConsole.scala
@@ -94,7 +94,7 @@ class ConsumerConsole(config: KafkaConfig) extends KafkaConsole(config: KafkaCon
t.lag = t.logEndOffset - t.consumerOffset
}
}
- t.lag = t.logEndOffset - t.consumerOffset
+// t.lag = t.logEndOffset - t.consumerOffset
(topicPartition, t)
}).toMap
diff --git a/ui/src/utils/api.js b/ui/src/utils/api.js
index 1c56399..90649d5 100644
--- a/ui/src/utils/api.js
+++ b/ui/src/utils/api.js
@@ -288,10 +288,6 @@ export const KafkaMessageApi = {
url: "/message/send",
method: "post",
},
- sendWithHeader: {
- url: "/message/sendWithHeader",
- method: "post",
- },
resend: {
url: "/message/resend",
method: "post",
diff --git a/ui/src/views/message/SendMessage.vue b/ui/src/views/message/SendMessage.vue
index fa54080..219bb6a 100644
--- a/ui/src/views/message/SendMessage.vue
+++ b/ui/src/views/message/SendMessage.vue
@@ -15,15 +15,20 @@
},
]"
placeholder="请选择一个topic"
- >
+ >
{{ v }}
-
+
默认 {{ v }}
@@ -31,20 +36,32 @@
-
-
- | header key |
- header value |
-
-
- | |
- |
- 删除 |
+
+
+ |
+
+
+ |
+
+ 删除
+ |
+
+ 添加
+ |
- 添加
@@ -52,35 +69,37 @@
+ v-decorator="[
+ 'body',
+ {
+ rules: [
+ {
+ required: true,
+ message: '输入消息体!',
+ },
+ ],
+ },
+ ]"
+ placeholder="输入消息体!"
+ />
-
+
提交
@@ -97,18 +116,15 @@ import notification from "ant-design-vue/lib/notification";
export default {
name: "SendMessage",
components: {},
- props: {
- topicList: {
- type: Array,
- },
- },
+ props: {},
data() {
return {
form: this.$form.createForm(this, { name: "message_send" }),
loading: false,
partitions: [],
selectPartition: undefined,
- rows: [{ headerKey: '', headerValue: '' }],
+ rows: [{ headerKey: "", headerValue: "" }],
+ topicList: [],
};
},
methods: {
@@ -150,15 +166,15 @@ export default {
this.getPartitionInfo(topic);
},
addRow() {
- if(this.rows.length<32){
- this.rows.push({ HeaderKey: '', HeaderValue: '' });
+ if (this.rows.length < 32) {
+ this.rows.push({ HeaderKey: "", HeaderValue: "" });
}
},
deleteRow(index) {
this.rows.splice(index, 1);
},
handleSubmit(e) {
- e.preventDefault();
+ e.preventDefault();
this.form.validateFields((err, values) => {
if (!err) {
const param = Object.assign({}, values, {
@@ -167,8 +183,8 @@ export default {
});
this.loading = true;
request({
- url: KafkaMessageApi.sendWithHeader.url,
- method: KafkaMessageApi.sendWithHeader.method,
+ url: KafkaMessageApi.send.url,
+ method: KafkaMessageApi.send.method,
data: param,
}).then((res) => {
this.loading = false;
@@ -190,5 +206,11 @@ export default {
},
};
-
-
+