diff --git a/docs/1_0_0/UserGuide_EN.md b/docs/1_0_0/UserGuide_EN.md index fd469d2..8a892a5 100644 --- a/docs/1_0_0/UserGuide_EN.md +++ b/docs/1_0_0/UserGuide_EN.md @@ -22,6 +22,7 @@ * clusterName (create on which cluster) * brokerName (create on which broker) * topicName + * messageType * writeQueueNums * readQueueNums * perm //2 for write 4 for read 6 for write and read diff --git a/src/main/java/org/apache/rocketmq/dashboard/model/request/TopicConfigInfo.java b/src/main/java/org/apache/rocketmq/dashboard/model/request/TopicConfigInfo.java index 2c633cd..dbff83e 100644 --- a/src/main/java/org/apache/rocketmq/dashboard/model/request/TopicConfigInfo.java +++ b/src/main/java/org/apache/rocketmq/dashboard/model/request/TopicConfigInfo.java @@ -19,6 +19,8 @@ import com.google.common.base.Objects; import java.util.List; +import org.apache.rocketmq.common.TopicConfig; + public class TopicConfigInfo { private List clusterNameList; @@ -30,6 +32,7 @@ public class TopicConfigInfo { private int readQueueNums; private int perm; private boolean order; + private String messageType; public List getClusterNameList() { return clusterNameList; @@ -91,6 +94,14 @@ public class TopicConfigInfo { this.order = order; } + public String getMessageType() { + return messageType; + } + + public void setMessageType(TopicConfig topicConfig) { + this.messageType = topicConfig.getAttributes().getOrDefault("message.type", "NORMAL"); + } + @Override public boolean equals(Object o) { if (this == o) @@ -102,12 +113,13 @@ public class TopicConfigInfo { readQueueNums == that.readQueueNums && perm == that.perm && order == that.order && + messageType == that.messageType && Objects.equal(topicName, that.topicName); } @Override public int hashCode() { - return Objects.hashCode(topicName, writeQueueNums, readQueueNums, perm, order); + return Objects.hashCode(topicName, writeQueueNums, readQueueNums, perm, order, messageType); } } diff --git a/src/main/java/org/apache/rocketmq/dashboard/service/impl/TopicServiceImpl.java b/src/main/java/org/apache/rocketmq/dashboard/service/impl/TopicServiceImpl.java index 1d7d571..7420237 100644 --- a/src/main/java/org/apache/rocketmq/dashboard/service/impl/TopicServiceImpl.java +++ b/src/main/java/org/apache/rocketmq/dashboard/service/impl/TopicServiceImpl.java @@ -155,6 +155,7 @@ public class TopicServiceImpl extends AbstractCommonService implements TopicServ TopicConfigInfo topicConfigInfo = new TopicConfigInfo(); TopicConfig topicConfig = examineTopicConfig(topic, brokerData.getBrokerName()); BeanUtils.copyProperties(topicConfig, topicConfigInfo); + topicConfigInfo.setMessageType(topicConfig); topicConfigInfo.setBrokerNameList(Lists.newArrayList(brokerData.getBrokerName())); topicConfigInfoList.add(topicConfigInfo); } diff --git a/src/main/resources/static/src/i18n/en.js b/src/main/resources/static/src/i18n/en.js index f9a4e3c..765352b 100644 --- a/src/main/resources/static/src/i18n/en.js +++ b/src/main/resources/static/src/i18n/en.js @@ -88,6 +88,7 @@ var en = { "KEY":"Key", "MESSAGE_BODY":"Message Body", "TOPIC_NAME":"topicName", + "MESSAGE_TYPE":"messageType", "ORDER":"order", "CONSUMER_CLIENT":"consumerClient", "BROKER_OFFSET":"brokerOffset", diff --git a/src/main/resources/static/src/i18n/zh.js b/src/main/resources/static/src/i18n/zh.js index b6fa589..a65a4b5 100644 --- a/src/main/resources/static/src/i18n/zh.js +++ b/src/main/resources/static/src/i18n/zh.js @@ -89,6 +89,7 @@ var zh = { "KEY":"值", "MESSAGE_BODY":"消息主体", "TOPIC_NAME":"主题名", + "MESSAGE_TYPE":"消息类型", "ORDER":"顺序", "CONSUMER_CLIENT":"消费者终端", "BROKER_OFFSET":"代理者位点", diff --git a/src/main/resources/static/src/topic.js b/src/main/resources/static/src/topic.js index 998f219..87c2719 100644 --- a/src/main/resources/static/src/topic.js +++ b/src/main/resources/static/src/topic.js @@ -333,6 +333,7 @@ module.controller('topicController', ['$scope', 'ngDialog', '$http', 'Notificati perm: 6, order: false, topicName: "", + messageType: "NORMAL", brokerNameList: [] }]; bIsUpdate = false; diff --git a/src/main/resources/static/view/pages/topic.html b/src/main/resources/static/view/pages/topic.html index bea5ac7..9e17432 100644 --- a/src/main/resources/static/view/pages/topic.html +++ b/src/main/resources/static/view/pages/topic.html @@ -189,6 +189,14 @@ {{'TOPIC_NAME'|translate}}不能为空. +
+ +
+ + {{'MESSAGE_TYPE'|translate}}不能为空. +
+