jiulinxiri/rocketmq-dashboard
1
0
Fork 0
mirror of https://github.com/apache/rocketmq-dashboard.git synced 2025-09-11 20:15:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

[ISSUE #25]Add filter in consumer list. (#26)

Browse Source 
Co-authored-by: zhangjidi <zhangjidi@cmss.chinamobile.com>
This commit is contained in:
zhangjidi2016
2021-10-09 18:56:58 +08:00
committed by GitHub
parent d0583b73c3
commit cc30bb2373
10 changed files with 255 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/org/apache/rocketmq/dashboard/controller/ConsumerController.java
View File

@@ -47,8 +47,8 @@ public class ConsumerController {
@RequestMapping(value = "/groupList.query") @RequestMapping(value = "/groupList.query")
@ResponseBody @ResponseBody
public Object list() { public Object list(@RequestParam(value = "skipSysGroup", required = false) boolean skipSysGroup) {
return consumerService.queryGroupList(); return consumerService.queryGroupList(skipSysGroup);
} }
@RequestMapping(value = "/group.query") @RequestMapping(value = "/group.query")

2
src/main/java/org/apache/rocketmq/dashboard/service/ConsumerService.java
View File

@@ -31,7 +31,7 @@ import java.util.Map;
import java.util.Set; import java.util.Set;
public interface ConsumerService { public interface ConsumerService {
List<GroupConsumeInfo> queryGroupList(); List<GroupConsumeInfo> queryGroupList(boolean skipSysGroup);
GroupConsumeInfo queryGroup(String consumerGroup); GroupConsumeInfo queryGroup(String consumerGroup);

26
src/main/java/org/apache/rocketmq/dashboard/service/impl/ConsumerServiceImpl.java
View File

@@ -24,13 +24,16 @@ import com.google.common.collect.Lists;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
import java.util.Collections; import java.util.Collections;
import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.stream.Collectors;
import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.rocketmq.client.exception.MQClientException; import org.apache.rocketmq.client.exception.MQClientException;
import org.apache.rocketmq.common.MQVersion; import org.apache.rocketmq.common.MQVersion;
import org.apache.rocketmq.common.MixAll;
import org.apache.rocketmq.common.admin.ConsumeStats; import org.apache.rocketmq.common.admin.ConsumeStats;
import org.apache.rocketmq.common.admin.RollbackStats; import org.apache.rocketmq.common.admin.RollbackStats;
import org.apache.rocketmq.common.message.MessageQueue; import org.apache.rocketmq.common.message.MessageQueue;
@@ -62,8 +65,21 @@ import static com.google.common.base.Throwables.propagate;
public class ConsumerServiceImpl extends AbstractCommonService implements ConsumerService { public class ConsumerServiceImpl extends AbstractCommonService implements ConsumerService {
private Logger logger = LoggerFactory.getLogger(ConsumerServiceImpl.class); private Logger logger = LoggerFactory.getLogger(ConsumerServiceImpl.class);
private static final Set<String> SYSTEM_GROUP_SET = new HashSet<>();
static {
SYSTEM_GROUP_SET.add(MixAll.TOOLS_CONSUMER_GROUP);
SYSTEM_GROUP_SET.add(MixAll.FILTERSRV_CONSUMER_GROUP);
SYSTEM_GROUP_SET.add(MixAll.SELF_TEST_CONSUMER_GROUP);
SYSTEM_GROUP_SET.add(MixAll.ONS_HTTP_PROXY_GROUP);
SYSTEM_GROUP_SET.add(MixAll.CID_ONSAPI_PULL_GROUP);
SYSTEM_GROUP_SET.add(MixAll.CID_ONSAPI_PERMISSION_GROUP);
SYSTEM_GROUP_SET.add(MixAll.CID_ONSAPI_OWNER_GROUP);
SYSTEM_GROUP_SET.add(MixAll.CID_SYS_RMQ_TRANS);
}
@Override @Override
public List<GroupConsumeInfo> queryGroupList() { public List<GroupConsumeInfo> queryGroupList(boolean skipSysGroup) {
Set<String> consumerGroupSet = Sets.newHashSet(); Set<String> consumerGroupSet = Sets.newHashSet();
try { try {
ClusterInfo clusterInfo = mqAdminExt.examineBrokerClusterInfo(); ClusterInfo clusterInfo = mqAdminExt.examineBrokerClusterInfo();
@@ -79,6 +95,14 @@ public class ConsumerServiceImpl extends AbstractCommonService implements Consum
for (String consumerGroup : consumerGroupSet) { for (String consumerGroup : consumerGroupSet) {
groupConsumeInfoList.add(queryGroup(consumerGroup)); groupConsumeInfoList.add(queryGroup(consumerGroup));
} }
if (!skipSysGroup) {
groupConsumeInfoList.stream().map(group -> {
if (SYSTEM_GROUP_SET.contains(group.getGroup())) {
group.setGroup(String.format("%s%s", "%SYS%", group.getGroup()));
}
return group;
}).collect(Collectors.toList());
}
Collections.sort(groupConsumeInfoList); Collections.sort(groupConsumeInfoList);
return groupConsumeInfoList; return groupConsumeInfoList;
} }

30
src/main/resources/static/src/consumer.js
View File

@@ -43,6 +43,8 @@ module.controller('consumerController', ['$scope', 'ngDialog', '$http', 'Notific
}; };
$scope.userRole = $window.sessionStorage.getItem("userrole"); $scope.userRole = $window.sessionStorage.getItem("userrole");
$scope.writeOperationEnabled = $scope.userRole == null ? true : ($scope.userRole == 1 ? true : false); $scope.writeOperationEnabled = $scope.userRole == null ? true : ($scope.userRole == 1 ? true : false);
$scope.filterNormal = true;
$scope.filterSystem = false;
$scope.doSort = function () {// todo how to change this fe's code ? (it's dirty) $scope.doSort = function () {// todo how to change this fe's code ? (it's dirty)
if ($scope.sortKey == 'diffTotal') { if ($scope.sortKey == 'diffTotal') {
@@ -125,13 +127,37 @@ module.controller('consumerController', ['$scope', 'ngDialog', '$http', 'Notific
$scope.filterList(1) $scope.filterList(1)
}); });
$scope.$watch('filterNormal', function () {
$scope.filterList(1);
});
$scope.$watch('filterSystem', function () {
$scope.filterList(1);
});
$scope.filterByType = function (str) {
if ($scope.filterSystem) {
if (str.startsWith("%S")) {
return true
}
}
if ($scope.filterNormal) {
if (str.startsWith("%") == false) {
return true
}
}
return false;
};
$scope.filterList = function (currentPage) { $scope.filterList = function (currentPage) {
var lowExceptStr = $scope.filterStr.toLowerCase(); var lowExceptStr = $scope.filterStr.toLowerCase();
var canShowList = []; var canShowList = [];
$scope.allConsumerGrouopList.forEach(function (element) { $scope.allConsumerGrouopList.forEach(function (element) {
console.log(element) console.log(element)
if (element.group.toLowerCase().indexOf(lowExceptStr) != -1) { if ($scope.filterByType(element.group)) {
canShowList.push(element); if (element.group.toLowerCase().indexOf(lowExceptStr) != -1) {
canShowList.push(element);
}
} }
}); });
$scope.paginationConf.totalItems = canShowList.length; $scope.paginationConf.totalItems = canShowList.length;

44
src/main/resources/static/view/pages/consumer.html
View File

@@ -24,27 +24,25 @@
<label>{{ 'SUBSCRIPTION_GROUP' | translate}}:</label> <label>{{ 'SUBSCRIPTION_GROUP' | translate}}:</label>
<input type="text" class="form-control" ng-model="filterStr"> <input type="text" class="form-control" ng-model="filterStr">
</div> </div>
<div class="form-group form-group-sm"> <md-checkbox aria-label="Checkbox" ng-model="filterNormal" class="md-primary">{{'NORMAL' | translate}}
<button class="btn btn-raised btn-sm btn-primary" type="button" ng-show="{{writeOperationEnabled}}" </md-checkbox>
ng-click="openAddDialog()">{{'ADD' | translate}}/ {{'UPDATE' | translate}} <md-checkbox aria-label="Checkbox" ng-model="filterSystem" class="md-primary">{{'SYSTEM' | translate}}
</button> </md-checkbox>
</div> <button class="btn btn-raised btn-sm btn-primary" type="button" ng-show="{{writeOperationEnabled}}"
<div class="form-group form-group-sm"> ng-click="openAddDialog()">{{'ADD' | translate}}/ {{'UPDATE' | translate}}
<button class="btn btn-raised btn-sm btn-primary" type="button" ng-click="refreshConsumerData()"> </button>
{{'REFRESH' | translate}} <button class="btn btn-raised btn-sm btn-primary" type="button" ng-click="refreshConsumerData()">
</button> {{'REFRESH' | translate}}
</div> </button>
<div class="form-group form-group-sm"> <md-switch class="md-primary" md-no-ink aria-label="Switch No Ink" ng-model="intervalProcessSwitch">
<md-switch class="md-primary" md-no-ink aria-label="Switch No Ink" ng-model="intervalProcessSwitch"> {{'AUTO_REFRESH' | translate}}
{{'AUTO_REFRESH' | translate}} </md-switch>
</md-switch>
</div>
</form> </form>
</div> </div>
<br> <br>
<div> <div>
<div id="deployList" class="row"> <div id="deployList" class="row">
<table class="table table-bordered"> <table class="table table-bordered text-middle">
<tr> <tr>
<th class="text-center"><a ng-click="sortByKey('group')">{{ 'SUBSCRIPTION_GROUP' | translate}}</a></th> <th class="text-center"><a ng-click="sortByKey('group')">{{ 'SUBSCRIPTION_GROUP' | translate}}</a></th>
<th class="text-center"><a ng-click="sortByKey('count')">{{ 'QUANTITY' | translate}}</a></th> <th class="text-center"><a ng-click="sortByKey('count')">{{ 'QUANTITY' | translate}}</a></th>
@@ -55,15 +53,17 @@
<th class="text-center"><a ng-click="sortByKey('diffTotal')">{{ 'DELAY' | translate}}</a></th> <th class="text-center"><a ng-click="sortByKey('diffTotal')">{{ 'DELAY' | translate}}</a></th>
<th class="text-center">{{ 'OPERATION' | translate}}</th> <th class="text-center">{{ 'OPERATION' | translate}}</th>
</tr> </tr>
<tr ng-repeat="consumerGroup in consumerGroupShowList"> <tr ng-repeat="consumerGroup in consumerGroupShowList"
<td class="text-left">{{consumerGroup.group}}</td> ng-init="sysFlag = consumerGroup.group.startsWith('%SYS%')">
<td class="text-center"><font color={{sysFlag?"red":""}}>
{{sysFlag?consumerGroup.group.substring(5):consumerGroup.group}}</font></td>
<td class="text-center">{{consumerGroup.count}}</td> <td class="text-center">{{consumerGroup.count}}</td>
<td class="text-center">{{consumerGroup.version}}</td> <td class="text-center">{{consumerGroup.version}}</td>
<td class="text-center">{{consumerGroup.consumeType}}</td> <td class="text-center">{{consumerGroup.consumeType}}</td>
<td class="text-center">{{consumerGroup.messageModel}}</td> <td class="text-center">{{consumerGroup.messageModel}}</td>
<td class="text-center">{{consumerGroup.consumeTps}}</td> <td class="text-center">{{consumerGroup.consumeTps}}</td>
<td class="text-center">{{consumerGroup.diffTotal}}</td> <td class="text-center">{{consumerGroup.diffTotal}}</td>
<td class="text-center"> <td class="text-left">
<button name="client" ng-click="client(consumerGroup.group)" <button name="client" ng-click="client(consumerGroup.group)"
class="btn btn-raised btn-sm btn-primary" class="btn btn-raised btn-sm btn-primary"
type="button">{{'CLIENT' | translate}} type="button">{{'CLIENT' | translate}}
@@ -80,7 +80,7 @@
<!--</button>--> <!--</button>-->
<button name="client" ng-click="delete(consumerGroup.group)" <button name="client" ng-click="delete(consumerGroup.group)"
class="btn btn-raised btn-sm btn-danger" class="btn btn-raised btn-sm btn-danger"
ng-show="{{writeOperationEnabled}}" ng-show="{{!sysFlag && writeOperationEnabled}}"
type="button">{{'DELETE' | translate}} type="button">{{'DELETE' | translate}}
</button> </button>
@@ -284,7 +284,7 @@
<!--</div>--> <!--</div>-->
<!--</div>--> <!--</div>-->
<div class="form-group"> <div class="form-group">
<label class="control-label col-sm-4">brokerId:</label> <label class="control-label col-sm-2">brokerId:</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input class="form-control" ng-model="item.subscriptionGroupConfig.brokerId" type="text" <input class="form-control" ng-model="item.subscriptionGroupConfig.brokerId" type="text"
ng-disabled="{{!ngDialogData.writeOperationEnabled}}" required/> ng-disabled="{{!ngDialogData.writeOperationEnabled}}" required/>
@@ -292,7 +292,7 @@
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="control-label col-sm-4">whichBrokerWhenConsumeSlowly:</label> <label class="control-label col-sm-2">whichBrokerWhenConsumeSlowly:</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input class="form-control" <input class="form-control"
ng-model="item.subscriptionGroupConfig.whichBrokerWhenConsumeSlowly" type="text" ng-model="item.subscriptionGroupConfig.whichBrokerWhenConsumeSlowly" type="text"

147
src/main/resources/static/view/pages/message.html
View File

@@ -20,10 +20,10 @@
<md-content> <md-content>
<md-tabs md-dynamic-height="" md-border-bottom=""> <md-tabs md-dynamic-height="" md-border-bottom="">
<md-tab label="Topic"> <md-tab label="Topic">
<h5 class="md-display-5">Total {{paginationConf.totalItems}} Messages</h5>
<md-content class="md-padding" style="min-height:600px"> <md-content class="md-padding" style="min-height:600px">
<h5 class="md-display-5">Total {{paginationConf.totalItems}} Messages</h5>
<div class="row"> <div class="row">
<form class="form-inline pull-left col-sm-12"> <form class="form-inline pull-left">
<div class="form-group"> <div class="form-group">
<label>{{'TOPIC' | translate}}:</label> <label>{{'TOPIC' | translate}}:</label>
</div> </div>
@@ -65,7 +65,7 @@
<span class="glyphicon glyphicon-search"></span>{{ 'SEARCH' | translate}} <span class="glyphicon glyphicon-search"></span>{{ 'SEARCH' | translate}}
</button> </button>
</form> </form>
<table class="table table-bordered"> <table class="table table-bordered text-middle">
<tr> <tr>
<th class="text-center">Message ID</th> <th class="text-center">Message ID</th>
<th class="text-center">Tag</th> <th class="text-center">Tag</th>
@@ -91,84 +91,87 @@
</md-content> </md-content>
</md-tab> </md-tab>
<md-tab label="Message Key"> <md-tab label="Message Key">
<h5 class="md-display-5">Only Return 64 Messages</h5>
<md-content class="md-padding" style="min-height:600px"> <md-content class="md-padding" style="min-height:600px">
<h5 class="md-display-5">Only Return 64 Messages</h5> <div class="row">
<form class="form-inline pull-left">
<form class="form-inline pull-left col-sm-12"> <div class="form-group">
<div class="form-group"> <label>Topic:</label>
<label>Topic:</label> </div>
</div> <div class="form-group">
<div class="form-group"> <div style="width: 300px">
<div style="width: 300px"> <select name="mySelectTopic" chosen
<select name="mySelectTopic" chosen ng-model="selectedTopic"
ng-model="selectedTopic" ng-options="item for item in allTopicList"
ng-options="item for item in allTopicList" required>
required> <option value=""></option>
<option value=""></option> </select>
</select> </div>
</div>
<div class="form-group">
<label>Key:</label>
<input class="form-control" style="width: 450px" type="text" ng-model="key"
required/>
</div> </div>
</div>
<div class="form-group">
<label>Key:</label>
<input class="form-control" style="width: 450px" type="text" ng-model="key"
required/>
</div>
<button type="button" class="btn btn-raised btn-sm btn-primary" data-toggle="modal" <button type="button" class="btn btn-raised btn-sm btn-primary" data-toggle="modal"
ng-click="queryMessageByTopicAndKey()"> ng-click="queryMessageByTopicAndKey()">
<span class="glyphicon glyphicon-search"></span>{{ 'SEARCH' | translate}} <span class="glyphicon glyphicon-search"></span>{{ 'SEARCH' | translate}}
</button> </button>
</form> </form>
<table class="table table-bordered"> <table class="table table-bordered text-middle">
<tr> <tr>
<th class="text-center">Message ID</th> <th class="text-center">Message ID</th>
<th class="text-center">Tag</th> <th class="text-center">Tag</th>
<th class="text-center">Key</th> <th class="text-center">Key</th>
<th class="text-center">StoreTime</th> <th class="text-center">StoreTime</th>
<th class="text-center">Operation</th> <th class="text-center">Operation</th>
</tr> </tr>
<tr ng-repeat="item in queryMessageByTopicAndKeyResult"> <tr ng-repeat="item in queryMessageByTopicAndKeyResult">
<td class="text-center">{{item.msgId}}</td> <td class="text-center">{{item.msgId}}</td>
<td class="text-center">{{item.properties.TAGS}}</td> <td class="text-center">{{item.properties.TAGS}}</td>
<td class="text-center">{{item.properties.KEYS}}</td> <td class="text-center">{{item.properties.KEYS}}</td>
<td class="text-center">{{item.storeTimestamp | date:'yyyy-MM-dd HH:mm:ss'}} <td class="text-center">{{item.storeTimestamp | date:'yyyy-MM-dd HH:mm:ss'}}
</td> </td>
<td class="text-center"> <td class="text-center">
<button class="btn btn-raised btn-sm btn-primary" type="button" <button class="btn btn-raised btn-sm btn-primary" type="button"
ng-click="queryMessageByMessageId(item.msgId,item.topic)">Message Detail ng-click="queryMessageByMessageId(item.msgId,item.topic)">Message Detail
</button> </button>
</td> </td>
</tr> </tr>
</table> </table>
</div>
</md-content> </md-content>
</md-tab> </md-tab>
<md-tab label="Message ID"> <md-tab label="Message ID">
<h5 class="md-display-5">topic can't be empty if you producer client version>=v3.5.8</h5> <h5 class="md-display-5">topic can't be empty if you producer client version>=v3.5.8</h5>
<md-content class="md-padding" style="min-height:600px"> <md-content class="md-padding" style="min-height:600px">
<form class="form-inline pull-left col-sm-12"> <div class="row">
<div class="form-group"> <form class="form-inline pull-left">
<label>Topic:</label> <div class="form-group">
</div> <label>Topic:</label>
<div class="form-group ">
<div style="width: 300px">
<select name="mySelectTopic" chosen
ng-model="selectedTopic"
ng-options="item for item in allTopicList"
required>
<option value=""></option>
</select>
</div> </div>
</div> <div class="form-group ">
<div class="form-group"> <div style="width: 300px">
<label>MessageId:</label> <select name="mySelectTopic" chosen
<input class="form-control" style="width: 450px" type="text" ng-model="messageId" ng-model="selectedTopic"
required/> ng-options="item for item in allTopicList"
</div> required>
<button type="button" class="btn btn-raised btn-sm btn-primary" data-toggle="modal" <option value=""></option>
ng-click="queryMessageByMessageId(messageId,selectedTopic)"> </select>
<span class="glyphicon glyphicon-search"></span>{{ 'SEARCH' | translate}} </div>
</button> </div>
</form> <div class="form-group">
<label>MessageId:</label>
<input class="form-control" style="width: 450px" type="text" ng-model="messageId"
required/>
</div>
<button type="button" class="btn btn-raised btn-sm btn-primary" data-toggle="modal"
ng-click="queryMessageByMessageId(messageId,selectedTopic)">
<span class="glyphicon glyphicon-search"></span>{{ 'SEARCH' | translate}}
</button>
</form>
</div>
</md-content> </md-content>
</md-tab> </md-tab>
</md-tabs> </md-tabs>

187
src/main/resources/static/view/pages/messageTrace.html
View File

@@ -15,8 +15,8 @@
~ limitations under the License. ~ limitations under the License.
--> -->
<div class="container-fluid" id="deployHistoryList"> <div class="container-fluid" id="deployHistoryList">
<div class="modal-header"> <div class="modal-header" style="border-bottom: 0px">
<div class="row"> <div class="row" style="margin-left: 0px">
<label style="color: #000000">{{ 'TRACE_TOPIC' | translate }}:</label> <label style="color: #000000">{{ 'TRACE_TOPIC' | translate }}:</label>
<div style="display: inline-block; min-width: 300px"> <div style="display: inline-block; min-width: 300px">
<select name="mySelect" chosen <select name="mySelect" chosen
@@ -34,105 +34,110 @@
<md-content> <md-content>
<md-tabs md-dynamic-height="" md-border-bottom=""> <md-tabs md-dynamic-height="" md-border-bottom="">
<md-tab label="Message Key"> <md-tab label="Message Key">
<h5 class="md-display-5">Only Return 64 Messages</h5>
<md-content class="md-padding" style="min-height:600px"> <md-content class="md-padding" style="min-height:600px">
<h5 class="md-display-5">Only Return 64 Messages</h5> <div class="row">
<form class="form-inline pull-left col-sm-12"> <form class="form-inline pull-left">
<div class="form-group"> <div class="form-group">
<label>Topic:</label> <label>Topic:</label>
</div> </div>
<div class="form-group"> <div class="form-group">
<div style="width: 300px"> <div style="width: 300px">
<select name="mySelectTopic" chosen <select name="mySelectTopic" chosen
ng-model="selectedTopic" ng-model="selectedTopic"
ng-options="item for item in allTopicList" ng-options="item for item in allTopicList"
required> required>
<option value=""></option> <option value=""></option>
</select> </select>
</div>
</div>
<div class="form-group">
<label>Key:</label>
<input class="form-control" style="width: 450px" type="text" ng-model="key"
required/>
</div> </div>
</div>
<div class="form-group">
<label>Key:</label>
<input class="form-control" style="width: 450px" type="text" ng-model="key"
required/>
</div>
<button type="button" class="btn btn-raised btn-sm btn-primary" data-toggle="modal" <button type="button" class="btn btn-raised btn-sm btn-primary" data-toggle="modal"
ng-click="queryMessageByTopicAndKey()"> ng-click="queryMessageByTopicAndKey()">
<span class="glyphicon glyphicon-search"></span>{{ 'SEARCH' | translate}} <span class="glyphicon glyphicon-search"></span>{{ 'SEARCH' | translate}}
</button> </button>
</form> </form>
<table class="table table-bordered"> <table class="table table-bordered text-middle">
<tr> <tr>
<th class="text-center">Message ID</th> <th class="text-center">Message ID</th>
<th class="text-center">Tag</th> <th class="text-center">Tag</th>
<th class="text-center">Message Key</th> <th class="text-center">Message Key</th>
<th class="text-center">StoreTime</th> <th class="text-center">StoreTime</th>
<th class="text-center">Operation</th> <th class="text-center">Operation</th>
</tr> </tr>
<tr ng-repeat="item in queryMessageByTopicAndKeyResult"> <tr ng-repeat="item in queryMessageByTopicAndKeyResult">
<td class="text-center">{{item.msgId}}</td> <td class="text-center">{{item.msgId}}</td>
<td class="text-center">{{item.properties.TAGS}}</td> <td class="text-center">{{item.properties.TAGS}}</td>
<td class="text-center">{{item.properties.KEYS}}</td> <td class="text-center">{{item.properties.KEYS}}</td>
<td class="text-center">{{item.storeTimestamp | date:'yyyy-MM-dd HH:mm:ss'}} <td class="text-center">{{item.storeTimestamp | date:'yyyy-MM-dd HH:mm:ss'}}
</td> </td>
<td class="text-center"> <td class="text-center">
<button class="btn btn-raised btn-sm btn-primary" type="button" <button class="btn btn-raised btn-sm btn-primary" type="button"
ng-click="queryMessageTraceByMessageId(item.msgId, selectedTraceTopic)">{{ 'MESSAGE_TRACE_DETAIL' | translate }} ng-click="queryMessageTraceByMessageId(item.msgId, selectedTraceTopic)">{{ 'MESSAGE_TRACE_DETAIL' | translate }}
</button> </button>
</td> </td>
</tr> </tr>
</table> </table>
</div>
</md-content> </md-content>
</md-tab> </md-tab>
<md-tab label="Message ID"> <md-tab label="Message ID">
<h5 class="md-display-5">topic can't be empty if you producer client version>=v3.5.8</h5> <h5 class="md-display-5">topic can't be empty if you producer client version>=v3.5.8</h5>
<md-content class="md-padding" style="min-height:600px"> <md-content class="md-padding" style="min-height:600px">
<form class="form-inline pull-left col-sm-12"> <div class="row">
<div class="form-group">
<label>Topic:</label> <form class="form-inline pull-left">
</div> <div class="form-group">
<div class="form-group "> <label>Topic:</label>
<div style="width: 300px">
<select name="mySelectTopic" chosen
ng-model="selectedTopic"
ng-options="item for item in allTopicList"
required>
<option value=""></option>
</select>
</div> </div>
</div> <div class="form-group ">
<div class="form-group"> <div style="width: 300px">
<label>MessageId:</label> <select name="mySelectTopic" chosen
<input class="form-control" style="width: 450px" type="text" ng-model="messageId" ng-model="selectedTopic"
required/> ng-options="item for item in allTopicList"
</div> required>
<button type="button" class="btn btn-raised btn-sm btn-primary" data-toggle="modal" <option value=""></option>
ng-click="queryMessageByMessageId(messageId,selectedTopic)"> </select>
<span class="glyphicon glyphicon-search"></span>{{ 'SEARCH' | translate}} </div>
</button> </div>
</form> <div class="form-group">
<table class="table table-bordered"> <label>MessageId:</label>
<tr> <input class="form-control" style="width: 450px" type="text" ng-model="messageId"
<th class="text-center">Message ID</th> required/>
<th class="text-center">Tag</th> </div>
<th class="text-center">Message Key</th> <button type="button" class="btn btn-raised btn-sm btn-primary" data-toggle="modal"
<th class="text-center">StoreTime</th> ng-click="queryMessageByMessageId(messageId,selectedTopic)">
<th class="text-center">Operation</th> <span class="glyphicon glyphicon-search"></span>{{ 'SEARCH' | translate}}
</tr> </button>
<tr ng-repeat="item in queryMessageByMessageIdResult"> </form>
<td class="text-center">{{item.msgId}}</td> <table class="table table-bordered text-middle">
<td class="text-center">{{item.properties.TAGS}}</td> <tr>
<td class="text-center">{{item.properties.KEYS}}</td> <th class="text-center">Message ID</th>
<td class="text-center">{{item.storeTimestamp | date:'yyyy-MM-dd HH:mm:ss'}} <th class="text-center">Tag</th>
</td> <th class="text-center">Message Key</th>
<td class="text-center"> <th class="text-center">StoreTime</th>
<button class="btn btn-raised btn-sm btn-primary" type="button" <th class="text-center">Operation</th>
ng-click="queryMessageTraceByMessageId(item.msgId, selectedTraceTopic)">{{ 'MESSAGE_TRACE_DETAIL' | translate }} </tr>
</button> <tr ng-repeat="item in queryMessageByMessageIdResult">
</td> <td class="text-center">{{item.msgId}}</td>
</tr> <td class="text-center">{{item.properties.TAGS}}</td>
</table> <td class="text-center">{{item.properties.KEYS}}</td>
<td class="text-center">{{item.storeTimestamp | date:'yyyy-MM-dd HH:mm:ss'}}
</td>
<td class="text-center">
<button class="btn btn-raised btn-sm btn-primary" type="button"
ng-click="queryMessageTraceByMessageId(item.msgId, selectedTraceTopic)">{{ 'MESSAGE_TRACE_DETAIL' | translate }}
</button>
</td>
</tr>
</table>
</div>
</md-content> </md-content>
</md-tab> </md-tab>
</md-tabs> </md-tabs>

2
src/main/resources/static/view/pages/topic.html
View File

@@ -48,7 +48,7 @@
</tr> </tr>
<tr ng-repeat="fTopic in topicShowList" <tr ng-repeat="fTopic in topicShowList"
ng-init="sysFlag = fTopic.startsWith('%SYS%'); topic = sysFlag?fTopic.substring(5):fTopic"> ng-init="sysFlag = fTopic.startsWith('%SYS%'); topic = sysFlag?fTopic.substring(5):fTopic">
<td class="text-left"><font color={{sysFlag?"red":""}}>{{topic}}</font></td> <td class="text-center"><font color={{sysFlag?"red":""}}>{{topic}}</font></td>
<td class="text-left"> <td class="text-left">
<button class="btn btn-raised btn-sm btn-primary" type="button" <button class="btn btn-raised btn-sm btn-primary" type="button"
ng-click="statsView(topic)">{{'STATUS' | translate}} ng-click="statsView(topic)">{{'STATUS' | translate}}

2
src/test/java/org/apache/rocketmq/dashboard/controller/ConsumerControllerTest.java
View File

@@ -92,7 +92,7 @@ public class ConsumerControllerTest extends BaseControllerTest {
requestBuilder = MockMvcRequestBuilders.get(url); requestBuilder = MockMvcRequestBuilders.get(url);
perform = mockMvc.perform(requestBuilder); perform = mockMvc.perform(requestBuilder);
perform.andExpect(status().isOk()) perform.andExpect(status().isOk())
.andExpect(jsonPath("$.data", hasSize(1))) .andExpect(jsonPath("$.data", hasSize(2)))
.andExpect(jsonPath("$.data[0].group").value("group_test")) .andExpect(jsonPath("$.data[0].group").value("group_test"))
.andExpect(jsonPath("$.data[0].consumeType").value(ConsumeType.CONSUME_ACTIVELY.name())) .andExpect(jsonPath("$.data[0].consumeType").value(ConsumeType.CONSUME_ACTIVELY.name()))
.andExpect(jsonPath("$.data[0].messageModel").value(MessageModel.CLUSTERING.name())); .andExpect(jsonPath("$.data[0].messageModel").value(MessageModel.CLUSTERING.name()));

5
src/test/java/org/apache/rocketmq/dashboard/util/MockObjectUtil.java
View File

@@ -135,10 +135,13 @@ public class MockObjectUtil {
public static SubscriptionGroupWrapper createSubscriptionGroupWrapper() { public static SubscriptionGroupWrapper createSubscriptionGroupWrapper() {
SubscriptionGroupWrapper wrapper = new SubscriptionGroupWrapper(); SubscriptionGroupWrapper wrapper = new SubscriptionGroupWrapper();
ConcurrentMap<String, SubscriptionGroupConfig> subscriptionGroupTable = new ConcurrentHashMap(2);
SubscriptionGroupConfig config = new SubscriptionGroupConfig(); SubscriptionGroupConfig config = new SubscriptionGroupConfig();
config.setGroupName("group_test"); config.setGroupName("group_test");
ConcurrentMap<String, SubscriptionGroupConfig> subscriptionGroupTable = new ConcurrentHashMap(2);
subscriptionGroupTable.put("group_test", config); subscriptionGroupTable.put("group_test", config);
SubscriptionGroupConfig sysGroupConfig = new SubscriptionGroupConfig();
sysGroupConfig.setGroupName(MixAll.TOOLS_CONSUMER_GROUP);
subscriptionGroupTable.put(MixAll.TOOLS_CONSUMER_GROUP, sysGroupConfig);
wrapper.setSubscriptionGroupTable(subscriptionGroupTable); wrapper.setSubscriptionGroupTable(subscriptionGroupTable);
wrapper.setDataVersion(new DataVersion()); wrapper.setDataVersion(new DataVersion());
return wrapper; return wrapper;