Bump shell-quote and react-scripts in /frontend

Bumps [shell-quote](https://github.com/ljharb/shell-quote) to 1.8.0 and updates ancestor dependency [react-scripts](https://github.com/facebook/create-react-app/tree/HEAD/packages/react-scripts). These dependencies need to be updated together.


Updates `shell-quote` from 1.7.2 to 1.8.0
- [Release notes](https://github.com/ljharb/shell-quote/releases)
- [Changelog](https://github.com/ljharb/shell-quote/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ljharb/shell-quote/compare/v1.7.2...v1.8.0)

Updates `react-scripts` from 4.0.3 to 5.0.1
- [Release notes](https://github.com/facebook/create-react-app/releases)
- [Changelog](https://github.com/facebook/create-react-app/blob/main/CHANGELOG-4.x.md)
- [Commits](https://github.com/facebook/create-react-app/commits/react-scripts@5.0.1/packages/react-scripts)

---
updated-dependencies:
- dependency-name: shell-quote
  dependency-type: indirect
- dependency-name: react-scripts
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

.gitignore

@@ -5,5 +5,4 @@
 .project
 .factorypath
 .settings/
-.vscode
-htmlReport/
+.vscode

docs/1_0_0/UserGuide_CN.md

@@ -63,18 +63,6 @@
 * 根据消息主题和消息Id进行消息的查询
 * 消息详情可以展示这条消息的详细信息，查看消息对应到具体消费组的消费情况（如果异常，可以查看具体的异常信息）。可以向指定的消费组重发消息。
 
-## RocketMQ-V5.0 仪表盘
-* 版本切换
-  * RocketMQ右上角可切换不同版本，用户可以自主选择 RocketMQ-5.x 或 RocketMQ-4.x 版本
-* 主题页面 
-  * 支持延迟/顺序/事务消息的筛选
-  * 支持延迟/顺序/事物/普通等多种消息类型主题的新增与更新
-* 消费页面
-  * 支持顺序消费类型订阅组的过滤
-  * 提供顺序消费类型订阅组的新增与更新，如果需要开启顺序消费，FIFO类型的订阅组一定需要打开consumeOrderlyEnable选项
-* 代理页面（RocketMQ 5.0新增） 
-  * 支持代理节点的新增与查询
-  * 支持代理节点地址配置：在application.yml中可对proxyAddr和proxyAddrs属性进行预配置
 
 ## HTTPS 方式访问Dashboard
 * HTTPS功能实际上是使用SpringBoot提供的配置功能即可完成，首先，需要有一个SSL KeyStore来存放服务端证书，可以使用本工程所提供的测试密钥库:

docs/1_0_0/UserGuide_EN.md

@@ -64,18 +64,6 @@
 * look over this message's detail info.you can see the message's consume state(each group has one line),show the exception message if has exception.
 you can send this message to the group you selected
 
-## RocketMQ-V5.0 dashboard
-* Version switching
-  * RocketMQ can switch between different versions in the upper right corner, and users can freely choose between RocketMQ-5.X or RocketMQ-4.X versions
-* Theme page
-  * Support filtering of delayed/sequential/transaction messages
-  * Support the addition and update of multiple message types such as delay, sequence, object, and ordinary themes
-* Consumption page
-  * Support filtering of subscription groups for fifo consumption types
-  * Provide the addition and update of subscription groups for sequential consumption types. If fifo consumption needs to be enabled, FIFO type subscription groups must have the consumeOrderlyEnable option enabled
-* Proxy page (Added in RocketMQ 5.0)
-  * Support for adding and querying proxy nodes
-  * Support proxy node address configuration: ProxyAddr and proxyAddrs properties can be pre configured in application.yml
 
 ## Access Dashboard with HTTPS
 * SpringBoot itself has provided the SSL configuration. You can use the project test Keystore:resources/rmqcngkeystore.jks. The store is generated with the following unix keytool commands:

frontend/package.json

@@ -9,7 +9,7 @@
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
     "react-json-view": "^1.21.3",
-    "react-scripts": "4.0.3",
+    "react-scripts": "5.0.1",
     "web-vitals": "^1.0.1"
   },
   "proxy": "http://localhost:8080",

pom.xml

@@ -28,7 +28,7 @@
     <groupId>org.apache.rocketmq</groupId>
     <artifactId>rocketmq-dashboard</artifactId>
     <packaging>jar</packaging>
-    <version>2.0.1-SNAPSHOT</version>
+    <version>1.0.1-SNAPSHOT</version>
     <name>rocketmq-dashboard</name>
 
     <scm>
@@ -91,7 +91,7 @@
         <commons-io.version>2.4</commons-io.version>
         <commons-cli.version>1.2</commons-cli.version>
         <commons-collections.version>3.2.2</commons-collections.version>
-        <rocketmq.version>5.1.0</rocketmq.version>
+        <rocketmq.version>4.9.3</rocketmq.version>
         <surefire.version>2.19.1</surefire.version>
         <aspectj.version>1.9.6</aspectj.version>
         <lombok.version>1.18.22</lombok.version>
@@ -104,7 +104,7 @@
         <easyexcel.version>2.2.10</easyexcel.version>
         <asm.version>4.2</asm.version>
         <junit.version>4.12</junit.version>
-        <snakeyaml.version>1.32</snakeyaml.version>
+        <snakeyaml.version>1.30</snakeyaml.version>
         <cglib.version>2.2.2</cglib.version>
         <joor.version>0.9.6</joor.version>
         <bcpkix-jdk15on.version>1.68</bcpkix-jdk15on.version>
@@ -167,7 +167,6 @@
             <groupId>org.apache.rocketmq</groupId>
             <artifactId>rocketmq-namesrv</artifactId>
             <version>${rocketmq.version}</version>
-            <scope>test</scope>
             <exclusions>
                 <exclusion>
                     <groupId>org.slf4j</groupId>
@@ -187,7 +186,6 @@
             <groupId>org.apache.rocketmq</groupId>
             <artifactId>rocketmq-broker</artifactId>
             <version>${rocketmq.version}</version>
-            <scope>test</scope>
             <exclusions>
                 <exclusion>
                     <groupId>org.slf4j</groupId>
@@ -461,7 +459,7 @@
                         <configuration>
                             <target>
                                 <copy todir="${project.build.directory}/classes/public">
-                                    <fileset dir="${project.basedir}/frontend/build" />
+                                    <fileset dir="${project.basedir}/frontend/build"/>
                                 </copy>
                             </target>
                         </configuration>

src/main/java/org/apache/rocketmq/dashboard/admin/MQAdminPooledObjectFactory.java

@@ -21,7 +21,7 @@ import org.apache.commons.collections.MapUtils;
 import org.apache.commons.pool2.PooledObject;
 import org.apache.commons.pool2.PooledObjectFactory;
 import org.apache.commons.pool2.impl.DefaultPooledObject;
-import org.apache.rocketmq.remoting.protocol.body.ClusterInfo;
+import org.apache.rocketmq.common.protocol.body.ClusterInfo;
 import org.apache.rocketmq.tools.admin.MQAdminExt;
 
 @Slf4j

src/main/java/org/apache/rocketmq/dashboard/config/RMQConfigure.java

@@ -43,8 +43,6 @@ public class RMQConfigure {
     //use rocketmq.namesrv.addr first,if it is empty,than use system proerty or system env
     private volatile String namesrvAddr = System.getProperty(MixAll.NAMESRV_ADDR_PROPERTY, System.getenv(MixAll.NAMESRV_ADDR_ENV));
 
-    private volatile String proxyAddr;
-
     private volatile String isVIPChannel = System.getProperty(SEND_MESSAGE_WITH_VIP_CHANNEL_PROPERTY, "true");
 
 
@@ -64,8 +62,6 @@ public class RMQConfigure {
 
     private List<String> namesrvAddrs = new ArrayList<>();
 
-    private List<String> proxyAddrs = new ArrayList<>();
-
     public String getAccessKey() {
         return accessKey;
     }
@@ -90,25 +86,6 @@ public class RMQConfigure {
         return namesrvAddrs;
     }
 
-    public List<String> getProxyAddrs() {
-        return this.proxyAddrs;
-    }
-
-    public void setProxyAddrs(List<String> proxyAddrs) {
-        this.proxyAddrs = proxyAddrs;
-        if (CollectionUtils.isNotEmpty(proxyAddrs)) {
-            this.setProxyAddr(proxyAddrs.get(0));
-        }
-    }
-
-    public String getProxyAddr() {
-        return proxyAddr;
-    }
-
-    public void setProxyAddr(String proxyAddr) {
-        this.proxyAddr = proxyAddr;
-    }
-
     public void setNamesrvAddrs(List<String> namesrvAddrs) {
         this.namesrvAddrs = namesrvAddrs;
         if (CollectionUtils.isNotEmpty(namesrvAddrs)) {

src/main/java/org/apache/rocketmq/dashboard/controller/ConsumerController.java

@@ -19,7 +19,7 @@ package org.apache.rocketmq.dashboard.controller;
 import com.google.common.base.Preconditions;
 import javax.annotation.Resource;
 import org.apache.commons.collections.CollectionUtils;
-import org.apache.rocketmq.remoting.protocol.body.ConsumerConnection;
+import org.apache.rocketmq.common.protocol.body.ConsumerConnection;
 import org.apache.rocketmq.dashboard.model.ConnectionInfo;
 import org.apache.rocketmq.dashboard.model.request.ConsumerConfigInfo;
 import org.apache.rocketmq.dashboard.model.request.DeleteSubGroupRequest;
@@ -47,14 +47,14 @@ public class ConsumerController {
 
     @RequestMapping(value = "/groupList.query")
     @ResponseBody
-    public Object list(@RequestParam(value = "skipSysGroup", required = false) boolean skipSysGroup, String address) {
-        return consumerService.queryGroupList(skipSysGroup, address);
+    public Object list(@RequestParam(value = "skipSysGroup", required = false) boolean skipSysGroup) {
+        return consumerService.queryGroupList(skipSysGroup);
     }
 
     @RequestMapping(value = "/group.query")
     @ResponseBody
-    public Object groupQuery(@RequestParam String consumerGroup, String address) {
-        return consumerService.queryGroup(consumerGroup, address);
+    public Object groupQuery(@RequestParam String consumerGroup) {
+        return consumerService.queryGroup(consumerGroup);
     }
 
     @RequestMapping(value = "/resetOffset.do", method = {RequestMethod.POST})
@@ -99,14 +99,14 @@ public class ConsumerController {
 
     @RequestMapping(value = "/queryTopicByConsumer.query")
     @ResponseBody
-    public Object queryConsumerByTopic(@RequestParam String consumerGroup, String address) {
-        return consumerService.queryConsumeStatsListByGroupName(consumerGroup, address);
+    public Object queryConsumerByTopic(@RequestParam String consumerGroup) {
+        return consumerService.queryConsumeStatsListByGroupName(consumerGroup);
     }
 
     @RequestMapping(value = "/consumerConnection.query")
     @ResponseBody
-    public Object consumerConnection(@RequestParam(required = false) String consumerGroup, String address) {
-        ConsumerConnection consumerConnection = consumerService.getConsumerConnection(consumerGroup, address);
+    public Object consumerConnection(@RequestParam(required = false) String consumerGroup) {
+        ConsumerConnection consumerConnection = consumerService.getConsumerConnection(consumerGroup);
         consumerConnection.setConnectionSet(ConnectionInfo.buildConnectionInfoHashSet(consumerConnection.getConnectionSet()));
         return consumerConnection;
     }

src/main/java/org/apache/rocketmq/dashboard/controller/MessageController.java

@@ -18,7 +18,7 @@ package org.apache.rocketmq.dashboard.controller;
 
 import com.google.common.collect.Maps;
 import org.apache.rocketmq.common.Pair;
-import org.apache.rocketmq.remoting.protocol.body.ConsumeMessageDirectlyResult;
+import org.apache.rocketmq.common.protocol.body.ConsumeMessageDirectlyResult;
 import org.apache.rocketmq.dashboard.model.MessagePage;
 import org.apache.rocketmq.dashboard.model.MessageView;
 import org.apache.rocketmq.dashboard.model.request.MessageQuery;

src/main/java/org/apache/rocketmq/dashboard/controller/ProducerController.java

@@ -17,7 +17,7 @@
 package org.apache.rocketmq.dashboard.controller;
 
 import javax.annotation.Resource;
-import org.apache.rocketmq.remoting.protocol.body.ProducerConnection;
+import org.apache.rocketmq.common.protocol.body.ProducerConnection;
 import org.apache.rocketmq.dashboard.model.ConnectionInfo;
 import org.apache.rocketmq.dashboard.permisssion.Permission;
 import org.apache.rocketmq.dashboard.service.ProducerService;

src/main/java/org/apache/rocketmq/dashboard/controller/ProxyController.java

@@ -1,54 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.rocketmq.dashboard.controller;
-
-import org.apache.rocketmq.dashboard.permisssion.Permission;
-import org.apache.rocketmq.dashboard.service.ProxyService;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import javax.annotation.Resource;
-
-@Controller
-@RequestMapping("/proxy")
-@Permission
-public class ProxyController {
-    @Resource
-    private ProxyService proxyService;
-    @RequestMapping(value = "/homePage.query", method = RequestMethod.GET)
-    @ResponseBody
-    public Object homePage() {
-        return proxyService.getProxyHomePage();
-    }
-
-    @RequestMapping(value = "/addProxyAddr.do", method = RequestMethod.POST)
-    @ResponseBody
-    public Object addProxyAddr(@RequestParam String newProxyAddr) {
-        proxyService.addProxyAddrList(newProxyAddr);
-        return true;
-    }
-
-    @RequestMapping(value = "/updateProxyAddr.do", method = RequestMethod.POST)
-    @ResponseBody
-    public Object updateProxyAddr(@RequestParam String proxyAddr) {
-        proxyService.updateProxyAddrList(proxyAddr);
-        return true;
-    }
-}

src/main/java/org/apache/rocketmq/dashboard/controller/TopicController.java

@@ -56,12 +56,6 @@ public class TopicController {
         return topicService.fetchAllTopicList(skipSysProcess, skipRetryAndDlq);
     }
 
-    @RequestMapping(value = "/list.queryTopicType", method = RequestMethod.GET)
-    @ResponseBody
-    public Object listTopicType() {
-        return topicService.examineAllTopicType();
-    }
-
     @RequestMapping(value = "/stats.query", method = RequestMethod.GET)
     @ResponseBody
     public Object stats(@RequestParam String topic) {

src/main/java/org/apache/rocketmq/dashboard/model/ConnectionInfo.java

@@ -20,7 +20,7 @@ import com.google.common.collect.Sets;
 import java.util.Collection;
 import java.util.HashSet;
 import org.apache.rocketmq.common.MQVersion;
-import org.apache.rocketmq.remoting.protocol.body.Connection;
+import org.apache.rocketmq.common.protocol.body.Connection;
 
 public class ConnectionInfo extends Connection {
     private String versionDesc;

src/main/java/org/apache/rocketmq/dashboard/model/ConsumerGroupRollBackStat.java

@@ -16,7 +16,7 @@
  */
 package org.apache.rocketmq.dashboard.model;
 
-import org.apache.rocketmq.remoting.protocol.admin.RollbackStats;
+import org.apache.rocketmq.common.admin.RollbackStats;
 import com.google.common.collect.Lists;
 
 import java.util.List;

src/main/java/org/apache/rocketmq/dashboard/model/DlqMessageResendResult.java

@@ -17,8 +17,8 @@
 package org.apache.rocketmq.dashboard.model;
 
 import lombok.Data;
-import org.apache.rocketmq.remoting.protocol.body.CMResult;
-import org.apache.rocketmq.remoting.protocol.body.ConsumeMessageDirectlyResult;
+import org.apache.rocketmq.common.protocol.body.CMResult;
+import org.apache.rocketmq.common.protocol.body.ConsumeMessageDirectlyResult;
 
 @Data
 public class DlqMessageResendResult {

src/main/java/org/apache/rocketmq/dashboard/model/GroupConsumeInfo.java

@@ -16,10 +16,8 @@
  */
 package org.apache.rocketmq.dashboard.model;
 
-import org.apache.rocketmq.remoting.protocol.heartbeat.ConsumeType;
-import org.apache.rocketmq.remoting.protocol.heartbeat.MessageModel;
-
-import java.util.List;
+import org.apache.rocketmq.common.protocol.heartbeat.ConsumeType;
+import org.apache.rocketmq.common.protocol.heartbeat.MessageModel;
 
 public class GroupConsumeInfo implements Comparable<GroupConsumeInfo> {
     private String group;
@@ -27,11 +25,8 @@ public class GroupConsumeInfo implements Comparable<GroupConsumeInfo> {
     private int count;
     private ConsumeType consumeType;
     private MessageModel messageModel;
-    private List<String> address;
     private int consumeTps;
     private long diffTotal = -1;
-    private String subGroupType = "NORMAL";
-
 
     public String getGroup() {
         return group;
@@ -73,22 +68,6 @@ public class GroupConsumeInfo implements Comparable<GroupConsumeInfo> {
         this.diffTotal = diffTotal;
     }
 
-    public List<String> getAddress() {
-        return address;
-    }
-
-    public void setAddress(List<String> address) {
-        this.address = address;
-    }
-
-    public String getSubGroupType() {
-        return subGroupType;
-    }
-
-    public void setSubGroupType(String subGroupType) {
-        this.subGroupType = subGroupType;
-    }
-
     @Override
     public int compareTo(GroupConsumeInfo o) {
         if (this.count != o.count) {

src/main/java/org/apache/rocketmq/dashboard/model/QueueStatInfo.java

@@ -16,7 +16,7 @@
  */
 package org.apache.rocketmq.dashboard.model;
 
-import org.apache.rocketmq.remoting.protocol.admin.OffsetWrapper;
+import org.apache.rocketmq.common.admin.OffsetWrapper;
 import org.apache.rocketmq.common.message.MessageQueue;
 import org.springframework.beans.BeanUtils;
 

src/main/java/org/apache/rocketmq/dashboard/model/request/ConsumerConfigInfo.java

@@ -16,7 +16,7 @@
  */
 package org.apache.rocketmq.dashboard.model.request;
 
-import org.apache.rocketmq.remoting.protocol.subscription.SubscriptionGroupConfig;
+import org.apache.rocketmq.common.subscription.SubscriptionGroupConfig;
 
 import java.util.List;
 

src/main/java/org/apache/rocketmq/dashboard/model/request/TopicConfigInfo.java

@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 package org.apache.rocketmq.dashboard.model.request;
+
 import com.google.common.base.Objects;
 
 import java.util.List;
@@ -31,7 +32,6 @@ public class TopicConfigInfo {
     private int perm;
     private boolean order;
 
-    private String messageType;
     public List<String> getClusterNameList() {
         return clusterNameList;
     }
@@ -92,18 +92,6 @@ public class TopicConfigInfo {
         this.order = order;
     }
 
-
-    public String getMessageType() {
-        return messageType;
-    }
-
-    public void setMessageType(String messageType) {
-        this.messageType = messageType;
-    }
-
-
-
-
     @Override
     public boolean equals(Object o) {
         if (this == o)
@@ -115,13 +103,12 @@ public class TopicConfigInfo {
             readQueueNums == that.readQueueNums &&
             perm == that.perm &&
             order == that.order &&
-            Objects.equal(topicName, that.topicName) &&
-            Objects.equal(messageType, that.messageType);
+            Objects.equal(topicName, that.topicName);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hashCode(topicName, writeQueueNums, readQueueNums, perm, order,messageType);
+        return Objects.hashCode(topicName, writeQueueNums, readQueueNums, perm, order);
     }
 
 }

src/main/java/org/apache/rocketmq/dashboard/model/request/TopicTypeList.java

@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.rocketmq.dashboard.model.request;
-
-import java.util.List;
-
-public class TopicTypeList {
-    private List<String> topicNameList;
-    private List<String> messageTypeList;
-
-    public List<String> getTopicNameList() {
-        return topicNameList;
-    }
-
-    public void setTopicNameList(List<String> topicNameList) {
-        this.topicNameList = topicNameList;
-    }
-
-    public List<String> getMessageTypeList() {
-        return messageTypeList;
-    }
-
-    public void setMessageTypeList(List<String> messageTypeList) {
-        this.messageTypeList = messageTypeList;
-    }
-
-    public TopicTypeList(List<String> topicNameList, List<String> messageTypeList) {
-        this.topicNameList = topicNameList;
-        this.messageTypeList = messageTypeList;
-    }
-}

src/main/java/org/apache/rocketmq/dashboard/model/request/TopicTypeMeta.java

@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.rocketmq.dashboard.model.request;
-
-public class TopicTypeMeta {
-    private String topicName;
-    private String messageType;
-
-    public String getTopicName() {
-        return topicName;
-    }
-
-    public void setTopicName(String topicName) {
-        this.topicName = topicName;
-    }
-
-    public String getMessageType() {
-        return messageType;
-    }
-
-    public void setMessageType(String messageType) {
-        this.messageType = messageType;
-    }
-}

src/main/java/org/apache/rocketmq/dashboard/service/AbstractCommonService.java

@@ -19,8 +19,8 @@ package org.apache.rocketmq.dashboard.service;
 import org.apache.rocketmq.tools.admin.MQAdminExt;
 import com.google.common.base.Throwables;
 import com.google.common.collect.Sets;
+import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 import javax.annotation.Resource;
 import org.apache.commons.collections.CollectionUtils;
@@ -28,7 +28,7 @@ import org.apache.commons.collections.CollectionUtils;
 public abstract class AbstractCommonService {
     @Resource
     protected MQAdminExt mqAdminExt;
-    protected final Set<String> changeToBrokerNameSet(Map<String, Set<String>> clusterAddrTable,
+    protected final Set<String> changeToBrokerNameSet(HashMap<String, Set<String>> clusterAddrTable,
         List<String> clusterNameList, List<String> brokerNameList) {
         Set<String> finalBrokerNameList = Sets.newHashSet();
         if (CollectionUtils.isNotEmpty(clusterNameList)) {
@@ -38,8 +38,7 @@ public abstract class AbstractCommonService {
                 }
             }
             catch (Exception e) {
-                Throwables.throwIfUnchecked(e);
-                throw new RuntimeException(e);
+                throw Throwables.propagate(e);
             }
         }
         if (CollectionUtils.isNotEmpty(brokerNameList)) {

src/main/java/org/apache/rocketmq/dashboard/service/ConsumerService.java

@@ -17,8 +17,8 @@
 
 package org.apache.rocketmq.dashboard.service;
 
-import org.apache.rocketmq.remoting.protocol.body.ConsumerConnection;
-import org.apache.rocketmq.remoting.protocol.body.ConsumerRunningInfo;
+import org.apache.rocketmq.common.protocol.body.ConsumerConnection;
+import org.apache.rocketmq.common.protocol.body.ConsumerRunningInfo;
 import org.apache.rocketmq.dashboard.model.ConsumerGroupRollBackStat;
 import org.apache.rocketmq.dashboard.model.GroupConsumeInfo;
 import org.apache.rocketmq.dashboard.model.TopicConsumerInfo;
@@ -31,12 +31,12 @@ import java.util.Map;
 import java.util.Set;
 
 public interface ConsumerService {
-    List<GroupConsumeInfo> queryGroupList(boolean skipSysGroup,String address);
+    List<GroupConsumeInfo> queryGroupList(boolean skipSysGroup);
 
-    GroupConsumeInfo queryGroup(String consumerGroup, String address);
+    GroupConsumeInfo queryGroup(String consumerGroup);
 
 
-    List<TopicConsumerInfo> queryConsumeStatsListByGroupName(String groupName, String address);
+    List<TopicConsumerInfo> queryConsumeStatsListByGroupName(String groupName);
 
     List<TopicConsumerInfo> queryConsumeStatsList(String topic, String groupName);
 
@@ -52,7 +52,7 @@ public interface ConsumerService {
 
     Set<String> fetchBrokerNameSetBySubscriptionGroup(String group);
 
-    ConsumerConnection getConsumerConnection(String consumerGroup, String address);
+    ConsumerConnection getConsumerConnection(String consumerGroup);
 
     ConsumerRunningInfo getConsumerRunningInfo(String consumerGroup, String clientId, boolean jstack);
 }

src/main/java/org/apache/rocketmq/dashboard/service/MessageService.java

@@ -19,7 +19,7 @@ package org.apache.rocketmq.dashboard.service;
 
 import org.apache.rocketmq.common.Pair;
 import org.apache.rocketmq.common.message.MessageExt;
-import org.apache.rocketmq.remoting.protocol.body.ConsumeMessageDirectlyResult;
+import org.apache.rocketmq.common.protocol.body.ConsumeMessageDirectlyResult;
 import org.apache.rocketmq.dashboard.model.MessagePage;
 import org.apache.rocketmq.dashboard.model.request.MessageQuery;
 import org.apache.rocketmq.tools.admin.api.MessageTrack;

src/main/java/org/apache/rocketmq/dashboard/service/ProducerService.java

@@ -17,7 +17,7 @@
 
 package org.apache.rocketmq.dashboard.service;
 
-import org.apache.rocketmq.remoting.protocol.body.ProducerConnection;
+import org.apache.rocketmq.common.protocol.body.ProducerConnection;
 
 public interface ProducerService {
     ProducerConnection getProducerConnection(String producerGroup, String topic);

src/main/java/org/apache/rocketmq/dashboard/service/ProxyService.java

@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.rocketmq.dashboard.service;
-
-import java.util.Map;
-
-public interface ProxyService {
-
-    void addProxyAddrList(String proxyAddr);
-
-    void updateProxyAddrList(String proxyAddr);
-
-    Map<String, Object>  getProxyHomePage();
-}

src/main/java/org/apache/rocketmq/dashboard/service/TopicService.java

@@ -19,11 +19,10 @@ package org.apache.rocketmq.dashboard.service;
 
 import org.apache.rocketmq.client.producer.SendResult;
 import org.apache.rocketmq.common.TopicConfig;
-import org.apache.rocketmq.dashboard.model.request.TopicTypeList;
-import org.apache.rocketmq.remoting.protocol.admin.TopicStatsTable;
-import org.apache.rocketmq.remoting.protocol.body.GroupList;
-import org.apache.rocketmq.remoting.protocol.body.TopicList;
-import org.apache.rocketmq.remoting.protocol.route.TopicRouteData;
+import org.apache.rocketmq.common.admin.TopicStatsTable;
+import org.apache.rocketmq.common.protocol.body.GroupList;
+import org.apache.rocketmq.common.protocol.body.TopicList;
+import org.apache.rocketmq.common.protocol.route.TopicRouteData;
 import org.apache.rocketmq.dashboard.model.request.SendTopicMessageRequest;
 import org.apache.rocketmq.dashboard.model.request.TopicConfigInfo;
 
@@ -32,8 +31,6 @@ import java.util.List;
 public interface TopicService {
     TopicList fetchAllTopicList(boolean skipSysProcess, boolean skipRetryAndDlq);
 
-    TopicTypeList examineAllTopicType();
-
     TopicStatsTable stats(String topic);
 
     TopicRouteData route(String topic);

src/main/java/org/apache/rocketmq/dashboard/service/client/MQAdminExtImpl.java

@@ -17,16 +17,43 @@
 package org.apache.rocketmq.dashboard.service.client;
 
 import com.google.common.base.Throwables;
+import java.io.UnsupportedEncodingException;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
 import org.apache.rocketmq.client.QueryResult;
 import org.apache.rocketmq.client.exception.MQBrokerException;
 import org.apache.rocketmq.client.exception.MQClientException;
+import org.apache.rocketmq.client.impl.MQAdminImpl;
 import org.apache.rocketmq.common.AclConfig;
 import org.apache.rocketmq.common.PlainAccessConfig;
 import org.apache.rocketmq.common.TopicConfig;
+import org.apache.rocketmq.common.admin.ConsumeStats;
+import org.apache.rocketmq.common.admin.RollbackStats;
+import org.apache.rocketmq.common.admin.TopicStatsTable;
 import org.apache.rocketmq.common.message.MessageClientIDSetter;
 import org.apache.rocketmq.common.message.MessageExt;
 import org.apache.rocketmq.common.message.MessageQueue;
-import org.apache.rocketmq.common.message.MessageRequestMode;
+import org.apache.rocketmq.common.protocol.RequestCode;
+import org.apache.rocketmq.common.protocol.ResponseCode;
+import org.apache.rocketmq.common.protocol.body.BrokerStatsData;
+import org.apache.rocketmq.common.protocol.body.ClusterAclVersionInfo;
+import org.apache.rocketmq.common.protocol.body.ClusterInfo;
+import org.apache.rocketmq.common.protocol.body.ConsumeMessageDirectlyResult;
+import org.apache.rocketmq.common.protocol.body.ConsumeStatsList;
+import org.apache.rocketmq.common.protocol.body.ConsumerConnection;
+import org.apache.rocketmq.common.protocol.body.ConsumerRunningInfo;
+import org.apache.rocketmq.common.protocol.body.GroupList;
+import org.apache.rocketmq.common.protocol.body.KVTable;
+import org.apache.rocketmq.common.protocol.body.ProducerConnection;
+import org.apache.rocketmq.common.protocol.body.QueryConsumeQueueResponseBody;
+import org.apache.rocketmq.common.protocol.body.QueueTimeSpan;
+import org.apache.rocketmq.common.protocol.body.SubscriptionGroupWrapper;
+import org.apache.rocketmq.common.protocol.body.TopicConfigSerializeWrapper;
+import org.apache.rocketmq.common.protocol.body.TopicList;
+import org.apache.rocketmq.common.protocol.route.TopicRouteData;
+import org.apache.rocketmq.common.subscription.SubscriptionGroupConfig;
 import org.apache.rocketmq.dashboard.util.JsonUtil;
 import org.apache.rocketmq.remoting.RemotingClient;
 import org.apache.rocketmq.remoting.exception.RemotingCommandException;
@@ -35,51 +62,13 @@ import org.apache.rocketmq.remoting.exception.RemotingException;
 import org.apache.rocketmq.remoting.exception.RemotingSendRequestException;
 import org.apache.rocketmq.remoting.exception.RemotingTimeoutException;
 import org.apache.rocketmq.remoting.protocol.RemotingCommand;
-import org.apache.rocketmq.remoting.protocol.RequestCode;
-import org.apache.rocketmq.remoting.protocol.ResponseCode;
-import org.apache.rocketmq.remoting.protocol.admin.ConsumeStats;
-import org.apache.rocketmq.remoting.protocol.admin.RollbackStats;
-import org.apache.rocketmq.remoting.protocol.admin.TopicStatsTable;
-import org.apache.rocketmq.remoting.protocol.body.BrokerReplicasInfo;
-import org.apache.rocketmq.remoting.protocol.body.BrokerStatsData;
-import org.apache.rocketmq.remoting.protocol.body.ClusterAclVersionInfo;
-import org.apache.rocketmq.remoting.protocol.body.ClusterInfo;
-import org.apache.rocketmq.remoting.protocol.body.ConsumeMessageDirectlyResult;
-import org.apache.rocketmq.remoting.protocol.body.ConsumeStatsList;
-import org.apache.rocketmq.remoting.protocol.body.ConsumerConnection;
-import org.apache.rocketmq.remoting.protocol.body.ConsumerRunningInfo;
-import org.apache.rocketmq.remoting.protocol.body.EpochEntryCache;
-import org.apache.rocketmq.remoting.protocol.body.GroupList;
-import org.apache.rocketmq.remoting.protocol.body.HARuntimeInfo;
-import org.apache.rocketmq.remoting.protocol.body.KVTable;
-import org.apache.rocketmq.remoting.protocol.body.ProducerConnection;
-import org.apache.rocketmq.remoting.protocol.body.ProducerTableInfo;
-import org.apache.rocketmq.remoting.protocol.body.QueryConsumeQueueResponseBody;
-import org.apache.rocketmq.remoting.protocol.body.QueueTimeSpan;
-import org.apache.rocketmq.remoting.protocol.body.SubscriptionGroupWrapper;
-import org.apache.rocketmq.remoting.protocol.body.TopicConfigSerializeWrapper;
-import org.apache.rocketmq.remoting.protocol.body.TopicList;
-import org.apache.rocketmq.remoting.protocol.header.controller.ElectMasterResponseHeader;
-import org.apache.rocketmq.remoting.protocol.header.controller.GetMetaDataResponseHeader;
-import org.apache.rocketmq.remoting.protocol.heartbeat.SubscriptionData;
-import org.apache.rocketmq.remoting.protocol.route.TopicRouteData;
-import org.apache.rocketmq.remoting.protocol.statictopic.TopicQueueMappingDetail;
-import org.apache.rocketmq.remoting.protocol.subscription.GroupForbidden;
-import org.apache.rocketmq.remoting.protocol.subscription.SubscriptionGroupConfig;
 import org.apache.rocketmq.tools.admin.MQAdminExt;
-import org.apache.rocketmq.tools.admin.api.BrokerOperatorResult;
 import org.apache.rocketmq.tools.admin.api.MessageTrack;
-import org.apache.rocketmq.tools.admin.common.AdminToolResult;
+import org.joor.Reflect;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
-import java.io.UnsupportedEncodingException;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-
 import static org.apache.rocketmq.remoting.protocol.RemotingSerializable.decode;
 
 @Service
@@ -92,7 +81,7 @@ public class MQAdminExtImpl implements MQAdminExt {
     @Override
     public void updateBrokerConfig(String brokerAddr, Properties properties)
         throws RemotingConnectException, RemotingSendRequestException, RemotingTimeoutException,
-        UnsupportedEncodingException, InterruptedException, MQBrokerException, MQClientException {
+        UnsupportedEncodingException, InterruptedException, MQBrokerException {
         MQAdminInstance.threadLocalMQAdminExt().updateBrokerConfig(brokerAddr, properties);
     }
 
@@ -139,7 +128,7 @@ public class MQAdminExtImpl implements MQAdminExt {
     }
 
     @Override
-    public SubscriptionGroupConfig examineSubscriptionGroupConfig(String addr, String group) throws MQBrokerException {
+    public SubscriptionGroupConfig examineSubscriptionGroupConfig(String addr, String group) {
         RemotingClient remotingClient = MQAdminInstance.threadLocalRemotingClient();
         RemotingCommand request = RemotingCommand.createRequestCommand(RequestCode.GET_ALL_SUBSCRIPTIONGROUP_CONFIG, null);
         RemotingCommand response = null;
@@ -147,8 +136,7 @@ public class MQAdminExtImpl implements MQAdminExt {
             response = remotingClient.invokeSync(addr, request, 3000);
         }
         catch (Exception err) {
-            Throwables.throwIfUnchecked(err);
-            throw new RuntimeException(err);
+            throw Throwables.propagate(err);
         }
         assert response != null;
         switch (response.getCode()) {
@@ -157,12 +145,12 @@ public class MQAdminExtImpl implements MQAdminExt {
                 return subscriptionGroupWrapper.getSubscriptionGroupTable().get(group);
             }
             default:
-                throw new MQBrokerException(response.getCode(), response.getRemark());
+                throw Throwables.propagate(new MQBrokerException(response.getCode(), response.getRemark()));
         }
     }
 
     @Override
-    public TopicConfig examineTopicConfig(String addr, String topic) throws MQBrokerException {
+    public TopicConfig examineTopicConfig(String addr, String topic) {
         RemotingClient remotingClient = MQAdminInstance.threadLocalRemotingClient();
         RemotingCommand request = RemotingCommand.createRequestCommand(RequestCode.GET_ALL_TOPIC_CONFIG, null);
         RemotingCommand response = null;
@@ -170,8 +158,7 @@ public class MQAdminExtImpl implements MQAdminExt {
             response = remotingClient.invokeSync(addr, request, 3000);
         }
         catch (Exception err) {
-            Throwables.throwIfUnchecked(err);
-            throw new RuntimeException(err);
+            throw Throwables.propagate(err);
         }
         switch (response.getCode()) {
             case ResponseCode.SUCCESS: {
@@ -179,7 +166,7 @@ public class MQAdminExtImpl implements MQAdminExt {
                 return topicConfigSerializeWrapper.getTopicConfigTable().get(topic);
             }
             default:
-                throw new MQBrokerException(response.getCode(), response.getRemark());
+                throw Throwables.propagate(new MQBrokerException(response.getCode(), response.getRemark()));
         }
     }
 
@@ -389,14 +376,14 @@ public class MQAdminExtImpl implements MQAdminExt {
     }
 
     @Override
-    public void createTopic(String key, String newTopic, int queueNum, Map<String, String> attributes) throws MQClientException {
-        MQAdminInstance.threadLocalMQAdminExt().createTopic(key, newTopic, queueNum, attributes);
+    public void createTopic(String key, String newTopic, int queueNum) throws MQClientException {
+        MQAdminInstance.threadLocalMQAdminExt().createTopic(key, newTopic, queueNum);
     }
 
     @Override
-    public void createTopic(String key, String newTopic, int queueNum, int topicSysFlag, Map<String, String> attributes)
+    public void createTopic(String key, String newTopic, int queueNum, int topicSysFlag)
         throws MQClientException {
-        MQAdminInstance.threadLocalMQAdminExt().createTopic(key, newTopic, queueNum, topicSysFlag, attributes);
+        MQAdminInstance.threadLocalMQAdminExt().createTopic(key, newTopic, queueNum, topicSysFlag);
     }
 
     @Override
@@ -464,18 +451,15 @@ public class MQAdminExtImpl implements MQAdminExt {
         }
         catch (Exception e) {
         }
-
-        Set<String> clusterList = MQAdminInstance.threadLocalMQAdminExt().getTopicClusterList(topic);
-        if (clusterList == null || clusterList.isEmpty()) {
-            return MQAdminInstance.threadLocalMQAdminExt().queryMessage("", topic, msgId);
+        MQAdminImpl mqAdminImpl = MQAdminInstance.threadLocalMqClientInstance().getMQAdminImpl();
+        QueryResult qr = Reflect.on(mqAdminImpl).call("queryMessage", topic, msgId, 32,
+            MessageClientIDSetter.getNearlyTimeFromID(msgId).getTime() - 1000 * 60 * 60 * 13L, Long.MAX_VALUE, true).get();
+        if (qr != null && qr.getMessageList() != null && qr.getMessageList().size() > 0) {
+            return qr.getMessageList().get(0);
         }
-        for (String name : clusterList) {
-            MessageExt messageExt = MQAdminInstance.threadLocalMQAdminExt().queryMessage(name, topic, msgId);
-            if (messageExt != null) {
-                return messageExt;
-            }
+        else {
+            return null;
         }
-        return null;
     }
 
     @Override
@@ -588,256 +572,4 @@ public class MQAdminExtImpl implements MQAdminExt {
         String msgId) throws RemotingException, MQClientException, InterruptedException, MQBrokerException {
         return false;
     }
-
-    @Override
-    public void addBrokerToContainer(String brokerContainerAddr, String brokerConfig) throws InterruptedException,
-            MQBrokerException, RemotingTimeoutException, RemotingSendRequestException, RemotingConnectException {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException("Unimplemented method 'addBrokerToContainer'");
-    }
-
-    @Override
-    public void removeBrokerFromContainer(String brokerContainerAddr, String clusterName, String brokerName,
-            long brokerId) throws InterruptedException, MQBrokerException, RemotingTimeoutException,
-            RemotingSendRequestException, RemotingConnectException {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException("Unimplemented method 'removeBrokerFromContainer'");
-    }
-
-    @Override
-    public void updateGlobalWhiteAddrConfig(String addr, String globalWhiteAddrs, String aclFileFullPath)
-            throws RemotingException, MQBrokerException, InterruptedException, MQClientException {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException("Unimplemented method 'updateGlobalWhiteAddrConfig'");
-    }
-
-    @Override
-    public TopicStatsTable examineTopicStats(String brokerAddr, String topic)
-            throws RemotingException, MQClientException, InterruptedException, MQBrokerException {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException("Unimplemented method 'examineTopicStats'");
-    }
-
-    @Override
-    public AdminToolResult<TopicStatsTable> examineTopicStatsConcurrent(String topic) {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException("Unimplemented method 'examineTopicStatsConcurrent'");
-    }
-
-    @Override
-    public ConsumeStats examineConsumeStats(String brokerAddr, String consumerGroup, String topicName,
-            long timeoutMillis) throws InterruptedException, RemotingTimeoutException, RemotingSendRequestException,
-            RemotingConnectException, MQBrokerException {
-        // TODO Auto-generated method stub
-        return MQAdminInstance.threadLocalMQAdminExt().examineConsumeStats(brokerAddr, consumerGroup, topicName, timeoutMillis);
-    }
-
-    @Override
-    public AdminToolResult<ConsumeStats> examineConsumeStatsConcurrent(String consumerGroup, String topic) {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException("Unimplemented method 'examineConsumeStatsConcurrent'");
-    }
-
-    @Override
-    public ConsumerConnection examineConsumerConnectionInfo(String consumerGroup, String brokerAddr)
-            throws InterruptedException, MQBrokerException, RemotingException, MQClientException {
-        return MQAdminInstance.threadLocalMQAdminExt().examineConsumerConnectionInfo(consumerGroup, brokerAddr);
-    }
-
-    @Override
-    public ProducerTableInfo getAllProducerInfo(String brokerAddr)
-            throws RemotingException, MQClientException, InterruptedException, MQBrokerException {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException("Unimplemented method 'getAllProducerInfo'");
-    }
-
-    @Override
-    public void deleteTopic(String topicName, String clusterName)
-            throws RemotingException, MQBrokerException, InterruptedException, MQClientException {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException("Unimplemented method 'deleteTopic'");
-    }
-
-    @Override
-    public AdminToolResult<BrokerOperatorResult> deleteTopicInBrokerConcurrent(Set<String> addrs, String topic) {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException("Unimplemented method 'deleteTopicInBrokerConcurrent'");
-    }
-
-    @Override
-    public void deleteTopicInNameServer(Set<String> addrs, String clusterName, String topic)
-            throws RemotingException, MQBrokerException, InterruptedException, MQClientException {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException("Unimplemented method 'deleteTopicInNameServer'");
-    }
-
-    @Override
-    public AdminToolResult<BrokerOperatorResult> resetOffsetNewConcurrent(String group, String topic, long timestamp) {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException("Unimplemented method 'resetOffsetNewConcurrent'");
-    }
-
-    @Override
-    public TopicList queryTopicsByConsumer(String group)
-            throws InterruptedException, MQBrokerException, RemotingException, MQClientException {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException("Unimplemented method 'queryTopicsByConsumer'");
-    }
-
-    @Override
-    public AdminToolResult<TopicList> queryTopicsByConsumerConcurrent(String group) {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException("Unimplemented method 'queryTopicsByConsumerConcurrent'");
-    }
-
-    @Override
-    public SubscriptionData querySubscription(String group, String topic)
-            throws InterruptedException, MQBrokerException, RemotingException, MQClientException {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException("Unimplemented method 'querySubscription'");
-    }
-
-    @Override
-    public AdminToolResult<List<QueueTimeSpan>> queryConsumeTimeSpanConcurrent(String topic, String group) {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException("Unimplemented method 'queryConsumeTimeSpanConcurrent'");
-    }
-
-    @Override
-    public boolean deleteExpiredCommitLog(String cluster) throws RemotingConnectException, RemotingSendRequestException,
-            RemotingTimeoutException, MQClientException, InterruptedException {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException("Unimplemented method 'deleteExpiredCommitLog'");
-    }
-
-    @Override
-    public boolean deleteExpiredCommitLogByAddr(String addr) throws RemotingConnectException,
-            RemotingSendRequestException, RemotingTimeoutException, MQClientException, InterruptedException {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException("Unimplemented method 'deleteExpiredCommitLogByAddr'");
-    }
-
-    @Override
-    public ConsumerRunningInfo getConsumerRunningInfo(String consumerGroup, String clientId, boolean jstack,
-            boolean metrics) throws RemotingException, MQClientException, InterruptedException {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException("Unimplemented method 'getConsumerRunningInfo'");
-    }
-
-    @Override
-    public List<MessageTrack> messageTrackDetailConcurrent(MessageExt msg)
-            throws RemotingException, MQClientException, InterruptedException, MQBrokerException {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException("Unimplemented method 'messageTrackDetailConcurrent'");
-    }
-
-    @Override
-    public void setMessageRequestMode(String brokerAddr, String topic, String consumerGroup, MessageRequestMode mode,
-            int popWorkGroupSize, long timeoutMillis) throws InterruptedException, RemotingTimeoutException,
-            RemotingSendRequestException, RemotingConnectException, MQClientException {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException("Unimplemented method 'setMessageRequestMode'");
-    }
-
-    @Override
-    public long searchOffset(String brokerAddr, String topicName, int queueId, long timestamp, long timeoutMillis)
-            throws RemotingException, MQBrokerException, InterruptedException {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException("Unimplemented method 'searchOffset'");
-    }
-
-    @Override
-    public void resetOffsetByQueueId(String brokerAddr, String consumerGroup, String topicName, int queueId,
-            long resetOffset) throws RemotingException, InterruptedException, MQBrokerException {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException("Unimplemented method 'resetOffsetByQueueId'");
-    }
-
-    @Override
-    public void createStaticTopic(String addr, String defaultTopic, TopicConfig topicConfig,
-            TopicQueueMappingDetail mappingDetail, boolean force)
-            throws RemotingException, InterruptedException, MQBrokerException {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException("Unimplemented method 'createStaticTopic'");
-    }
-
-    @Override
-    public GroupForbidden updateAndGetGroupReadForbidden(String brokerAddr, String groupName, String topicName,
-            Boolean readable) throws RemotingException, InterruptedException, MQBrokerException {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException("Unimplemented method 'updateAndGetGroupReadForbidden'");
-    }
-
-    @Override
-    public MessageExt queryMessage(String clusterName, String topic, String msgId)
-            throws RemotingException, MQBrokerException, InterruptedException, MQClientException {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException("Unimplemented method 'queryMessage'");
-    }
-
-    @Override
-    public HARuntimeInfo getBrokerHAStatus(String brokerAddr) throws RemotingConnectException,
-            RemotingSendRequestException, RemotingTimeoutException, InterruptedException, MQBrokerException {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException("Unimplemented method 'getBrokerHAStatus'");
-    }
-
-    @Override
-    public BrokerReplicasInfo getInSyncStateData(String controllerAddress, List<String> brokers)
-            throws RemotingException, InterruptedException, MQBrokerException {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException("Unimplemented method 'getInSyncStateData'");
-    }
-
-    @Override
-    public EpochEntryCache getBrokerEpochCache(String brokerAddr)
-            throws RemotingException, InterruptedException, MQBrokerException {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException("Unimplemented method 'getBrokerEpochCache'");
-    }
-
-    @Override
-    public GetMetaDataResponseHeader getControllerMetaData(String controllerAddr)
-            throws RemotingException, InterruptedException, MQBrokerException {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException("Unimplemented method 'getControllerMetaData'");
-    }
-
-    @Override
-    public void resetMasterFlushOffset(String brokerAddr, long masterFlushOffset) throws InterruptedException,
-            MQBrokerException, RemotingTimeoutException, RemotingSendRequestException, RemotingConnectException {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException("Unimplemented method 'resetMasterFlushOffset'");
-    }
-
-    @Override
-    public Map<String, Properties> getControllerConfig(List<String> controllerServers)
-            throws InterruptedException, RemotingTimeoutException, RemotingSendRequestException,
-            RemotingConnectException, MQClientException, UnsupportedEncodingException {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException("Unimplemented method 'getControllerConfig'");
-    }
-
-    @Override
-    public void updateControllerConfig(Properties properties, List<String> controllers)
-            throws InterruptedException, RemotingConnectException, UnsupportedEncodingException,
-            RemotingSendRequestException, RemotingTimeoutException, MQClientException, MQBrokerException {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException("Unimplemented method 'updateControllerConfig'");
-    }
-
-    @Override
-    public ElectMasterResponseHeader electMaster(String controllerAddr, String clusterName, String brokerName,
-            String brokerAddr) throws RemotingException, InterruptedException, MQBrokerException {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException("Unimplemented method 'electMaster'");
-    }
-
-    @Override
-    public void cleanControllerBrokerData(String controllerAddr, String clusterName, String brokerName,
-            String brokerAddr, boolean isCleanLivingBroker)
-            throws RemotingException, InterruptedException, MQBrokerException {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException("Unimplemented method 'cleanControllerBrokerData'");
-    }
 }

src/main/java/org/apache/rocketmq/dashboard/service/client/ProxyAdmin.java

@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.rocketmq.dashboard.service.client;
-
-import org.apache.rocketmq.client.exception.MQBrokerException;
-import org.apache.rocketmq.remoting.exception.RemotingConnectException;
-import org.apache.rocketmq.remoting.exception.RemotingSendRequestException;
-import org.apache.rocketmq.remoting.exception.RemotingTimeoutException;
-import org.apache.rocketmq.remoting.protocol.body.ConsumerConnection;
-
-public interface ProxyAdmin {
-
-    ConsumerConnection examineConsumerConnectionInfo(String addr, String consumerGroup) throws RemotingConnectException, RemotingSendRequestException, RemotingTimeoutException, InterruptedException, MQBrokerException;
-}

src/main/java/org/apache/rocketmq/dashboard/service/client/ProxyAdminImpl.java

@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.rocketmq.dashboard.service.client;
-
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.pool2.impl.GenericObjectPool;
-import org.apache.rocketmq.client.exception.MQBrokerException;
-import org.apache.rocketmq.remoting.RemotingClient;
-import org.apache.rocketmq.remoting.exception.RemotingConnectException;
-import org.apache.rocketmq.remoting.exception.RemotingSendRequestException;
-import org.apache.rocketmq.remoting.exception.RemotingTimeoutException;
-import org.apache.rocketmq.remoting.protocol.RemotingCommand;
-import org.apache.rocketmq.remoting.protocol.body.ConsumerConnection;
-import org.apache.rocketmq.remoting.protocol.header.GetConsumerConnectionListRequestHeader;
-import org.apache.rocketmq.tools.admin.MQAdminExt;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import static org.apache.rocketmq.remoting.protocol.RequestCode.GET_CONSUMER_CONNECTION_LIST;
-
-@Slf4j
-@Service
-public class ProxyAdminImpl implements ProxyAdmin {
-    @Autowired
-    private GenericObjectPool<MQAdminExt> mqAdminExtPool;
-
-    @Override
-    public ConsumerConnection examineConsumerConnectionInfo(String addr, String consumerGroup) throws RemotingConnectException, RemotingSendRequestException, RemotingTimeoutException, InterruptedException, MQBrokerException {
-        try {
-            MQAdminInstance.createMQAdmin(mqAdminExtPool);
-            RemotingClient remotingClient = MQAdminInstance.threadLocalRemotingClient();
-            GetConsumerConnectionListRequestHeader requestHeader = new GetConsumerConnectionListRequestHeader();
-            requestHeader.setConsumerGroup(consumerGroup);
-            RemotingCommand request = RemotingCommand.createRequestCommand(GET_CONSUMER_CONNECTION_LIST, requestHeader);
-            RemotingCommand response = remotingClient.invokeSync(addr, request, 3000);
-            switch (response.getCode()) {
-                case 0:
-                    return ConsumerConnection.decode(response.getBody(), ConsumerConnection.class);
-                default:
-                    throw new MQBrokerException(response.getCode(), response.getRemark(), addr);
-            }
-        } finally {
-            MQAdminInstance.returnMQAdmin(mqAdminExtPool);
-        }
-    }
-}

src/main/java/org/apache/rocketmq/dashboard/service/impl/AclServiceImpl.java

@@ -36,8 +36,8 @@ import org.apache.rocketmq.client.exception.MQClientException;
 import org.apache.rocketmq.common.AclConfig;
 import org.apache.rocketmq.common.MixAll;
 import org.apache.rocketmq.common.PlainAccessConfig;
-import org.apache.rocketmq.remoting.protocol.body.ClusterInfo;
-import org.apache.rocketmq.remoting.protocol.route.BrokerData;
+import org.apache.rocketmq.common.protocol.body.ClusterInfo;
+import org.apache.rocketmq.common.protocol.route.BrokerData;
 import org.apache.rocketmq.dashboard.model.request.AclRequest;
 import org.apache.rocketmq.dashboard.service.AbstractCommonService;
 import org.apache.rocketmq.dashboard.service.AclService;
@@ -68,8 +68,7 @@ public class AclServiceImpl extends AbstractCommonService implements AclService
             }
         } catch (Exception e) {
             log.error("getAclConfig error.", e);
-            Throwables.throwIfUnchecked(e);
-            throw new RuntimeException(e);
+            throw Throwables.propagate(e);
         }
         AclConfig aclConfig = new AclConfig();
         aclConfig.setGlobalWhiteAddrs(Collections.emptyList());
@@ -101,8 +100,7 @@ public class AclServiceImpl extends AbstractCommonService implements AclService
                 mqAdminExt.createAndUpdatePlainAccessConfig(addr, config);
             }
         } catch (Exception e) {
-            Throwables.throwIfUnchecked(e);
-            throw new RuntimeException(e);
+            throw Throwables.propagate(e);
         }
 
     }
@@ -118,8 +116,7 @@ public class AclServiceImpl extends AbstractCommonService implements AclService
                 log.info("Delete acl [{}] from broker [{}] complete", config.getAccessKey(), addr);
             }
         } catch (Exception e) {
-            Throwables.throwIfUnchecked(e);
-            throw new RuntimeException(e);
+            throw Throwables.propagate(e);
         }
     }
 
@@ -145,8 +142,7 @@ public class AclServiceImpl extends AbstractCommonService implements AclService
                 mqAdminExt.createAndUpdatePlainAccessConfig(addr, config);
             }
         } catch (Exception e) {
-            Throwables.throwIfUnchecked(e);
-            throw new RuntimeException(e);
+            throw Throwables.propagate(e);
         }
     }
 
@@ -178,8 +174,7 @@ public class AclServiceImpl extends AbstractCommonService implements AclService
                 }
             }
         } catch (Exception e) {
-            Throwables.throwIfUnchecked(e);
-            throw new RuntimeException(e);
+            throw Throwables.propagate(e);
         }
     }
 
@@ -211,8 +206,7 @@ public class AclServiceImpl extends AbstractCommonService implements AclService
                 }
             }
         } catch (Exception e) {
-            Throwables.throwIfUnchecked(e);
-            throw new RuntimeException(e);
+            throw Throwables.propagate(e);
         }
     }
 
@@ -255,8 +249,7 @@ public class AclServiceImpl extends AbstractCommonService implements AclService
                 }
             }
         } catch (Exception e) {
-            Throwables.throwIfUnchecked(e);
-            throw new RuntimeException(e);
+            throw Throwables.propagate(e);
         }
 
     }
@@ -268,8 +261,7 @@ public class AclServiceImpl extends AbstractCommonService implements AclService
                 mqAdminExt.createAndUpdatePlainAccessConfig(addr, config);
             }
         } catch (Exception e) {
-            Throwables.throwIfUnchecked(e);
-            throw new RuntimeException(e);
+            throw Throwables.propagate(e);
         }
     }
 
@@ -289,8 +281,7 @@ public class AclServiceImpl extends AbstractCommonService implements AclService
                 mqAdminExt.updateGlobalWhiteAddrConfig(addr, StringUtils.join(aclConfig.getGlobalWhiteAddrs(), ","));
             }
         } catch (Exception e) {
-            Throwables.throwIfUnchecked(e);
-            throw new RuntimeException(e);
+            throw Throwables.propagate(e);
         }
     }
 
@@ -306,8 +297,7 @@ public class AclServiceImpl extends AbstractCommonService implements AclService
                 mqAdminExt.updateGlobalWhiteAddrConfig(addr, StringUtils.join(aclConfig.getGlobalWhiteAddrs(), ","));
             }
         } catch (Exception e) {
-            Throwables.throwIfUnchecked(e);
-            throw new RuntimeException(e);
+            throw Throwables.propagate(e);
         }
     }
 
@@ -321,8 +311,7 @@ public class AclServiceImpl extends AbstractCommonService implements AclService
                 mqAdminExt.updateGlobalWhiteAddrConfig(addr, StringUtils.join(whiteList, ","));
             }
         } catch (Exception e) {
-            Throwables.throwIfUnchecked(e);
-            throw new RuntimeException(e);
+            throw Throwables.propagate(e);
         }
     }
 

src/main/java/org/apache/rocketmq/dashboard/service/impl/ClusterServiceImpl.java

@@ -17,10 +17,9 @@
 
 package org.apache.rocketmq.dashboard.service.impl;
 
-import org.apache.rocketmq.common.attribute.TopicMessageType;
-import org.apache.rocketmq.remoting.protocol.body.ClusterInfo;
-import org.apache.rocketmq.remoting.protocol.body.KVTable;
-import org.apache.rocketmq.remoting.protocol.route.BrokerData;
+import org.apache.rocketmq.common.protocol.body.ClusterInfo;
+import org.apache.rocketmq.common.protocol.body.KVTable;
+import org.apache.rocketmq.common.protocol.route.BrokerData;
 import org.apache.rocketmq.tools.admin.MQAdminExt;
 import org.apache.rocketmq.dashboard.service.ClusterService;
 import org.apache.rocketmq.dashboard.util.JsonUtil;
@@ -31,10 +30,8 @@ import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.Arrays;
 import java.util.Map;
 import java.util.Properties;
-import java.util.stream.Collectors;
 
 @Service
 public class ClusterServiceImpl implements ClusterService {
@@ -59,14 +56,10 @@ public class ClusterServiceImpl implements ClusterService {
             }
             resultMap.put("clusterInfo", clusterInfo);
             resultMap.put("brokerServer", brokerServer);
-            // add messageType
-            resultMap.put("messageTypes", Arrays.stream(TopicMessageType.values()).sorted()
-                    .collect(Collectors.toMap(TopicMessageType::getValue, messageType ->String.format("MESSAGE_TYPE_%s",messageType.getValue()))));
             return resultMap;
         }
         catch (Exception err) {
-            Throwables.throwIfUnchecked(err);
-            throw new RuntimeException(err);
+            throw Throwables.propagate(err);
         }
     }
 
@@ -77,8 +70,7 @@ public class ClusterServiceImpl implements ClusterService {
             return mqAdminExt.getBrokerConfig(brokerAddr);
         }
         catch (Exception e) {
-            Throwables.throwIfUnchecked(e);
-            throw new RuntimeException(e);
+            throw Throwables.propagate(e);
         }
     }
 }

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

@@ -23,10 +23,8 @@ import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -46,19 +44,18 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.rocketmq.client.exception.MQClientException;
 import org.apache.rocketmq.common.MQVersion;
 import org.apache.rocketmq.common.MixAll;
-import org.apache.rocketmq.dashboard.service.client.ProxyAdmin;
-import org.apache.rocketmq.remoting.protocol.admin.ConsumeStats;
-import org.apache.rocketmq.remoting.protocol.admin.RollbackStats;
+import org.apache.rocketmq.common.admin.ConsumeStats;
+import org.apache.rocketmq.common.admin.RollbackStats;
 import org.apache.rocketmq.common.message.MessageQueue;
-import org.apache.rocketmq.remoting.protocol.ResponseCode;
-import org.apache.rocketmq.remoting.protocol.body.ClusterInfo;
-import org.apache.rocketmq.remoting.protocol.body.Connection;
-import org.apache.rocketmq.remoting.protocol.body.ConsumerConnection;
-import org.apache.rocketmq.remoting.protocol.body.ConsumerRunningInfo;
-import org.apache.rocketmq.remoting.protocol.body.GroupList;
-import org.apache.rocketmq.remoting.protocol.body.SubscriptionGroupWrapper;
-import org.apache.rocketmq.remoting.protocol.route.BrokerData;
-import org.apache.rocketmq.remoting.protocol.subscription.SubscriptionGroupConfig;
+import org.apache.rocketmq.common.protocol.ResponseCode;
+import org.apache.rocketmq.common.protocol.body.ClusterInfo;
+import org.apache.rocketmq.common.protocol.body.Connection;
+import org.apache.rocketmq.common.protocol.body.ConsumerConnection;
+import org.apache.rocketmq.common.protocol.body.ConsumerRunningInfo;
+import org.apache.rocketmq.common.protocol.body.GroupList;
+import org.apache.rocketmq.common.protocol.body.SubscriptionGroupWrapper;
+import org.apache.rocketmq.common.protocol.route.BrokerData;
+import org.apache.rocketmq.common.subscription.SubscriptionGroupConfig;
 import org.apache.rocketmq.common.utils.ThreadUtils;
 import org.apache.rocketmq.dashboard.config.RMQConfigure;
 import org.apache.rocketmq.dashboard.model.ConsumerGroupRollBackStat;
@@ -76,12 +73,12 @@ import org.springframework.beans.factory.DisposableBean;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.stereotype.Service;
 
+import static com.google.common.base.Throwables.propagate;
+
 @Service
 public class ConsumerServiceImpl extends AbstractCommonService implements ConsumerService, InitializingBean, DisposableBean {
     private Logger logger = LoggerFactory.getLogger(ConsumerServiceImpl.class);
 
-    @Resource
-    protected ProxyAdmin proxyAdmin;
     @Resource
     private RMQConfigure configure;
 
@@ -124,33 +121,24 @@ public class ConsumerServiceImpl extends AbstractCommonService implements Consum
     }
 
     @Override
-    public List<GroupConsumeInfo> queryGroupList(boolean skipSysGroup, String address) {
-        HashMap<String, List<String>> consumerGroupMap = Maps.newHashMap();
+    public List<GroupConsumeInfo> queryGroupList(boolean skipSysGroup) {
+        Set<String> consumerGroupSet = Sets.newHashSet();
         try {
             ClusterInfo clusterInfo = mqAdminExt.examineBrokerClusterInfo();
             for (BrokerData brokerData : clusterInfo.getBrokerAddrTable().values()) {
                 SubscriptionGroupWrapper subscriptionGroupWrapper = mqAdminExt.getAllSubscriptionGroup(brokerData.selectBrokerAddr(), 3000L);
-                for (String groupName : subscriptionGroupWrapper.getSubscriptionGroupTable().keySet()) {
-                    if (!consumerGroupMap.containsKey(groupName)) {
-                        consumerGroupMap.putIfAbsent(groupName, new ArrayList<>());
-                    }
-                    List<String> addresses = consumerGroupMap.get(groupName);
-                    addresses.add(brokerData.selectBrokerAddr());
-                    consumerGroupMap.put(groupName, addresses);
-                }
+                consumerGroupSet.addAll(subscriptionGroupWrapper.getSubscriptionGroupTable().keySet());
             }
-        } catch (Exception err) {
-            Throwables.throwIfUnchecked(err);
-            throw new RuntimeException(err);
+        }
+        catch (Exception err) {
+            throw Throwables.propagate(err);
         }
         List<GroupConsumeInfo> groupConsumeInfoList = Collections.synchronizedList(Lists.newArrayList());
-        CountDownLatch countDownLatch = new CountDownLatch(consumerGroupMap.size());
-        for (Map.Entry<String, List<String>> entry : consumerGroupMap.entrySet()) {
-            String consumerGroup = entry.getKey();
+        CountDownLatch countDownLatch = new CountDownLatch(consumerGroupSet.size());
+        for (String consumerGroup : consumerGroupSet) {
             executorService.submit(() -> {
                 try {
-                    GroupConsumeInfo consumeInfo = queryGroup(consumerGroup, address);
-                    consumeInfo.setAddress(entry.getValue());
+                    GroupConsumeInfo consumeInfo = queryGroup(consumerGroup);
                     groupConsumeInfoList.add(consumeInfo);
                 } catch (Exception e) {
                     logger.error("queryGroup exception, consumerGroup: {}", consumerGroup, e);
@@ -178,7 +166,7 @@ public class ConsumerServiceImpl extends AbstractCommonService implements Consum
     }
 
     @Override
-    public GroupConsumeInfo queryGroup(String consumerGroup, String address) {
+    public GroupConsumeInfo queryGroup(String consumerGroup) {
         GroupConsumeInfo groupConsumeInfo = new GroupConsumeInfo();
         try {
             ConsumeStats consumeStats = null;
@@ -190,28 +178,14 @@ public class ConsumerServiceImpl extends AbstractCommonService implements Consum
             }
 
             ConsumerConnection consumerConnection = null;
-            boolean isFifoType = examineSubscriptionGroupConfig(consumerGroup)
-                    .stream().map(ConsumerConfigInfo::getSubscriptionGroupConfig)
-                    .allMatch(SubscriptionGroupConfig::isConsumeMessageOrderly);
-
             try {
-                if (StringUtils.isNotEmpty(address)) {
-                    consumerConnection = proxyAdmin.examineConsumerConnectionInfo(address, consumerGroup);
-                } else {
-                    consumerConnection = mqAdminExt.examineConsumerConnectionInfo(consumerGroup);
-                }
-            } catch (Exception e) {
+                consumerConnection = mqAdminExt.examineConsumerConnectionInfo(consumerGroup);
+            }
+            catch (Exception e) {
                 logger.warn("examineConsumeStats exception to consumerGroup {}, response [{}]", consumerGroup, e.getMessage());
             }
 
             groupConsumeInfo.setGroup(consumerGroup);
-            if (SYSTEM_GROUP_SET.contains(consumerGroup)) {
-                groupConsumeInfo.setSubGroupType("SYSTEM");
-            } else if (isFifoType) {
-                groupConsumeInfo.setSubGroupType("FIFO");
-            } else {
-                groupConsumeInfo.setSubGroupType("NORMAL");
-            }
 
             if (consumeStats != null) {
                 groupConsumeInfo.setConsumeTps((int)consumeStats.getConsumeTps());
@@ -233,18 +207,8 @@ public class ConsumerServiceImpl extends AbstractCommonService implements Consum
     }
 
     @Override
-    public List<TopicConsumerInfo> queryConsumeStatsListByGroupName(String groupName, String address) {
-        ConsumeStats consumeStats;
-        String topic = null;
-        try {
-            String[] addresses = address.split(",");
-            String addr = addresses[0];
-            consumeStats = mqAdminExt.examineConsumeStats(addr, groupName, null, 3000);
-        } catch (Exception e) {
-            Throwables.throwIfUnchecked(e);
-            throw new RuntimeException(e);
-        }
-        return toTopicConsumerInfoList(topic, consumeStats, groupName);
+    public List<TopicConsumerInfo> queryConsumeStatsListByGroupName(String groupName) {
+        return queryConsumeStatsList(null, groupName);
     }
 
     @Override
@@ -254,13 +218,8 @@ public class ConsumerServiceImpl extends AbstractCommonService implements Consum
             consumeStats = mqAdminExt.examineConsumeStats(groupName, topic);
         }
         catch (Exception e) {
-            Throwables.throwIfUnchecked(e);
-            throw new RuntimeException(e);
+            throw propagate(e);
         }
-        return toTopicConsumerInfoList(topic, consumeStats, groupName);
-    }
-
-    private List<TopicConsumerInfo> toTopicConsumerInfoList(String topic, ConsumeStats consumeStats, String groupName) {
         List<MessageQueue> mqList = Lists.newArrayList(Iterables.filter(consumeStats.getOffsetTable().keySet(), new Predicate<MessageQueue>() {
             @Override
             public boolean apply(MessageQueue o) {
@@ -319,8 +278,7 @@ public class ConsumerServiceImpl extends AbstractCommonService implements Consum
             return group2ConsumerInfoMap;
         }
         catch (Exception e) {
-            Throwables.throwIfUnchecked(e);
-            throw new RuntimeException(e);
+            throw propagate(e);
         }
     }
 
@@ -383,8 +341,7 @@ public class ConsumerServiceImpl extends AbstractCommonService implements Consum
             }
         }
         catch (Exception e) {
-            Throwables.throwIfUnchecked(e);
-            throw new RuntimeException(e);
+            throw propagate(e);
         }
         return consumerConfigInfoList;
     }
@@ -409,8 +366,7 @@ public class ConsumerServiceImpl extends AbstractCommonService implements Consum
             }
         }
         catch (Exception e) {
-            Throwables.throwIfUnchecked(e);
-            throw new RuntimeException(e);
+            throw propagate(e);
         }
         return true;
     }
@@ -437,8 +393,7 @@ public class ConsumerServiceImpl extends AbstractCommonService implements Consum
             }
         }
         catch (Exception err) {
-            Throwables.throwIfUnchecked(err);
-            throw new RuntimeException(err);
+            throw Throwables.propagate(err);
         }
         return true;
     }
@@ -453,22 +408,19 @@ public class ConsumerServiceImpl extends AbstractCommonService implements Consum
             }
         }
         catch (Exception e) {
-            Throwables.throwIfUnchecked(e);
-            throw new RuntimeException(e);
+            throw Throwables.propagate(e);
         }
         return brokerNameSet;
 
     }
 
     @Override
-    public ConsumerConnection getConsumerConnection(String consumerGroup, String address) {
+    public ConsumerConnection getConsumerConnection(String consumerGroup) {
         try {
-            String[] addresses = address.split(",");
-            String addr = addresses[0];
-            return mqAdminExt.examineConsumerConnectionInfo(consumerGroup, addr);
-        } catch (Exception e) {
-            Throwables.throwIfUnchecked(e);
-            throw new RuntimeException(e);
+            return mqAdminExt.examineConsumerConnectionInfo(consumerGroup);
+        }
+        catch (Exception e) {
+            throw Throwables.propagate(e);
         }
     }
 
@@ -478,8 +430,7 @@ public class ConsumerServiceImpl extends AbstractCommonService implements Consum
             return mqAdminExt.getConsumerRunningInfo(consumerGroup, clientId, jstack);
         }
         catch (Exception e) {
-            Throwables.throwIfUnchecked(e);
-            throw new RuntimeException(e);
+            throw Throwables.propagate(e);
         }
     }
 }

src/main/java/org/apache/rocketmq/dashboard/service/impl/DashboardCollectServiceImpl.java

@@ -107,8 +107,7 @@ public class DashboardCollectServiceImpl implements DashboardCollectService {
             strings = Files.readLines(file, Charsets.UTF_8);
         }
         catch (IOException e) {
-            Throwables.throwIfUnchecked(e);
-            throw new RuntimeException(e);
+            throw Throwables.propagate(e);
         }
         StringBuffer sb = new StringBuffer();
         for (String string : strings) {

src/main/java/org/apache/rocketmq/dashboard/service/impl/DlqMessageServiceImpl.java

@@ -25,8 +25,8 @@ import javax.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.rocketmq.client.exception.MQClientException;
 import org.apache.rocketmq.common.MixAll;
-import org.apache.rocketmq.remoting.protocol.ResponseCode;
-import org.apache.rocketmq.remoting.protocol.body.ConsumeMessageDirectlyResult;
+import org.apache.rocketmq.common.protocol.ResponseCode;
+import org.apache.rocketmq.common.protocol.body.ConsumeMessageDirectlyResult;
 import org.apache.rocketmq.dashboard.model.DlqMessageResendResult;
 import org.apache.rocketmq.dashboard.model.DlqMessageRequest;
 import org.apache.rocketmq.dashboard.model.MessagePage;
@@ -62,12 +62,10 @@ public class DlqMessageServiceImpl implements DlqMessageService {
                 && e.getResponseCode() == ResponseCode.TOPIC_NOT_EXIST) {
                 return new MessagePage(new PageImpl<>(messageViews, page, 0), query.getTaskId());
             } else {
-                Throwables.throwIfUnchecked(e);
-                throw new RuntimeException(e);
+                throw Throwables.propagate(e);
             }
         } catch (Exception e) {
-            Throwables.throwIfUnchecked(e);
-            throw new RuntimeException(e);
+            throw Throwables.propagate(e);
         }
         return messageService.queryMessageByPage(query);
     }

src/main/java/org/apache/rocketmq/dashboard/service/impl/MessageServiceImpl.java

@@ -37,10 +37,9 @@ import org.apache.rocketmq.common.Pair;
 import org.apache.rocketmq.common.message.MessageClientIDSetter;
 import org.apache.rocketmq.common.message.MessageExt;
 import org.apache.rocketmq.common.message.MessageQueue;
-import org.apache.rocketmq.dashboard.support.AutoCloseConsumerWrapper;
-import org.apache.rocketmq.remoting.protocol.body.Connection;
-import org.apache.rocketmq.remoting.protocol.body.ConsumeMessageDirectlyResult;
-import org.apache.rocketmq.remoting.protocol.body.ConsumerConnection;
+import org.apache.rocketmq.common.protocol.body.Connection;
+import org.apache.rocketmq.common.protocol.body.ConsumeMessageDirectlyResult;
+import org.apache.rocketmq.common.protocol.body.ConsumerConnection;
 import org.apache.rocketmq.dashboard.config.RMQConfigure;
 import org.apache.rocketmq.dashboard.exception.ServiceException;
 import org.apache.rocketmq.dashboard.model.QueueOffsetInfo;
@@ -116,8 +115,7 @@ public class MessageServiceImpl implements MessageService {
             if (err instanceof MQClientException) {
                 throw new ServiceException(-1, ((MQClientException) err).getErrorMessage());
             }
-            Throwables.throwIfUnchecked(err);
-            throw new RuntimeException(err);
+            throw Throwables.propagate(err);
         }
     }
 
@@ -128,11 +126,11 @@ public class MessageServiceImpl implements MessageService {
         if (isEnableAcl) {
             rpcHook = new AclClientRPCHook(new SessionCredentials(configure.getAccessKey(), configure.getSecretKey()));
         }
-        AutoCloseConsumerWrapper consumerWrapper = new AutoCloseConsumerWrapper();
-        DefaultMQPullConsumer consumer = consumerWrapper.getConsumer(rpcHook, configure.isUseTLS());
+        DefaultMQPullConsumer consumer = buildDefaultMQPullConsumer(rpcHook, configure.isUseTLS());
         List<MessageView> messageViewList = Lists.newArrayList();
         try {
             String subExpression = "*";
+            consumer.start();
             Set<MessageQueue> mqs = consumer.fetchSubscribeMessageQueues(topic);
             for (MessageQueue mq : mqs) {
                 long minOffset = consumer.searchOffset(mq, begin);
@@ -187,8 +185,9 @@ public class MessageServiceImpl implements MessageService {
             });
             return messageViewList;
         } catch (Exception e) {
-            Throwables.throwIfUnchecked(e);
-            throw new RuntimeException(e);
+            throw Throwables.propagate(e);
+        } finally {
+            consumer.shutdown();
         }
     }
 
@@ -210,8 +209,7 @@ public class MessageServiceImpl implements MessageService {
             try {
                 return mqAdminExt.consumeMessageDirectly(consumerGroup, clientId, topic, msgId);
             } catch (Exception e) {
-                Throwables.throwIfUnchecked(e);
-                throw new RuntimeException(e);
+                throw Throwables.propagate(e);
             }
         }
 
@@ -225,8 +223,7 @@ public class MessageServiceImpl implements MessageService {
                 return mqAdminExt.consumeMessageDirectly(consumerGroup, connection.getClientId(), topic, msgId);
             }
         } catch (Exception e) {
-            Throwables.throwIfUnchecked(e);
-            throw new RuntimeException(e);
+            throw Throwables.propagate(e);
         }
         throw new IllegalStateException("NO CONSUMER");
 
@@ -262,8 +259,7 @@ public class MessageServiceImpl implements MessageService {
         if (isEnableAcl) {
             rpcHook = new AclClientRPCHook(new SessionCredentials(configure.getAccessKey(), configure.getSecretKey()));
         }
-        AutoCloseConsumerWrapper consumerWrapper = new AutoCloseConsumerWrapper();
-        DefaultMQPullConsumer consumer = consumerWrapper.getConsumer(rpcHook, configure.isUseTLS());
+        DefaultMQPullConsumer consumer = buildDefaultMQPullConsumer(rpcHook, configure.isUseTLS());
 
         long total = 0;
         List<QueueOffsetInfo> queueOffsetInfos = new ArrayList<>();
@@ -271,11 +267,12 @@ public class MessageServiceImpl implements MessageService {
         List<MessageView> messageViews = new ArrayList<>();
 
         try {
+            consumer.start();
             Collection<MessageQueue> messageQueues = consumer.fetchSubscribeMessageQueues(query.getTopic());
             int idx = 0;
             for (MessageQueue messageQueue : messageQueues) {
                 Long minOffset = consumer.searchOffset(messageQueue, query.getBegin());
-                Long maxOffset = consumer.searchOffset(messageQueue, query.getEnd());
+                Long maxOffset = consumer.searchOffset(messageQueue, query.getEnd()) + 1;
                 queueOffsetInfos.add(new QueueOffsetInfo(idx++, minOffset, maxOffset, minOffset, minOffset, messageQueue));
             }
 
@@ -391,8 +388,9 @@ public class MessageServiceImpl implements MessageService {
             PageImpl<MessageView> page = new PageImpl<>(messageViews, query.page(), total);
             return new MessagePageTask(page, queueOffsetInfos);
         } catch (Exception e) {
-            Throwables.throwIfUnchecked(e);
-            throw new RuntimeException(e);
+            throw Throwables.propagate(e);
+        } finally {
+            consumer.shutdown();
         }
     }
 
@@ -402,14 +400,14 @@ public class MessageServiceImpl implements MessageService {
         if (isEnableAcl) {
             rpcHook = new AclClientRPCHook(new SessionCredentials(configure.getAccessKey(), configure.getSecretKey()));
         }
-        AutoCloseConsumerWrapper consumerWrapper = new AutoCloseConsumerWrapper();
-        DefaultMQPullConsumer consumer = consumerWrapper.getConsumer(rpcHook, configure.isUseTLS());
+        DefaultMQPullConsumer consumer = buildDefaultMQPullConsumer(rpcHook, configure.isUseTLS());
         List<MessageView> messageViews = new ArrayList<>();
 
         long offset = query.getPageNum() * query.getPageSize();
 
         long total = 0;
         try {
+            consumer.start();
             for (QueueOffsetInfo queueOffsetInfo : queueOffsetInfos) {
                 long start = queueOffsetInfo.getStart();
                 long end = queueOffsetInfo.getEnd();
@@ -457,8 +455,9 @@ public class MessageServiceImpl implements MessageService {
             }
             return new PageImpl<>(messageViews, query.page(), total);
         } catch (Exception e) {
-            Throwables.throwIfUnchecked(e);
-            throw new RuntimeException(e);
+            throw Throwables.propagate(e);
+        } finally {
+            consumer.shutdown();
         }
     }
 

src/main/java/org/apache/rocketmq/dashboard/service/impl/MonitorServiceImpl.java

@@ -82,8 +82,7 @@ public class MonitorServiceImpl implements MonitorService {
             MixAll.string2File(dataStr, path);
         }
         catch (Exception e) {
-            Throwables.throwIfUnchecked(e);
-            throw new RuntimeException(e);
+            throw Throwables.propagate(e);
         }
     }
 

src/main/java/org/apache/rocketmq/dashboard/service/impl/ProducerServiceImpl.java

@@ -19,7 +19,7 @@ package org.apache.rocketmq.dashboard.service.impl;
 
 import com.google.common.base.Throwables;
 import javax.annotation.Resource;
-import org.apache.rocketmq.remoting.protocol.body.ProducerConnection;
+import org.apache.rocketmq.common.protocol.body.ProducerConnection;
 import org.apache.rocketmq.dashboard.service.ProducerService;
 import org.apache.rocketmq.tools.admin.MQAdminExt;
 import org.springframework.stereotype.Service;
@@ -35,8 +35,7 @@ public class ProducerServiceImpl implements ProducerService {
             return mqAdminExt.examineProducerConnectionInfo(producerGroup, topic);
         }
         catch (Exception e) {
-            Throwables.throwIfUnchecked(e);
-            throw new RuntimeException(e);
+            throw Throwables.propagate(e);
         }
     }
 }

src/main/java/org/apache/rocketmq/dashboard/service/impl/ProxyServiceImpl.java

@@ -1,59 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.rocketmq.dashboard.service.impl;
-
-import com.google.common.collect.Maps;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.rocketmq.dashboard.config.RMQConfigure;
-import org.apache.rocketmq.dashboard.service.ProxyService;
-import org.apache.rocketmq.dashboard.service.client.ProxyAdmin;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.List;
-import java.util.Map;
-
-@Slf4j
-@Service
-public class ProxyServiceImpl implements ProxyService {
-    @Resource
-    protected ProxyAdmin proxyAdmin;
-    @Resource
-    private RMQConfigure configure;
-
-    @Override
-    public void addProxyAddrList(String proxyAddr) {
-        List<String> proxyAddrs = configure.getProxyAddrs();
-        if (proxyAddrs != null && !proxyAddrs.contains(proxyAddr)) {
-            proxyAddrs.add(proxyAddr);
-        }
-        configure.setProxyAddrs(proxyAddrs);
-    }
-
-    @Override
-    public void updateProxyAddrList(String proxyAddr) {
-        configure.setProxyAddr(proxyAddr);
-    }
-
-    @Override
-    public Map<String, Object> getProxyHomePage() {
-        Map<String, Object> homePageInfoMap = Maps.newHashMap();
-        homePageInfoMap.put("currentProxyAddr", configure.getProxyAddr());
-        homePageInfoMap.put("proxyAddrList", configure.getProxyAddrs());
-        return homePageInfoMap;
-    }
-}

src/main/java/org/apache/rocketmq/dashboard/service/impl/TopicServiceImpl.java

@@ -18,65 +18,47 @@
 package org.apache.rocketmq.dashboard.service.impl;
 
 import com.google.common.base.Throwables;
-import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
+import java.util.stream.Collectors;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.rocketmq.acl.common.AclClientRPCHook;
 import org.apache.rocketmq.acl.common.SessionCredentials;
 import org.apache.rocketmq.client.producer.DefaultMQProducer;
 import org.apache.rocketmq.client.producer.SendResult;
-import org.apache.rocketmq.client.producer.TransactionListener;
-import org.apache.rocketmq.client.producer.TransactionMQProducer;
-import org.apache.rocketmq.client.producer.LocalTransactionState;
 import org.apache.rocketmq.client.trace.TraceContext;
 import org.apache.rocketmq.client.trace.TraceDispatcher;
 import org.apache.rocketmq.common.MixAll;
 import org.apache.rocketmq.common.TopicConfig;
-import org.apache.rocketmq.common.attribute.TopicMessageType;
+import org.apache.rocketmq.common.admin.TopicStatsTable;
 import org.apache.rocketmq.common.message.Message;
-import org.apache.rocketmq.common.message.MessageExt;
+import org.apache.rocketmq.common.protocol.body.ClusterInfo;
+import org.apache.rocketmq.common.protocol.body.GroupList;
+import org.apache.rocketmq.common.protocol.body.TopicList;
+import org.apache.rocketmq.common.protocol.route.BrokerData;
+import org.apache.rocketmq.common.protocol.route.TopicRouteData;
 import org.apache.rocketmq.common.topic.TopicValidator;
 import org.apache.rocketmq.dashboard.config.RMQConfigure;
 import org.apache.rocketmq.dashboard.model.request.SendTopicMessageRequest;
 import org.apache.rocketmq.dashboard.model.request.TopicConfigInfo;
-import org.apache.rocketmq.dashboard.model.request.TopicTypeList;
-import org.apache.rocketmq.dashboard.model.request.TopicTypeMeta;
 import org.apache.rocketmq.dashboard.service.AbstractCommonService;
 import org.apache.rocketmq.dashboard.service.TopicService;
 import org.apache.rocketmq.remoting.RPCHook;
-import org.apache.rocketmq.remoting.protocol.admin.TopicStatsTable;
-import org.apache.rocketmq.remoting.protocol.body.ClusterInfo;
-import org.apache.rocketmq.remoting.protocol.body.GroupList;
-import org.apache.rocketmq.remoting.protocol.body.TopicList;
-import org.apache.rocketmq.remoting.protocol.route.BrokerData;
-import org.apache.rocketmq.remoting.protocol.route.TopicRouteData;
 import org.apache.rocketmq.tools.command.CommandUtil;
 import org.joor.Reflect;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.ArrayBlockingQueue;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.stream.Collectors;
-
-import static org.apache.rocketmq.common.TopicAttributes.TOPIC_MESSAGE_TYPE_ATTRIBUTE;
 
 @Service
 public class TopicServiceImpl extends AbstractCommonService implements TopicService {
 
-    private transient DefaultMQProducer systemTopicProducer;
-
-    private final Object producerLock = new Object();
-
     @Autowired
     private RMQConfigure configure;
 
@@ -86,59 +68,23 @@ public class TopicServiceImpl extends AbstractCommonService implements TopicServ
             TopicList allTopics = mqAdminExt.fetchAllTopicList();
             TopicList sysTopics = getSystemTopicList();
             Set<String> topics =
-                    allTopics.getTopicList().stream().map(topic -> {
-                        if (!skipSysProcess && sysTopics.getTopicList().contains(topic)) {
-                            topic = String.format("%s%s", "%SYS%", topic);
-                        }
-                        return topic;
-                    }).filter(topic -> {
-                        if (skipRetryAndDlq) {
-                            return !(topic.startsWith(MixAll.RETRY_GROUP_TOPIC_PREFIX)
-                                    || topic.startsWith(MixAll.DLQ_GROUP_TOPIC_PREFIX));
-                        }
-                        return true;
-                    }).collect(Collectors.toSet());
+                allTopics.getTopicList().stream().map(topic -> {
+                    if (!skipSysProcess && sysTopics.getTopicList().contains(topic)) {
+                        topic = String.format("%s%s", "%SYS%", topic);
+                    }
+                    return topic;
+                }).filter(topic -> {
+                    if (skipRetryAndDlq) {
+                        return !(topic.startsWith(MixAll.RETRY_GROUP_TOPIC_PREFIX)
+                            || topic.startsWith(MixAll.DLQ_GROUP_TOPIC_PREFIX));
+                    }
+                    return true;
+                }).collect(Collectors.toSet());
             allTopics.getTopicList().clear();
             allTopics.getTopicList().addAll(topics);
             return allTopics;
         } catch (Exception e) {
-            Throwables.throwIfUnchecked(e);
-            throw new RuntimeException(e);
-        }
-    }
-
-    @Override
-    public TopicTypeList examineAllTopicType() {
-        ArrayList<TopicTypeMeta> topicTypes = new ArrayList<>();
-        ArrayList<String> names = new ArrayList<>();
-        ArrayList<String> messageTypes = new ArrayList<>();
-        TopicList topicList = fetchAllTopicList(false, false);
-        checkTopicType(topicList, topicTypes);
-        topicTypes.sort((t1, t2) -> t1.getTopicName().compareTo(t2.getTopicName()));
-        for (TopicTypeMeta topicTypeMeta : topicTypes) {
-            names.add(topicTypeMeta.getTopicName());
-            messageTypes.add(topicTypeMeta.getMessageType());
-        }
-        return new TopicTypeList(names, messageTypes);
-    }
-
-    private void checkTopicType(TopicList topicList, ArrayList<TopicTypeMeta> topicTypes) {
-        for (String topicName : topicList.getTopicList()) {
-            TopicTypeMeta topicType = new TopicTypeMeta();
-            topicType.setTopicName(topicName);
-            if (topicName.startsWith("%R")) {
-                topicType.setMessageType("RETRY");
-            } else if (topicName.startsWith("%D")) {
-                topicType.setMessageType("DELAY");
-            } else if (topicName.startsWith("%S")) {
-                topicType.setMessageType("SYSTEM");
-            } else {
-                List<TopicConfigInfo> topicConfigInfos = examineTopicConfig(topicName);
-                if (!CollectionUtils.isEmpty(topicConfigInfos)) {
-                    topicType.setMessageType(topicConfigInfos.get(0).getMessageType());
-                }
-            }
-            topicTypes.add(topicType);
+            throw Throwables.propagate(e);
         }
     }
 
@@ -147,8 +93,7 @@ public class TopicServiceImpl extends AbstractCommonService implements TopicServ
         try {
             return mqAdminExt.examineTopicStats(topic);
         } catch (Exception e) {
-            Throwables.throwIfUnchecked(e);
-            throw new RuntimeException(e);
+            throw Throwables.propagate(e);
         }
     }
 
@@ -157,8 +102,7 @@ public class TopicServiceImpl extends AbstractCommonService implements TopicServ
         try {
             return mqAdminExt.examineTopicRouteInfo(topic);
         } catch (Exception ex) {
-            Throwables.throwIfUnchecked(ex);
-            throw new RuntimeException(ex);
+            throw Throwables.propagate(ex);
         }
     }
 
@@ -167,8 +111,7 @@ public class TopicServiceImpl extends AbstractCommonService implements TopicServ
         try {
             return mqAdminExt.queryTopicConsumeByWho(topic);
         } catch (Exception e) {
-            Throwables.throwIfUnchecked(e);
-            throw new RuntimeException(e);
+            throw Throwables.propagate(e);
         }
     }
 
@@ -176,20 +119,14 @@ public class TopicServiceImpl extends AbstractCommonService implements TopicServ
     public void createOrUpdate(TopicConfigInfo topicCreateOrUpdateRequest) {
         TopicConfig topicConfig = new TopicConfig();
         BeanUtils.copyProperties(topicCreateOrUpdateRequest, topicConfig);
-        String messageType = topicCreateOrUpdateRequest.getMessageType();
-        if (StringUtils.isBlank(messageType)) {
-            messageType = TopicMessageType.NORMAL.name();
-        }
-        topicConfig.setAttributes(ImmutableMap.of("+".concat(TOPIC_MESSAGE_TYPE_ATTRIBUTE.getName()), messageType));
         try {
             ClusterInfo clusterInfo = mqAdminExt.examineBrokerClusterInfo();
             for (String brokerName : changeToBrokerNameSet(clusterInfo.getClusterAddrTable(),
-                    topicCreateOrUpdateRequest.getClusterNameList(), topicCreateOrUpdateRequest.getBrokerNameList())) {
+                topicCreateOrUpdateRequest.getClusterNameList(), topicCreateOrUpdateRequest.getBrokerNameList())) {
                 mqAdminExt.createAndUpdateTopicConfig(clusterInfo.getBrokerAddrTable().get(brokerName).selectBrokerAddr(), topicConfig);
             }
         } catch (Exception err) {
-            Throwables.throwIfUnchecked(err);
-            throw new RuntimeException(err);
+            throw Throwables.propagate(err);
         }
     }
 
@@ -200,8 +137,7 @@ public class TopicServiceImpl extends AbstractCommonService implements TopicServ
             clusterInfo = mqAdminExt.examineBrokerClusterInfo();
             return mqAdminExt.examineTopicConfig(clusterInfo.getBrokerAddrTable().get(brokerName).selectBrokerAddr(), topic);
         } catch (Exception e) {
-            Throwables.throwIfUnchecked(e);
-            throw new RuntimeException(e);
+            throw Throwables.propagate(e);
         }
     }
 
@@ -214,11 +150,6 @@ public class TopicServiceImpl extends AbstractCommonService implements TopicServ
             TopicConfig topicConfig = examineTopicConfig(topic, brokerData.getBrokerName());
             BeanUtils.copyProperties(topicConfig, topicConfigInfo);
             topicConfigInfo.setBrokerNameList(Lists.newArrayList(brokerData.getBrokerName()));
-            String messageType = topicConfig.getAttributes().get(TOPIC_MESSAGE_TYPE_ATTRIBUTE.getName());
-            if (StringUtils.isBlank(messageType)) {
-                messageType = TopicMessageType.UNSPECIFIED.name();
-            }
-            topicConfigInfo.setMessageType(messageType);
             topicConfigInfoList.add(topicConfigInfo);
         }
         return topicConfigInfoList;
@@ -239,8 +170,7 @@ public class TopicServiceImpl extends AbstractCommonService implements TopicServ
             }
             mqAdminExt.deleteTopicInNameServer(nameServerSet, topic);
         } catch (Exception err) {
-            Throwables.throwIfUnchecked(err);
-            throw new RuntimeException(err);
+            throw Throwables.propagate(err);
         }
         return true;
     }
@@ -251,8 +181,7 @@ public class TopicServiceImpl extends AbstractCommonService implements TopicServ
         try {
             clusterInfo = mqAdminExt.examineBrokerClusterInfo();
         } catch (Exception err) {
-            Throwables.throwIfUnchecked(err);
-            throw new RuntimeException(err);
+            throw Throwables.propagate(err);
         }
         for (String clusterName : clusterInfo.getClusterAddrTable().keySet()) {
             deleteTopic(topic, clusterName);
@@ -268,13 +197,11 @@ public class TopicServiceImpl extends AbstractCommonService implements TopicServ
             try {
                 clusterInfo = mqAdminExt.examineBrokerClusterInfo();
             } catch (Exception e) {
-                Throwables.throwIfUnchecked(e);
-                throw new RuntimeException(e);
+                throw Throwables.propagate(e);
             }
             mqAdminExt.deleteTopicInBroker(Sets.newHashSet(clusterInfo.getBrokerAddrTable().get(brokerName).selectBrokerAddr()), topic);
         } catch (Exception e) {
-            Throwables.throwIfUnchecked(e);
-            throw new RuntimeException(e);
+            throw Throwables.propagate(e);
         }
         return true;
     }
@@ -289,112 +216,53 @@ public class TopicServiceImpl extends AbstractCommonService implements TopicServ
         return defaultMQProducer;
     }
 
-    public TransactionMQProducer buildTransactionMQProducer(String producerGroup, RPCHook rpcHook, boolean traceEnabled) {
-        TransactionMQProducer defaultMQProducer = new TransactionMQProducer(null, producerGroup, rpcHook, traceEnabled, TopicValidator.RMQ_SYS_TRACE_TOPIC);
-        defaultMQProducer.setUseTLS(configure.isUseTLS());
-        return defaultMQProducer;
-    }
-
     private TopicList getSystemTopicList() {
         RPCHook rpcHook = null;
         boolean isEnableAcl = !StringUtils.isEmpty(configure.getAccessKey()) && !StringUtils.isEmpty(configure.getSecretKey());
         if (isEnableAcl) {
             rpcHook = new AclClientRPCHook(new SessionCredentials(configure.getAccessKey(), configure.getSecretKey()));
         }
-
-        // ensures thread safety
-        if (systemTopicProducer == null) {
-            synchronized (producerLock) {
-                if (systemTopicProducer == null) {
-                    systemTopicProducer = buildDefaultMQProducer(MixAll.SELF_TEST_PRODUCER_GROUP, rpcHook);
-                    systemTopicProducer.setInstanceName("SystemTopicProducer-" + System.currentTimeMillis());
-                    systemTopicProducer.setNamesrvAddr(configure.getNamesrvAddr());
-                    try {
-                        systemTopicProducer.start();
-                    } catch (Exception e) {
-                        systemTopicProducer = null;
-                        Throwables.throwIfUnchecked(e);
-                        throw new RuntimeException(e);
-                    }
-                }
-            }
-        }
+        DefaultMQProducer producer = buildDefaultMQProducer(MixAll.SELF_TEST_PRODUCER_GROUP, rpcHook);
+        producer.setInstanceName(String.valueOf(System.currentTimeMillis()));
+        producer.setNamesrvAddr(configure.getNamesrvAddr());
 
         try {
-            return systemTopicProducer.getDefaultMQProducerImpl()
-                    .getmQClientFactory()
-                    .getMQClientAPIImpl()
-                    .getSystemTopicList(20000L);
+            producer.start();
+            return producer.getDefaultMQProducerImpl().getmQClientFactory().getMQClientAPIImpl().getSystemTopicList(20000L);
         } catch (Exception e) {
-            // If the call fails, close and clean up the producer, and it will be re-created next time.
-            synchronized (producerLock) {
-                if (systemTopicProducer != null) {
-                    systemTopicProducer.shutdown();
-                    systemTopicProducer = null;
-                }
-            }
-            Throwables.throwIfUnchecked(e);
-            throw new RuntimeException(e);
+            throw Throwables.propagate(e);
+        } finally {
+            producer.shutdown();
         }
     }
 
     @Override
     public SendResult sendTopicMessageRequest(SendTopicMessageRequest sendTopicMessageRequest) {
-        List<TopicConfigInfo> topicConfigInfos = examineTopicConfig(sendTopicMessageRequest.getTopic());
-        String messageType = topicConfigInfos.get(0).getMessageType();
+        DefaultMQProducer producer = null;
         AclClientRPCHook rpcHook = null;
         if (configure.isACLEnabled()) {
             rpcHook = new AclClientRPCHook(new SessionCredentials(
-                    configure.getAccessKey(),
-                    configure.getSecretKey()
+                configure.getAccessKey(),
+                configure.getSecretKey()
             ));
         }
-        if (TopicMessageType.TRANSACTION.getValue().equals(messageType)) {
-            // transaction message
-            TransactionListener transactionListener = new TransactionListenerImpl();
-
-            TransactionMQProducer producer = buildTransactionMQProducer(MixAll.SELF_TEST_PRODUCER_GROUP, rpcHook, sendTopicMessageRequest.isTraceEnabled());
-            producer.setInstanceName(String.valueOf(System.currentTimeMillis()));
-            producer.setNamesrvAddr(configure.getNamesrvAddr());
-            producer.setTransactionListener(transactionListener);
-            try {
-                producer.start();
-                Message msg = new Message(sendTopicMessageRequest.getTopic(),
-                        sendTopicMessageRequest.getTag(),
-                        sendTopicMessageRequest.getKey(),
-                        sendTopicMessageRequest.getMessageBody().getBytes()
-                );
-                return producer.sendMessageInTransaction(msg, null);
-            } catch (Exception e) {
-                Throwables.throwIfUnchecked(e);
-                throw new RuntimeException(e);
-            } finally {
-                waitSendTraceFinish(producer, sendTopicMessageRequest.isTraceEnabled());
-                producer.shutdown();
-            }
-        } else {
-            // no transaction message
-            DefaultMQProducer producer = null;
-            producer = buildDefaultMQProducer(MixAll.SELF_TEST_PRODUCER_GROUP, rpcHook, sendTopicMessageRequest.isTraceEnabled());
-            producer.setInstanceName(String.valueOf(System.currentTimeMillis()));
-            producer.setNamesrvAddr(configure.getNamesrvAddr());
-            try {
-                producer.start();
-                Message msg = new Message(sendTopicMessageRequest.getTopic(),
-                        sendTopicMessageRequest.getTag(),
-                        sendTopicMessageRequest.getKey(),
-                        sendTopicMessageRequest.getMessageBody().getBytes()
-                );
-                return producer.send(msg);
-            } catch (Exception e) {
-                Throwables.throwIfUnchecked(e);
-                throw new RuntimeException(e);
-            } finally {
-                waitSendTraceFinish(producer, sendTopicMessageRequest.isTraceEnabled());
-                producer.shutdown();
-            }
+        producer = buildDefaultMQProducer(MixAll.SELF_TEST_PRODUCER_GROUP, rpcHook, sendTopicMessageRequest.isTraceEnabled());
+        producer.setInstanceName(String.valueOf(System.currentTimeMillis()));
+        producer.setNamesrvAddr(configure.getNamesrvAddr());
+        try {
+            producer.start();
+            Message msg = new Message(sendTopicMessageRequest.getTopic(),
+                sendTopicMessageRequest.getTag(),
+                sendTopicMessageRequest.getKey(),
+                sendTopicMessageRequest.getMessageBody().getBytes()
+            );
+            return producer.send(msg);
+        } catch (Exception e) {
+            throw Throwables.propagate(e);
+        } finally {
+            waitSendTraceFinish(producer, sendTopicMessageRequest.isTraceEnabled());
+            producer.shutdown();
         }
-
     }
 
     private void waitSendTraceFinish(DefaultMQProducer producer, boolean traceEnabled) {
@@ -416,20 +284,4 @@ public class TopicServiceImpl extends AbstractCommonService implements TopicServ
         } catch (Exception ignore) {
         }
     }
-
-    static class TransactionListenerImpl implements TransactionListener {
-        private AtomicInteger transactionIndex = new AtomicInteger(0);
-
-        private ConcurrentHashMap<String, Integer> localTrans = new ConcurrentHashMap<>();
-
-        @Override
-        public LocalTransactionState executeLocalTransaction(Message msg, Object arg) {
-            return LocalTransactionState.COMMIT_MESSAGE;
-        }
-
-        @Override
-        public LocalTransactionState checkLocalTransaction(MessageExt msg) {
-            return LocalTransactionState.COMMIT_MESSAGE;
-        }
-    }
 }

src/main/java/org/apache/rocketmq/dashboard/support/AutoCloseConsumerWrapper.java

@@ -1,132 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.rocketmq.dashboard.support;
-
-import org.apache.rocketmq.client.consumer.DefaultMQPullConsumer;
-import org.apache.rocketmq.client.exception.MQClientException;
-import org.apache.rocketmq.common.MixAll;
-import org.apache.rocketmq.remoting.RPCHook;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import java.time.Duration;
-import java.time.Instant;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicReference;
-
-public class AutoCloseConsumerWrapper {
-
-    private final Logger logger = LoggerFactory.getLogger(GlobalRestfulResponseBodyAdvice.class);
-
-    private static final AtomicReference<DefaultMQPullConsumer> CONSUMER_REF = new AtomicReference<>();
-    private final AtomicBoolean isTaskScheduled = new AtomicBoolean(false);
-    private final AtomicBoolean isClosing = new AtomicBoolean(false);
-    private static volatile Instant lastUsedTime = Instant.now();
-
-
-    private static final ScheduledExecutorService SCHEDULER =
-            Executors.newSingleThreadScheduledExecutor();
-
-    public AutoCloseConsumerWrapper() {
-        startIdleCheckTask();
-    }
-
-
-    public DefaultMQPullConsumer getConsumer(RPCHook rpcHook,Boolean useTLS)  {
-        lastUsedTime = Instant.now();
-
-        DefaultMQPullConsumer consumer = CONSUMER_REF.get();
-        if (consumer == null) {
-            synchronized (this) {
-                consumer = CONSUMER_REF.get();
-                if (consumer == null) {
-                    consumer = createNewConsumer(rpcHook,useTLS);
-                    CONSUMER_REF.set(consumer);
-                }
-                try {
-                    consumer.start();
-                } catch (MQClientException e) {
-                    consumer.shutdown();
-                    CONSUMER_REF.set(null);
-                    throw new RuntimeException("Failed to start consumer", e);
-
-                }
-            }
-        }
-        return consumer;
-    }
-
-
-    protected DefaultMQPullConsumer createNewConsumer(RPCHook rpcHook, Boolean useTLS) {
-        return new DefaultMQPullConsumer(MixAll.TOOLS_CONSUMER_GROUP, rpcHook) {{
-            setUseTLS(useTLS);
-        }};
-    }
-
-    private void startIdleCheckTask() {
-        if (!isTaskScheduled.get()) {
-            synchronized (this) {
-                if (!isTaskScheduled.get()) {
-                    SCHEDULER.scheduleWithFixedDelay(() -> {
-                        try {
-                            checkAndCloseIdleConsumer();
-                        } catch (Exception e) {
-                            logger.error("Idle check failed", e);
-                        }
-                    }, 1, 1, TimeUnit.MINUTES);
-
-                    isTaskScheduled.set(true);
-                }
-            }
-        }
-    }
-
-    public void checkAndCloseIdleConsumer() {
-        if (shouldClose()) {
-            synchronized (this) {
-                if (shouldClose()) {
-                    close();
-                }
-            }
-        }
-    }
-
-    private boolean shouldClose() {
-        long idleTimeoutMs = 60_000;
-        return CONSUMER_REF.get() != null &&
-                Duration.between(lastUsedTime, Instant.now()).toMillis() > idleTimeoutMs;
-    }
-
-
-    public void close() {
-        if (isClosing.compareAndSet(false, true)) {
-            try {
-                DefaultMQPullConsumer consumer = CONSUMER_REF.getAndSet(null);
-                if (consumer != null) {
-                    consumer.shutdown();
-                }
-                isTaskScheduled.set(false);
-            } finally {
-                isClosing.set(false);
-            }
-        }
-    }
-
-}

src/main/java/org/apache/rocketmq/dashboard/task/CollectTaskRunnble.java

@@ -24,12 +24,12 @@ import java.util.List;
 import java.util.concurrent.ExecutionException;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.rocketmq.common.MixAll;
-import org.apache.rocketmq.common.stats.Stats;
-import org.apache.rocketmq.remoting.protocol.body.BrokerStatsData;
-import org.apache.rocketmq.remoting.protocol.body.GroupList;
-import org.apache.rocketmq.remoting.protocol.route.BrokerData;
-import org.apache.rocketmq.remoting.protocol.route.TopicRouteData;
+import org.apache.rocketmq.common.protocol.body.BrokerStatsData;
+import org.apache.rocketmq.common.protocol.body.GroupList;
+import org.apache.rocketmq.common.protocol.route.BrokerData;
+import org.apache.rocketmq.common.protocol.route.TopicRouteData;
 import org.apache.rocketmq.dashboard.service.DashboardCollectService;
+import org.apache.rocketmq.store.stats.BrokerStatsManager;
 import org.apache.rocketmq.tools.admin.MQAdminExt;
 import org.apache.rocketmq.tools.command.stats.StatsAllSubCommand;
 
@@ -63,7 +63,7 @@ public class CollectTaskRunnble implements Runnable {
                 String masterAddr = bd.getBrokerAddrs().get(MixAll.MASTER_ID);
                 if (masterAddr != null) {
                     try {
-                        BrokerStatsData bsd = mqAdminExt.viewBrokerStatsData(masterAddr, Stats.TOPIC_PUT_NUMS, topic);
+                        BrokerStatsData bsd = mqAdminExt.viewBrokerStatsData(masterAddr, BrokerStatsManager.TOPIC_PUT_NUMS, topic);
                         inTPS += bsd.getStatsMinute().getTps();
                         inMsgCntToday += StatsAllSubCommand.compute24HourSum(bsd);
                     } catch (Exception e) {
@@ -78,7 +78,7 @@ public class CollectTaskRunnble implements Runnable {
                         if (masterAddr != null) {
                             try {
                                 String statsKey = String.format("%s@%s", topic, group);
-                                BrokerStatsData bsd = mqAdminExt.viewBrokerStatsData(masterAddr, Stats.GROUP_GET_NUMS, statsKey);
+                                BrokerStatsData bsd = mqAdminExt.viewBrokerStatsData(masterAddr, BrokerStatsManager.GROUP_GET_NUMS, statsKey);
                                 outTPS += bsd.getStatsMinute().getTps();
                                 outMsgCntToday += StatsAllSubCommand.compute24HourSum(bsd);
                             } catch (Exception e) {
@@ -93,8 +93,7 @@ public class CollectTaskRunnble implements Runnable {
             try {
                 list = dashboardCollectService.getTopicMap().get(topic);
             } catch (ExecutionException e) {
-                Throwables.throwIfUnchecked(e);
-                throw new RuntimeException(e);
+                throw Throwables.propagate(e);
             }
             if (null == list) {
                 list = Lists.newArrayList();

src/main/java/org/apache/rocketmq/dashboard/task/DashboardCollectTask.java

@@ -34,10 +34,10 @@ import java.util.Set;
 import java.util.concurrent.ExecutorService;
 import javax.annotation.Resource;
 import org.apache.rocketmq.common.MixAll;
-import org.apache.rocketmq.remoting.protocol.body.ClusterInfo;
-import org.apache.rocketmq.remoting.protocol.body.KVTable;
-import org.apache.rocketmq.remoting.protocol.body.TopicList;
-import org.apache.rocketmq.remoting.protocol.route.BrokerData;
+import org.apache.rocketmq.common.protocol.body.ClusterInfo;
+import org.apache.rocketmq.common.protocol.body.KVTable;
+import org.apache.rocketmq.common.protocol.body.TopicList;
+import org.apache.rocketmq.common.protocol.route.BrokerData;
 import org.apache.rocketmq.common.topic.TopicValidator;
 import org.apache.rocketmq.dashboard.config.RMQConfigure;
 import org.apache.rocketmq.dashboard.service.DashboardCollectService;
@@ -84,8 +84,7 @@ public class DashboardCollectTask {
             }
         }
         catch (Exception err) {
-            Throwables.throwIfUnchecked(err);
-            throw new RuntimeException(err);
+            throw Throwables.propagate(err);
         }
     }
 
@@ -129,8 +128,7 @@ public class DashboardCollectTask {
             log.debug("Broker Collected Data in memory = {}" + JsonUtil.obj2String(dashboardCollectService.getBrokerMap().asMap()));
         }
         catch (Exception e) {
-            Throwables.throwIfUnchecked(e);
-            throw new RuntimeException(e);
+            throw Throwables.propagate(e);
         }
     }
 
@@ -146,12 +144,10 @@ public class DashboardCollectTask {
                 Thread.sleep(1000);
             }
             catch (InterruptedException e1) {
-                Throwables.throwIfUnchecked(e1);
-                throw new RuntimeException(e1);
+                throw Throwables.propagate(e1);
             }
             fetchBrokerRuntimeStats(brokerAddr, retryTime - 1);
-            Throwables.throwIfUnchecked(e);
-            throw new RuntimeException(e);
+            throw Throwables.propagate(e);
         }
     }
 
@@ -201,8 +197,7 @@ public class DashboardCollectTask {
 
         }
         catch (IOException e) {
-            Throwables.throwIfUnchecked(e);
-            throw new RuntimeException(e);
+            throw Throwables.propagate(e);
         }
     }
 
@@ -255,7 +250,7 @@ public class DashboardCollectTask {
 
     private void addSystemTopic() throws Exception {
         ClusterInfo clusterInfo = mqAdminExt.examineBrokerClusterInfo();
-        Map<String, Set<String>> clusterTable = clusterInfo.getClusterAddrTable();
+        HashMap<String, Set<String>> clusterTable = clusterInfo.getClusterAddrTable();
         for (Map.Entry<String, Set<String>> entry : clusterTable.entrySet()) {
             String clusterName = entry.getKey();
             TopicValidator.addSystemTopic(clusterName);

src/main/java/org/apache/rocketmq/dashboard/task/MonitorTask.java

@@ -40,7 +40,7 @@ public class MonitorTask {
 //    @Scheduled(cron = "* * * * * ?")
     public void scanProblemConsumeGroup() {
         for (Map.Entry<String, ConsumerMonitorConfig> configEntry : monitorService.queryConsumerMonitorConfig().entrySet()) {
-            GroupConsumeInfo consumeInfo = consumerService.queryGroup(configEntry.getKey(), null);
+            GroupConsumeInfo consumeInfo = consumerService.queryGroup(configEntry.getKey());
             if (consumeInfo.getCount() < configEntry.getValue().getMinCount() || consumeInfo.getDiffTotal() > configEntry.getValue().getMaxDiffTotal()) {
                 logger.info("op=look consumeInfo {}", JsonUtil.obj2String(consumeInfo)); // notify the alert system
             }

src/main/resources/application.yml

@@ -42,9 +42,7 @@ rocketmq:
     # configure multiple namesrv addresses to manage multiple different clusters
     namesrvAddrs:
       - 127.0.0.1:9876
-    #      - 127.0.0.2:9876
-    #      - 10.151.47.32:9876;10.151.47.33:9876;10.151.47.34:9876
-    #      - 10.151.47.30:9876
+      - 127.0.0.2:9876
     # if you use rocketmq version < 3.5.8, rocketmq.config.isVIPChannel should be false.default true
     isVIPChannel:
     # timeout for mqadminExt, default 5000ms
@@ -59,12 +57,9 @@ rocketmq:
     # must create userInfo file: ${rocketmq.config.dataPath}/users.properties if the login is required
     loginRequired: false
     useTLS: false
-    proxyAddr: 127.0.0.1:8080
-    proxyAddrs:
-      - 127.0.0.1:8080
     # set the accessKey and secretKey if you used acl
-#    accessKey: rocketmq2
-#    secretKey: 12345678
+    accessKey: # if version > 4.4.0
+    secretKey: # if version > 4.4.0
 
 threadpool:
   config:

src/main/resources/static/index.html

@@ -104,7 +104,6 @@
 <script type="text/javascript" src="src/tools/tools.js?v=201703171710"></script>
 <script type="text/javascript" src="src/cluster.js?timestamp=4"></script>
 <script type="text/javascript" src="src/topic.js"></script>
-<script type="text/javascript" src="src/proxy.js"></script>
 <script type="text/javascript" src="src/consumer.js?timestamp=6"></script>
 <script type="text/javascript" src="src/producer.js"></script>
 <script type="text/javascript" src="src/message.js"></script>

src/main/resources/static/src/app.js

@@ -213,9 +213,6 @@ app.config(['$routeProvider', '$httpProvider','$cookiesProvider','getDictNamePro
         }).when('/ops', {
             templateUrl: 'view/pages/ops.html',
             controller:'opsController'
-        }).when('/proxy', {
-            templateUrl: 'view/pages/proxy.html',
-            controller:'proxyController'
         }).when('/acl', {
             templateUrl: 'view/pages/acl.html',
             controller: 'aclController'

src/main/resources/static/src/consumer.js

@@ -45,7 +45,6 @@ module.controller('consumerController', ['$scope', 'ngDialog', '$http', 'Notific
     $scope.writeOperationEnabled =  $scope.userRole == null ? true : ($scope.userRole == 1 ? true : false);
     $scope.filterNormal = true;
     $scope.filterSystem = false;
-    $scope.filterFIFO = false;
 
     $scope.doSort = function () {// todo  how to change this fe's code ? (it's dirty)
         if ($scope.sortKey == 'diffTotal') {
@@ -76,11 +75,7 @@ module.controller('consumerController', ['$scope', 'ngDialog', '$http', 'Notific
 
         $http({
             method: "GET",
-            url: "consumer/groupList.query",
-            params: {
-                skipSysGroup: false,
-                address: $scope.isRmqVersionV5() ? localStorage.getItem('proxyAddr') : null
-            }
+            url: "consumer/groupList.query"
         }).success(function (resp) {
             if (resp.status == 0) {
                 $scope.allConsumerGrouopList = resp.data;
@@ -140,28 +135,16 @@ module.controller('consumerController', ['$scope', 'ngDialog', '$http', 'Notific
         $scope.filterList(1);
     });
 
-    $scope.$watch('filterFIFO', function () {
-        $scope.filterList(1);
-    });
-
-    $scope.filterByType = function (str, type,version) {
+    $scope.filterByType = function (str) {
         if ($scope.filterSystem) {
-            if (type === "SYSTEM") {
+            if (str.startsWith("%S")) {
                 return true
             }
         }
         if ($scope.filterNormal) {
-            if (type === "NORMAL") {
+            if (str.startsWith("%") == false) {
                 return true
             }
-            if(!version && type === "FIFO"){
-                return true;
-            }
-        }
-        if ($scope.filterFIFO) {
-            if (type === "FIFO") {
-                return true;
-            }
         }
         return false;
     };
@@ -171,7 +154,7 @@ module.controller('consumerController', ['$scope', 'ngDialog', '$http', 'Notific
         var canShowList = [];
         $scope.allConsumerGrouopList.forEach(function (element) {
             console.log(element)
-            if ($scope.filterByType(element.group, element.subGroupType, $scope.rmqVersion)) {
+            if ($scope.filterByType(element.group)) {
                 if (element.group.toLowerCase().indexOf(lowExceptStr) != -1) {
                     canShowList.push(element);
                 }
@@ -206,7 +189,6 @@ module.controller('consumerController', ['$scope', 'ngDialog', '$http', 'Notific
                 subscriptionGroupConfig: {
                     groupName: "",
                     consumeEnable: true,
-                    consumeMessageOrderly: false,
                     consumeFromMinEnable: true,
                     consumeBroadcastEnable: true,
                     retryQueueNums: 1,
@@ -229,7 +211,7 @@ module.controller('consumerController', ['$scope', 'ngDialog', '$http', 'Notific
                         // Refresh topic list
                         $scope.refreshConsumerData();
                     },
-                    template: $scope.rmqVersion ? 'consumerModifyDialogForV5' : 'consumerModifyDialog',
+                    template: 'consumerModifyDialog',
                     controller: 'consumerModifyDialogController',
                     data: {
                         consumerRequestList: request,
@@ -244,11 +226,11 @@ module.controller('consumerController', ['$scope', 'ngDialog', '$http', 'Notific
             }
         });
     };
-    $scope.detail = function (consumerGroupName, address) {
+    $scope.detail = function (consumerGroupName) {
         $http({
             method: "GET",
             url: "consumer/queryTopicByConsumer.query",
-            params: {consumerGroup: consumerGroupName, address: address}
+            params: {consumerGroup: consumerGroupName}
         }).success(function (resp) {
             if (resp.status == 0) {
                 console.log(resp);
@@ -263,11 +245,11 @@ module.controller('consumerController', ['$scope', 'ngDialog', '$http', 'Notific
         });
     };
 
-    $scope.client = function (consumerGroupName, address) {
+    $scope.client = function (consumerGroupName) {
         $http({
             method: "GET",
             url: "consumer/consumerConnection.query",
-            params: {consumerGroup: consumerGroupName, address: address}
+            params: {consumerGroup: consumerGroupName}
         }).success(function (resp) {
             if (resp.status == 0) {
                 console.log(resp);

src/main/resources/static/src/controller.js

@@ -15,27 +15,10 @@
  * limitations under the License.
  */
 app.controller('AppCtrl', ['$scope','$window','$translate','$http','Notification', function ($scope,$window,$translate, $http, Notification) {
-    $scope.rmqVersion = localStorage.getItem("isV5");
-
     $scope.changeTranslate = function(langKey){
         $translate.use(langKey);
     }
 
-    $scope.changeRMQVersion = function (version) {
-        $scope.rmqVersion = version === 5;
-        var v = version === 5;
-        localStorage.setItem("isV5", v);
-    }
-
-    $scope.isRmqVersionV5 = function(){
-        var v=localStorage.getItem('isV5');
-        //for js !! 'false' is true!
-        if( /false/i.test(v) ){
-            return false;
-        }
-        return !! v;
-    }
-
     $scope.logout = function(){
         $http({
                     method: "POST",

src/main/resources/static/src/i18n/en.js

@@ -54,13 +54,9 @@ var en = {
     "RESET_CUS_OFFSET": "Reset Consumer Offset",
     "DELETE": "Delete",
     "CHANGE_LANG": "ChangeLanguage",
-    "CHANGE_VERSION": "ChangeVersion",
     "BROKER": "Broker",
     "NORMAL": "NORMAL",
     "RETRY": "RETRY",
-    "FIFO": "FIFO",
-    "TRANSACTION": "TRANSACTION",
-    "UNSPECIFIED": "UNSPECIFIED",
     "DLQ": "DLQ",
     "QUANTITY":"Quantity",
     "TYPE":"Type",
@@ -101,7 +97,6 @@ var en = {
     "RESET_OFFSET":"resetOffset",
     "CLUSTER_NAME":"clusterName",
     "OPS":"OPS",
-    "PROXY":"Proxy",
     "AUTO_REFRESH":"AUTO_REFRESH",
     "REFRESH":"REFRESH",
     "LOGOUT":"Logout",
@@ -128,11 +123,5 @@ var en = {
     "GROUP_PERM":"Group Permission",
     "SYNCHRONIZE":"Synchronize Data",
     "SHOW":"Show",
-    "HIDE":"Hide",
-    "MESSAGE_TYPE":"messageType",
-    "MESSAGE_TYPE_UNSPECIFIED": "UNSPECIFIED, is NORMAL",
-    "MESSAGE_TYPE_NORMAL": "NORMAL",
-    "MESSAGE_TYPE_FIFO": "FIFO",
-    "MESSAGE_TYPE_DELAY": "DELAY",
-    "MESSAGE_TYPE_TRANSACTION": "TRANSACTION",
+    "HIDE":"Hide"
 }

src/main/resources/static/src/i18n/zh.js

@@ -55,13 +55,9 @@ var zh = {
     "SKIP_MESSAGE_ACCUMULATE":"跳过堆积",
     "DELETE": "删除",
     "CHANGE_LANG": "更换语言",
-    "CHANGE_VERSION": "更换版本",
     "BROKER": "Broker",
     "NORMAL": "普通",
     "RETRY": "重试",
-    "FIFO": "顺序",
-    "TRANSACTION": "事务",
-    "UNSPECIFIED": "未指定",
     "DLQ": "死信",
     "QUANTITY":"数量",
     "TYPE":"类型",
@@ -102,7 +98,6 @@ var zh = {
     "RESET_OFFSET":"重置位点",
     "CLUSTER_NAME":"集群名",
     "OPS":"运维",
-    "PROXY":"代理",
     "AUTO_REFRESH":"自动刷新",
     "REFRESH":"刷新",
     "LOGOUT":"退出",
@@ -129,11 +124,5 @@ var zh = {
     "GROUP_PERM":"消费组权限",
     "SYNCHRONIZE":"同步",
     "SHOW":"显示",
-    "HIDE":"隐藏",
-    "MESSAGE_TYPE":"消息类型",
-    "MESSAGE_TYPE_UNSPECIFIED": "未指定,为普通消息",
-    "MESSAGE_TYPE_NORMAL": "普通消息",
-    "MESSAGE_TYPE_FIFO": "顺序消息",
-    "MESSAGE_TYPE_DELAY": "定时/延时消息",
-    "MESSAGE_TYPE_TRANSACTION": "事务消息",
+    "HIDE":"隐藏"
 }

src/main/resources/static/src/proxy.js

@@ -1,97 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-var module = app;
-module.controller('proxyController', ['$scope', '$location', '$http', 'Notification', 'remoteApi', 'tools', '$window',
-    function ($scope, $location, $http, Notification, remoteApi, tools, $window) {
-        $scope.proxyAddrList = [];
-        $scope.userRole = $window.sessionStorage.getItem("userrole");
-        $scope.writeOperationEnabled = $scope.userRole == null ? true : ($scope.userRole == 1 ? true : false);
-        $scope.inputReadonly = !$scope.writeOperationEnabled;
-        $scope.newProxyAddr = "";
-        $scope.allProxyConfig = {};
-
-        $http({
-            method: "GET",
-            url: "proxy/homePage.query"
-        }).success(function (resp) {
-            if (resp.status == 0) {
-                $scope.proxyAddrList = resp.data.proxyAddrList;
-                $scope.selectedProxy = resp.data.currentProxyAddr;
-                $scope.showProxyDetailConfig($scope.selectedProxy);
-                localStorage.setItem('proxyAddr',$scope.selectedProxy);
-            } else {
-                Notification.error({message: resp.errMsg, delay: 2000});
-            }
-        });
-
-        $scope.eleChange = function (data) {
-            $scope.proxyAddrList = data;
-        }
-        $scope.showDetailConf = function () {
-            $(".proxyModal").modal();
-        }
-
-
-        $scope.showProxyDetailConfig = function (proxyAddr) {
-            $http({
-                method: "GET",
-                url: "proxy/proxyDetailConfig.query",
-                params: {proxyAddress: proxyAddr}
-            }).success(function (resp) {
-                if (resp.status == 0) {
-                    $scope.allProxyConfig = resp.data;
-                } else {
-                    Notification.error({message: resp.errMsg, delay: 2000});
-                }
-            });
-        };
-
-        $scope.updateProxyAddr = function () {
-            $http({
-                method: "POST",
-                url: "proxy/updateProxyAddr.do",
-                params: {proxyAddr: $scope.selectedProxy}
-            }).success(function (resp) {
-                if (resp.status == 0) {
-                    localStorage.setItem('proxyAddr', $scope.selectedProxy);
-                    Notification.info({message: "SUCCESS", delay: 2000});
-                } else {
-                    Notification.error({message: resp.errMsg, delay: 2000});
-                }
-            });
-            $scope.showProxyDetailConfig($scope.selectedProxy);
-        };
-
-        $scope.addProxyAddr = function () {
-            $http({
-                method: "POST",
-                url: "proxy/addProxyAddr.do",
-                params: {newProxyAddr: $scope.newProxyAddr}
-            }).success(function (resp) {
-                if (resp.status == 0) {
-                    if ($scope.proxyAddrList.indexOf($scope.newProxyAddr) == -1) {
-                        $scope.proxyAddrList.push($scope.newProxyAddr);
-                    }
-                    $("#proxyAddr").val("");
-                    $scope.newProxyAddr = "";
-                    Notification.info({message: "SUCCESS", delay: 2000});
-                } else {
-                    Notification.error({message: resp.errMsg, delay: 2000});
-                }
-            });
-        };
-    }])

src/main/resources/static/src/topic.js

@@ -45,31 +45,24 @@ module.controller('topicController', ['$scope', 'ngDialog', '$http', 'Notificati
         }
     };
     $scope.filterNormal = true
-    $scope.filterDelay = false
-    $scope.filterFifo = false
-    $scope.filterTransaction = false
-    $scope.filterUnspecified = false
     $scope.filterRetry = false
     $scope.filterDLQ = false
     $scope.filterSystem = false
     $scope.allTopicList = [];
-    $scope.allTopicNameList = [];
-    $scope.allMessageTypeList = [];
     $scope.topicShowList = [];
     $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.refreshTopicList = function () {
         $http({
             method: "GET",
-            url: "topic/list.queryTopicType"
+            url: "topic/list.query"
         }).success(function (resp) {
             if (resp.status == 0) {
-                $scope.allTopicNameList = resp.data.topicNameList;
-                $scope.allMessageTypeList = resp.data.messageTypeList;
-                console.log($scope.allTopicNameList);
+                $scope.allTopicList = resp.data.topicList.sort();
+                console.log($scope.allTopicList);
                 console.log(JSON.stringify(resp));
-                $scope.showTopicList(1, $scope.allTopicNameList.length);
+                $scope.showTopicList(1, $scope.allTopicList.length);
 
             } else {
                 Notification.error({message: resp.errMsg, delay: 5000});
@@ -86,18 +79,6 @@ module.controller('topicController', ['$scope', 'ngDialog', '$http', 'Notificati
     $scope.$watch('filterNormal', function () {
         $scope.filterList(1);
     });
-    $scope.$watch('filterFifo', function () {
-        $scope.filterList(1);
-    });
-    $scope.$watch('filterTransaction', function () {
-        $scope.filterList(1);
-    });
-    $scope.$watch('filterUnspecified', function () {
-        $scope.filterList(1);
-    });
-    $scope.$watch('filterDelay', function () {
-        $scope.filterList(1);
-    });
     $scope.$watch('filterRetry', function () {
         $scope.filterList(1);
     });
@@ -111,13 +92,13 @@ module.controller('topicController', ['$scope', 'ngDialog', '$http', 'Notificati
         var lowExceptStr = $scope.filterStr.toLowerCase();
         var canShowList = [];
 
-        for (let i = 0; i < $scope.allTopicNameList.length; ++i) {
-            if ($scope.filterByType($scope.allTopicNameList[i], $scope.allMessageTypeList[i])) {
-                if ($scope.allTopicNameList[i].toLowerCase().indexOf(lowExceptStr) != -1) {
-                    canShowList.push($scope.allTopicNameList[i]);
+        $scope.allTopicList.forEach(function (element) {
+            if ($scope.filterByType(element)) {
+                if (element.toLowerCase().indexOf(lowExceptStr) != -1) {
+                    canShowList.push(element);
                 }
             }
-        }
+        });
         $scope.paginationConf.totalItems = canShowList.length;
         var perPage = $scope.paginationConf.itemsPerPage;
         var from = (currentPage - 1) * perPage;
@@ -125,7 +106,7 @@ module.controller('topicController', ['$scope', 'ngDialog', '$http', 'Notificati
         $scope.topicShowList = canShowList.slice(from, to);
     };
 
-    $scope.filterByType = function (str, type) {
+    $scope.filterByType = function (str) {
         if ($scope.filterRetry) {
             if (str.startsWith("%R")) {
                 return true
@@ -141,31 +122,8 @@ module.controller('topicController', ['$scope', 'ngDialog', '$http', 'Notificati
                 return true
             }
         }
-        if ($scope.isRmqVersionV5() && $scope.filterUnspecified) {
-            if (type.includes("UNSPECIFIED")) {
-                return true
-            }
-        }
         if ($scope.filterNormal) {
-            if (type.includes("NORMAL")) {
-                return true
-            }
-            if (!$scope.isRmqVersionV5() && type.includes("UNSPECIFIED")) {
-                return true
-            }
-        }
-        if ($scope.isRmqVersionV5() && $scope.filterDelay) {
-            if (type.includes("DELAY")) {
-                return true
-            }
-        }
-        if ($scope.isRmqVersionV5() && $scope.filterFifo) {
-            if (type.includes("FIFO")) {
-                return true
-            }
-        }
-        if ($scope.isRmqVersionV5() && $scope.filterTransaction) {
-            if (type.includes("TRANSACTION")) {
+            if (str.startsWith("%") == false) {
                 return true
             }
         }
@@ -180,10 +138,10 @@ module.controller('topicController', ['$scope', 'ngDialog', '$http', 'Notificati
         var perPage = $scope.paginationConf.itemsPerPage;
         var from = (currentPage - 1) * perPage;
         var to = (from + perPage) > totalItem ? totalItem : from + perPage;
-        console.log($scope.allTopicNameList);
+        console.log($scope.allTopicList);
         console.log(from)
         console.log(to)
-        $scope.topicShowList = $scope.allTopicNameList.slice(from, to);
+        $scope.topicShowList = $scope.allTopicList.slice(from, to);
         $scope.paginationConf.totalItems = totalItem;
         console.log($scope.topicShowList)
         console.log($scope.paginationConf.totalItems)
@@ -370,8 +328,8 @@ module.controller('topicController', ['$scope', 'ngDialog', '$http', 'Notificati
         var bIsUpdate = true;
         if (request == null) {
             request = [{
-                writeQueueNums: 8,
-                readQueueNums: 8,
+                writeQueueNums: 16,
+                readQueueNums: 16,
                 perm: 6,
                 order: false,
                 topicName: "",
@@ -397,7 +355,6 @@ module.controller('topicController', ['$scope', 'ngDialog', '$http', 'Notificati
                         topicRequestList: request,
                         allClusterNameList: Object.keys(resp.data.clusterInfo.clusterAddrTable),
                         allBrokerNameList: Object.keys(resp.data.brokerServer),
-                        allMessageTypeList: resp.data.messageTypes,
                         bIsUpdate: bIsUpdate,
                         writeOperationEnabled: $scope.writeOperationEnabled
                     }

src/main/resources/static/view/layout/_header.html

@@ -28,7 +28,6 @@
         <div class="navbar-collapse collapse navbar-warning-collapse">
             <ul class="nav navbar-nav">
                 <li ng-class="path =='ops' ? 'active':''"><a ng-href="#/ops">{{'OPS' | translate}}</a></li>
-                <li ng-show="rmqVersion" ng-class="path =='proxy' ? 'active':''"><a ng-href="#/proxy">{{'PROXY' | translate}}</a></li>
                 <li ng-class="path =='dashboard' || path ==''? 'active':''"><a ng-href="#/">{{'DASHBOARD' | translate}}</a></li>
                 <li ng-class="path =='cluster' ? 'active':''"><a ng-href="#/cluster">{{'CLUSTER' | translate}}</a></li>
                 <li ng-class="path =='topic' ? 'active':''"><a ng-href="#/topic">{{'TOPIC' | translate}}</a></li>
@@ -48,14 +47,6 @@
                         <li><a href="javascript:void(0)"  ng-click="changeTranslate('zh')">Simplified Chinese</a></li>
                     </ul>
                 </li>
-                <li class="dropdown">
-                    <a href="bootstrap-elements.html" data-target="#" class="dropdown-toggle" data-toggle="dropdown">{{'CHANGE_VERSION' | translate}}
-                        <b class="caret"></b></a>
-                    <ul class="dropdown-menu">
-                        <li><a href="javascript:void(0)" ng-click="changeRMQVersion(5)">RocketMQ 5.x</a></li>
-                        <li><a href="javascript:void(0)"  ng-click="changeRMQVersion(4)">RocketMQ 4.x</a></li>
-                    </ul>
-                </li>
                 <li class="dropdown" ng-show="username != ''">
                     <a href="bootstrap-elements.html" data-target="#" class="dropdown-toggle" data-toggle="dropdown">{{username}}
                         <b class="caret"></b></a>

src/main/resources/static/view/pages/cluster.html

@@ -50,14 +50,7 @@
                 <td class="text-center">{{instance.address}}</td>
                 <td class="text-center">{{instance.brokerVersionDesc}}</td>
                 <td class="text-center">{{instance.putTps.split(' ')[0]| number:2}}</td>
-                <td class="text-center">
-                    <span ng-if="!instance.getTransferedTps || !instance.getTransferedTps.trim()">
-                        {{instance.getTransferredTps.split(' ')[0] | number:2}}
-                    </span>
-                    <span ng-if="instance.getTransferedTps && instance.getTransferedTps.trim()">
-                        {{instance.getTransferedTps.split(' ')[0] | number:2}}
-                    </span>
-                </td>
+                <td class="text-center">{{instance.getTransferedTps.split(' ')[0]| number:2}}</td>
                 <td class="text-center">{{instance.msgPutTotalTodayMorning -
                     instance.msgPutTotalYesterdayMorning}}
                 </td>

src/main/resources/static/view/pages/consumer.html

@@ -26,8 +26,6 @@
                 </div>
                 <md-checkbox aria-label="Checkbox" ng-model="filterNormal" class="md-primary">{{'NORMAL' | translate}}
                 </md-checkbox>
-                <md-checkbox aria-label="Checkbox" ng-show="rmqVersion" ng-model="filterFIFO" class="md-primary">{{'FIFO' | translate}}
-                </md-checkbox>
                 <md-checkbox aria-label="Checkbox" ng-model="filterSystem" class="md-primary">{{'SYSTEM' | translate}}
                 </md-checkbox>
                 <button class="btn btn-raised btn-sm btn-primary" type="button" ng-show="{{writeOperationEnabled}}"
@@ -66,11 +64,11 @@
                         <td class="text-center">{{consumerGroup.consumeTps}}</td>
                         <td class="text-center">{{consumerGroup.diffTotal}}</td>
                         <td class="text-left">
-                            <button name="client" ng-click="client(consumerGroup.group, consumerGroup.address)"
+                            <button name="client" ng-click="client(consumerGroup.group)"
                                     class="btn btn-raised btn-sm btn-primary"
                                     type="button">{{'CLIENT' | translate}}
                             </button>
-                            <button name="client" ng-click="detail(consumerGroup.group, consumerGroup.address)"
+                            <button name="client" ng-click="detail(consumerGroup.group)"
                                     class="btn btn-raised btn-sm btn-primary"
                                     type="button">{{'CONSUME_DETAIL' | translate}}
                             </button>
@@ -276,6 +274,15 @@
                             <span class="text-danger" ng-show="addAppForm.name.$error.required">编号不能为空.</span>
                         </div>
                     </div>
+                    <!--<div class="form-group">-->
+                    <!--<label class="control-label col-sm-4">retryMaxTimes:</label>-->
+                    <!--<div class="col-sm-8">-->
+                    <!--<input class="form-control" ng-model="item.subscriptionGroupConfig.retryMaxTimes"-->
+                    <!--type="text"-->
+                    <!--required/>-->
+                    <!--<span class="text-danger" ng-show="addAppForm.name.$error.required">编号不能为空.</span>-->
+                    <!--</div>-->
+                    <!--</div>-->
                     <div class="form-group">
                         <label class="control-label col-sm-3">brokerId:</label>
                         <div class="col-sm-9">
@@ -284,132 +291,6 @@
                             <span class="text-danger" ng-show="addAppForm.name.$error.required">编号不能为空.</span>
                         </div>
                     </div>
-                    <div class="form-group">
-                        <label class="control-label col-sm-3">retryMaxTimes:</label>
-                        <div class="col-sm-9">
-                            <input class="form-control" ng-model="item.subscriptionGroupConfig.retryMaxTimes" type="text"
-                                   ng-disabled="{{!ngDialogData.writeOperationEnabled}}" required/>
-                            <span class="text-danger" ng-show="addAppForm.name.$error.required">编号不能为空.</span>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label class="control-label col-sm-3">whichBrokerWhenConsumeSlowly:</label>
-                        <div class="col-sm-9">
-                            <input class="form-control"
-                                   ng-model="item.subscriptionGroupConfig.whichBrokerWhenConsumeSlowly" type="text"
-                                   ng-disabled="{{!ngDialogData.writeOperationEnabled}}" required/>
-                            <span class="text-danger" ng-show="addAppForm.name.$error.required">编号不能为空.</span>
-                        </div>
-                    </div>
-                </form>
-                <div class="modal-footer">
-                    <div class="ngdialog-buttons">
-                        <button type="button" class="ngdialog-button ngdialog-button-primary"
-                                ng-disabled="addAppForm.$invalid"
-                                ng-show="{{ngDialogData.writeOperationEnabled}}"
-                                ng-click="postConsumerRequest(item)">{{ 'COMMIT' | translate }}
-                        </button>
-                        <button type="button" class="ngdialog-button ngdialog-button-secondary"
-                                ng-click="closeThisDialog('Cancel')">{{ 'CLOSE' | translate }}
-                        </button>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-
-    </div>
-</script>
-
-<script type="text/ng-template" id="consumerModifyDialogForV5">
-    <div>
-        <div>
-            <div class="modal-header">
-                <h4 class="modal-title">{{'SUBSCRIPTION_CHANGE'|translate}}</h4>
-            </div>
-            <div class="modal-body " ng-repeat="item in ngDialogData.consumerRequestList">
-                <form id="addAppForm1" name="addAppForm" class="form-horizontal" novalidate>
-                    <div class="form-group" ng-hide="ngDialogData.bIsUpdate">
-                        <label class="control-label col-sm-3">clusterName:</label>
-                        <div class="col-sm-9">
-                            <select name="mySelectClusterNameList" multiple chosen
-                                    ng-model="item.clusterNameList"
-                                    ng-options="clusterNameItem for clusterNameItem in ngDialogData.allClusterNameList">
-                                <option value=""></option>
-                            </select>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label class="control-label col-sm-3">brokerName:</label>
-                        <div class="col-sm-9">
-                            <select name="mySelectBrokerNameList" multiple chosen
-                                    ng-disabled="ngDialogData.bIsUpdate"
-                                    ng-model="item.brokerNameList"
-                                    ng-options="brokerNameItem for brokerNameItem in ngDialogData.allBrokerNameList">
-                                <option value=""></option>
-                            </select>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label class="control-label col-sm-3">groupName:</label>
-                        <div class="col-sm-9">
-                            <input class="form-control" ng-model="item.subscriptionGroupConfig.groupName" type="text"
-                                   ng-disabled="ngDialogData.bIsUpdate" required/>
-                            <span class="text-danger" ng-show="addAppForm.name.$error.required">编号不能为空.</span>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label class="control-label col-sm-3">consumeEnable:</label>
-                        <div class="col-sm-9">
-                            <md-switch class="md-primary" ng-disabled="{{!ngDialogData.writeOperationEnabled}}" md-no-ink
-                                       aria-label="Switch No Ink" ng-model="item.subscriptionGroupConfig.consumeEnable">
-                            </md-switch>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label class="control-label col-sm-3">consumeOrderlyEnable:</label>
-                        <div class="col-sm-9">
-                            <md-switch class="md-primary custom-md-switch" eng-disabled="{{!ngDialogData.writeOperationEnabled}}" md-no-ink
-                                       aria-label="Switch No Ink" ng-model="item.subscriptionGroupConfig.consumeMessageOrderly">
-                            </md-switch>
-                            <span style="font-size: 12px;">[Pay Attention: FIFO ConsumerGroup Need Open 'consumeOrderlyEnable' Option]</span>
-                        </div>
-
-                    </div>
-                    <div class="form-group">
-                        <label class="control-label col-sm-3">consumeBroadcastEnable:</label>
-                        <div class="col-sm-9">
-                            <md-switch class="md-primary" ng-disabled="{{!ngDialogData.writeOperationEnabled}}" md-no-ink
-                                       aria-label="Switch No Ink"
-                                       ng-model="item.subscriptionGroupConfig.consumeBroadcastEnable">
-                            </md-switch>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label class="control-label col-sm-3">retryQueueNums:</label>
-                        <div class="col-sm-9">
-                            <input class="form-control" ng-model="item.subscriptionGroupConfig.retryQueueNums"
-                                   type="text" ng-disabled="{{!ngDialogData.writeOperationEnabled}}"
-                                   required/>
-                            <span class="text-danger" ng-show="addAppForm.name.$error.required">编号不能为空.</span>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label class="control-label col-sm-3">brokerId:</label>
-                        <div class="col-sm-9">
-                            <input class="form-control" ng-model="item.subscriptionGroupConfig.brokerId" type="text"
-                                   ng-disabled="{{!ngDialogData.writeOperationEnabled}}" required/>
-                            <span class="text-danger" ng-show="addAppForm.name.$error.required">编号不能为空.</span>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label class="control-label col-sm-3">retryMaxTimes:</label>
-                        <div class="col-sm-9">
-                            <input class="form-control" ng-model="item.subscriptionGroupConfig.retryMaxTimes" type="text"
-                                   ng-disabled="{{!ngDialogData.writeOperationEnabled}}" required/>
-                            <span class="text-danger" ng-show="addAppForm.name.$error.required">编号不能为空.</span>
-                        </div>
-                    </div>
                     <div class="form-group">
                         <label class="control-label col-sm-3">whichBrokerWhenConsumeSlowly:</label>
                         <div class="col-sm-9">

src/main/resources/static/view/pages/proxy.html

@@ -1,67 +0,0 @@
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one or more
-  ~ contributor license agreements.  See the NOTICE file distributed with
-  ~ this work for additional information regarding copyright ownership.
-  ~ The ASF licenses this file to You under the Apache License, Version 2.0
-  ~ (the "License"); you may not use this file except in compliance with
-  ~ the License.  You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-<div class="container-fluid" id="deployHistoryList">
-    <div class="page-content">
-        <h2 class="md-title">ProxyServerAddressList</h2>
-        <div class="pull-left" style="min-width: 400px; max-width: 500px; padding: 10px 10px 10px 0">
-            <select ng-model="selectedProxy" chosen
-                    ng-options="x for x in proxyAddrList"
-                    ng-change="updateProxyAddr()"
-                    required></select>
-        </div>
-        <div class="pull-left">
-            <button class="btn btn-raised btn-sm btn-primary" type="button" ng-show="{{writeOperationEnabled}}"
-                    ng-click="updateProxyAddr()">{{'UPDATE' | translate}}
-            </button>
-        </div>
-        <form class="form-inline pull-left" style="margin-left: 20px" ng-show="{{writeOperationEnabled}}">
-            <div class="form-group" style="margin: 0">
-                <label for="proxyAddr">ProxyAddr:</label>
-                <input id="proxyAddr" class="form-control" style="width: 300px; margin: 0 10px 0 10px" type="text" ng-model="newProxyAddr" required/>
-                <button class="btn btn-raised btn-sm btn-primary" type="button"
-                        ng-click="addProxyAddr()"> {{ 'ADD' | translate}}
-                </button>
-            </div>
-        </form>
-    </div>
-</div>
-
-<div class="modal proxyModal fade" role="dialog" tabindex="-1" aria-hidden="true" aria-labelledby="config-modal-label">
-    <div class="modal-dialog modal-lg">
-        <div class="modal-content" >
-            <div class="modal-header">
-                <button class="close" type="button" data-dismiss="modal">&times;</button>
-                <h4 id="config-modal-label" class="modal-title">
-                    [{{selectedProxy}}]
-                </h4>
-            </div>
-            <div class="modal-body limit_height">
-                <table class="table table-bordered">
-                    <tr ng-repeat="(key, value) in allProxyConfig">
-                        <td>{{key}}</td>
-                        <td>{{value}}</td>
-                    </tr>
-                </table>
-            </div>
-            <div class="modal-footer">
-                <div class="col-md-12 text-center">
-                    <button type="button" class="btn btn-raised" data-dismiss="modal">{{ 'CLOSE' | translate }}</button>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>

src/main/resources/static/view/pages/topic.html

@@ -24,14 +24,6 @@
                 </div>
                 <md-checkbox aria-label="Checkbox" ng-model="filterNormal" class="md-primary">{{'NORMAL' | translate}}
                 </md-checkbox>
-                <md-checkbox aria-label="Checkbox" ng-model="filterDelay" class="md-primary" ng-show="rmqVersion">{{'DELAY' | translate}}
-                </md-checkbox>
-                <md-checkbox aria-label="Checkbox" ng-model="filterFifo" class="md-primary" ng-show="rmqVersion">{{'FIFO' | translate}}
-                </md-checkbox>
-                <md-checkbox aria-label="Checkbox" ng-model="filterTransaction" class="md-primary" ng-show="rmqVersion">{{'TRANSACTION' | translate}}
-                </md-checkbox>
-                <md-checkbox aria-label="Checkbox" ng-model="filterUnspecified" class="md-primary" ng-show="rmqVersion">{{'UNSPECIFIED' | translate}}
-                </md-checkbox>
                 <md-checkbox aria-label="Checkbox" ng-model="filterRetry" class="md-primary">{{'RETRY' | translate}}
                 </md-checkbox>
                 <md-checkbox aria-label="Checkbox" ng-model="filterDLQ" class="md-primary">{{'DLQ' | translate}}
@@ -71,7 +63,6 @@
                             <button class="btn btn-raised btn-sm btn-primary" type="button"
                                     ng-click="openUpdateDialog(topic, sysFlag)">topic {{'CONFIG' |translate}}
                             </button>
-<!--                            todo 发送消息，根据消息类型判断-->
                             <button class="btn btn-raised btn-sm btn-primary" type="button"
                                     ng-show="{{!sysFlag}}"
                                     ng-click="openSendTopicMessageDialog(topic)">{{'SEND_MSG' | translate}}
@@ -198,18 +189,6 @@
                     <span class="text-danger" ng-show="addAppForm.topicName.$error.required">{{'TOPIC_NAME'|translate}}不能为空.</span>
                 </div>
             </div>
-            <!--            设置topic 类型 -->
-            <div class="form-group">
-                <label class="control-label col-sm-2">{{'MESSAGE_TYPE'|translate}}:</label>
-                <div class="col-sm-10">
-                    <select name="mySelectMessageType" chosen ng-disabled="ngDialogData.bIsUpdate"
-                            ng-model="item.messageType"
-                            ng-options="messageType as value | translate  disable when messageType=='UNSPECIFIED' for (messageType , value) in ngDialogData.allMessageTypeList"
-                    >
-                        <option value=""></option>
-                    </select>
-                </div>
-            </div>
             <div class="form-group">
                 <label class="control-label col-sm-2">{{'WRITE_QUEUE_NUMS'|translate}}:</label>
                 <div class="col-sm-10">

src/test/java/org/apache/rocketmq/dashboard/admin/MQAdminExtImplTest.java

@@ -34,27 +34,27 @@ import org.apache.rocketmq.client.impl.MQClientAPIImpl;
 import org.apache.rocketmq.client.impl.factory.MQClientInstance;
 import org.apache.rocketmq.common.PlainAccessConfig;
 import org.apache.rocketmq.common.TopicConfig;
-import org.apache.rocketmq.remoting.protocol.admin.ConsumeStats;
-import org.apache.rocketmq.remoting.protocol.admin.RollbackStats;
-import org.apache.rocketmq.remoting.protocol.admin.TopicStatsTable;
+import org.apache.rocketmq.common.admin.ConsumeStats;
+import org.apache.rocketmq.common.admin.RollbackStats;
+import org.apache.rocketmq.common.admin.TopicStatsTable;
 import org.apache.rocketmq.common.message.MessageExt;
 import org.apache.rocketmq.common.message.MessageQueue;
-import org.apache.rocketmq.remoting.protocol.ResponseCode;
-import org.apache.rocketmq.remoting.protocol.body.BrokerStatsData;
-import org.apache.rocketmq.remoting.protocol.body.ClusterInfo;
-import org.apache.rocketmq.remoting.protocol.body.ConsumeMessageDirectlyResult;
-import org.apache.rocketmq.remoting.protocol.body.ConsumeStatsList;
-import org.apache.rocketmq.remoting.protocol.body.ConsumerConnection;
-import org.apache.rocketmq.remoting.protocol.body.ConsumerRunningInfo;
-import org.apache.rocketmq.remoting.protocol.body.GroupList;
-import org.apache.rocketmq.remoting.protocol.body.KVTable;
-import org.apache.rocketmq.remoting.protocol.body.ProducerConnection;
-import org.apache.rocketmq.remoting.protocol.body.QueueTimeSpan;
-import org.apache.rocketmq.remoting.protocol.body.SubscriptionGroupWrapper;
-import org.apache.rocketmq.remoting.protocol.body.TopicConfigSerializeWrapper;
-import org.apache.rocketmq.remoting.protocol.body.TopicList;
-import org.apache.rocketmq.remoting.protocol.route.TopicRouteData;
-import org.apache.rocketmq.remoting.protocol.subscription.SubscriptionGroupConfig;
+import org.apache.rocketmq.common.protocol.ResponseCode;
+import org.apache.rocketmq.common.protocol.body.BrokerStatsData;
+import org.apache.rocketmq.common.protocol.body.ClusterInfo;
+import org.apache.rocketmq.common.protocol.body.ConsumeMessageDirectlyResult;
+import org.apache.rocketmq.common.protocol.body.ConsumeStatsList;
+import org.apache.rocketmq.common.protocol.body.ConsumerConnection;
+import org.apache.rocketmq.common.protocol.body.ConsumerRunningInfo;
+import org.apache.rocketmq.common.protocol.body.GroupList;
+import org.apache.rocketmq.common.protocol.body.KVTable;
+import org.apache.rocketmq.common.protocol.body.ProducerConnection;
+import org.apache.rocketmq.common.protocol.body.QueueTimeSpan;
+import org.apache.rocketmq.common.protocol.body.SubscriptionGroupWrapper;
+import org.apache.rocketmq.common.protocol.body.TopicConfigSerializeWrapper;
+import org.apache.rocketmq.common.protocol.body.TopicList;
+import org.apache.rocketmq.common.protocol.route.TopicRouteData;
+import org.apache.rocketmq.common.subscription.SubscriptionGroupConfig;
 import org.apache.rocketmq.dashboard.service.client.MQAdminExtImpl;
 import org.apache.rocketmq.dashboard.service.client.MQAdminInstance;
 import org.apache.rocketmq.dashboard.util.MockObjectUtil;
@@ -82,14 +82,10 @@ import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyBoolean;
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.ArgumentMatchers.anyLong;
-import static org.mockito.ArgumentMatchers.anyMap;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-import static org.mockito.ArgumentMatchers.eq;
 
 @RunWith(MockitoJUnitRunner.Silent.class)
 public class MQAdminExtImplTest {
@@ -198,55 +194,62 @@ public class MQAdminExtImplTest {
     @Test
     public void testExamineSubscriptionGroupConfig() throws Exception {
         assertNotNull(mqAdminExtImpl);
-        
-        // Create valid SubscriptionGroupWrapper with group_test entry
-        SubscriptionGroupWrapper wrapper = new SubscriptionGroupWrapper();
-        ConcurrentMap<String, SubscriptionGroupConfig> subscriptionGroupTable = new ConcurrentHashMap<>();
-        SubscriptionGroupConfig config = new SubscriptionGroupConfig();
-        config.setGroupName("group_test");
-        subscriptionGroupTable.put("group_test", config);
-        wrapper.setSubscriptionGroupTable(subscriptionGroupTable);
-        
-        // Create successful response
-        RemotingCommand successResponse = RemotingCommand.createResponseCommand(null);
-        successResponse.setCode(ResponseCode.SUCCESS);
-        successResponse.setBody(RemotingSerializable.encode(wrapper));
-        
-        // Mock the remote invocation
-        when(remotingClient.invokeSync(eq(brokerAddr), any(RemotingCommand.class), anyLong()))
-            .thenReturn(successResponse);
-        
-        // Test successful case
+        {
+            RemotingCommand response1 = RemotingCommand.createResponseCommand(null);
+            RemotingCommand response2 = RemotingCommand.createResponseCommand(null);
+            response2.setCode(ResponseCode.SUCCESS);
+            response2.setBody(RemotingSerializable.encode(MockObjectUtil.createSubscriptionGroupWrapper()));
+            when(remotingClient.invokeSync(anyString(), any(), anyLong()))
+                .thenThrow(new RuntimeException("invokeSync exception"))
+                .thenReturn(response1).thenReturn(response2);
+        }
+        // invokeSync exception
+        try {
+            mqAdminExtImpl.examineSubscriptionGroupConfig(brokerAddr, "topic_test");
+        } catch (Exception e) {
+            Assert.assertEquals(e.getMessage(), "invokeSync exception");
+        }
+
+        // responseCode is not success
+        try {
+            mqAdminExtImpl.examineSubscriptionGroupConfig(brokerAddr, "group_test");
+        } catch (Exception e) {
+            assertThat(e.getCause()).isInstanceOf(MQBrokerException.class);
+            assertThat(((MQBrokerException) e.getCause()).getResponseCode()).isEqualTo(1);
+        }
+        // GET_ALL_SUBSCRIPTIONGROUP_CONFIG success
         SubscriptionGroupConfig subscriptionGroupConfig = mqAdminExtImpl.examineSubscriptionGroupConfig(brokerAddr, "group_test");
-        Assert.assertNotNull(subscriptionGroupConfig);
-        Assert.assertEquals("group_test", subscriptionGroupConfig.getGroupName());
+        Assert.assertEquals(subscriptionGroupConfig.getGroupName(), "group_test");
     }
 
     @Test
     public void testExamineTopicConfig() throws Exception {
         assertNotNull(mqAdminExtImpl);
-        
-        // Create valid TopicConfigSerializeWrapper with topic_test entry
-        TopicConfigSerializeWrapper wrapper = new TopicConfigSerializeWrapper();
-        ConcurrentMap<String, TopicConfig> topicConfigTable = new ConcurrentHashMap<>();
-        TopicConfig config = new TopicConfig();
-        config.setTopicName("topic_test");
-        topicConfigTable.put("topic_test", config);
-        wrapper.setTopicConfigTable(topicConfigTable);
-        
-        // Create successful response
-        RemotingCommand successResponse = RemotingCommand.createResponseCommand(null);
-        successResponse.setCode(ResponseCode.SUCCESS);
-        successResponse.setBody(RemotingSerializable.encode(wrapper));
-        
-        // Mock the remote invocation
-        when(remotingClient.invokeSync(eq(brokerAddr), any(RemotingCommand.class), anyLong()))
-            .thenReturn(successResponse);
-        
-        // Test successful case
+        {
+            RemotingCommand response1 = RemotingCommand.createResponseCommand(null);
+            RemotingCommand response2 = RemotingCommand.createResponseCommand(null);
+            response2.setCode(ResponseCode.SUCCESS);
+            response2.setBody(RemotingSerializable.encode(MockObjectUtil.createTopicConfigWrapper()));
+            when(remotingClient.invokeSync(anyString(), any(), anyLong()))
+                .thenThrow(new RuntimeException("invokeSync exception"))
+                .thenReturn(response1).thenReturn(response2);
+        }
+        // invokeSync exception
+        try {
+            mqAdminExtImpl.examineTopicConfig(brokerAddr, "topic_test");
+        } catch (Exception e) {
+            Assert.assertEquals(e.getMessage(), "invokeSync exception");
+        }
+        // responseCode is not success
+        try {
+            mqAdminExtImpl.examineTopicConfig(brokerAddr, "topic_test");
+        } catch (Exception e) {
+            assertThat(e.getCause()).isInstanceOf(MQBrokerException.class);
+            assertThat(((MQBrokerException) e.getCause()).getResponseCode()).isEqualTo(1);
+        }
+        // GET_ALL_TOPIC_CONFIG success
         TopicConfig topicConfig = mqAdminExtImpl.examineTopicConfig(brokerAddr, "topic_test");
-        Assert.assertNotNull(topicConfig);
-        Assert.assertEquals("topic_test", topicConfig.getTopicName());
+        Assert.assertEquals(topicConfig.getTopicName(), "topic_test");
     }
 
     @Test
@@ -567,13 +570,11 @@ public class MQAdminExtImplTest {
     public void testCreateTopic() throws Exception {
         assertNotNull(mqAdminExtImpl);
         {
-            doNothing().when(defaultMQAdminExt).createTopic(anyString(), anyString(), anyInt(), anyMap());
-            doNothing().when(defaultMQAdminExt).createTopic(anyString(), anyString(), anyInt(), anyInt(), anyMap());
+            doNothing().when(defaultMQAdminExt).createTopic(anyString(), anyString(), anyInt());
+            doNothing().when(defaultMQAdminExt).createTopic(anyString(), anyString(), anyInt(), anyInt());
         }
-        Map<String, String> map = new HashMap<>();
-        map.put("message.type", "FIFO");
-        mqAdminExtImpl.createTopic("key", "topic_test", 8, map);
-        mqAdminExtImpl.createTopic("key", "topic_test", 8, 1, map);
+        mqAdminExtImpl.createTopic("key", "topic_test", 8);
+        mqAdminExtImpl.createTopic("key", "topic_test", 8, 1);
     }
 
     @Test

src/test/java/org/apache/rocketmq/dashboard/admin/MQAdminPoolTest.java

@@ -18,7 +18,7 @@ package org.apache.rocketmq.dashboard.admin;
 
 import org.apache.commons.pool2.PooledObject;
 import org.apache.commons.pool2.impl.GenericObjectPool;
-import org.apache.rocketmq.remoting.protocol.body.ClusterInfo;
+import org.apache.rocketmq.common.protocol.body.ClusterInfo;
 import org.apache.rocketmq.dashboard.config.RMQConfigure;
 import org.apache.rocketmq.dashboard.util.MockObjectUtil;
 import org.apache.rocketmq.tools.admin.MQAdminExt;

src/test/java/org/apache/rocketmq/dashboard/controller/AclControllerTest.java

@@ -21,7 +21,7 @@ import com.google.common.collect.Lists;
 import java.util.List;
 import org.apache.rocketmq.common.AclConfig;
 import org.apache.rocketmq.common.PlainAccessConfig;
-import org.apache.rocketmq.remoting.protocol.body.ClusterInfo;
+import org.apache.rocketmq.common.protocol.body.ClusterInfo;
 import org.apache.rocketmq.dashboard.model.request.AclRequest;
 import org.apache.rocketmq.dashboard.service.impl.AclServiceImpl;
 import org.apache.rocketmq.dashboard.util.MockObjectUtil;

src/test/java/org/apache/rocketmq/dashboard/controller/ClusterControllerTest.java

@@ -18,8 +18,8 @@ package org.apache.rocketmq.dashboard.controller;
 
 import java.util.HashMap;
 import java.util.Properties;
-import org.apache.rocketmq.remoting.protocol.body.ClusterInfo;
-import org.apache.rocketmq.remoting.protocol.body.KVTable;
+import org.apache.rocketmq.common.protocol.body.ClusterInfo;
+import org.apache.rocketmq.common.protocol.body.KVTable;
 import org.apache.rocketmq.dashboard.service.impl.ClusterServiceImpl;
 import org.apache.rocketmq.dashboard.util.MockObjectUtil;
 import org.junit.Test;

src/test/java/org/apache/rocketmq/dashboard/controller/ConsumerControllerTest.java

@@ -19,31 +19,26 @@ package org.apache.rocketmq.dashboard.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.google.common.collect.Lists;
-import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import org.apache.rocketmq.client.exception.MQClientException;
-import org.apache.rocketmq.remoting.protocol.admin.ConsumeStats;
-import org.apache.rocketmq.remoting.protocol.admin.RollbackStats;
+import org.apache.rocketmq.common.admin.ConsumeStats;
+import org.apache.rocketmq.common.admin.RollbackStats;
 import org.apache.rocketmq.common.message.MessageQueue;
-import org.apache.rocketmq.remoting.protocol.ResponseCode;
-import org.apache.rocketmq.remoting.protocol.body.ClusterInfo;
-import org.apache.rocketmq.remoting.protocol.body.ConsumerConnection;
-import org.apache.rocketmq.remoting.protocol.body.ConsumerRunningInfo;
-import org.apache.rocketmq.remoting.protocol.body.SubscriptionGroupWrapper;
-import org.apache.rocketmq.remoting.protocol.heartbeat.ConsumeType;
-import org.apache.rocketmq.remoting.protocol.heartbeat.MessageModel;
-import org.apache.rocketmq.remoting.protocol.subscription.SubscriptionGroupConfig;
+import org.apache.rocketmq.common.protocol.ResponseCode;
+import org.apache.rocketmq.common.protocol.body.ClusterInfo;
+import org.apache.rocketmq.common.protocol.body.ConsumerConnection;
+import org.apache.rocketmq.common.protocol.body.ConsumerRunningInfo;
+import org.apache.rocketmq.common.protocol.body.SubscriptionGroupWrapper;
+import org.apache.rocketmq.common.protocol.heartbeat.ConsumeType;
+import org.apache.rocketmq.common.protocol.heartbeat.MessageModel;
+import org.apache.rocketmq.common.subscription.SubscriptionGroupConfig;
 import org.apache.rocketmq.dashboard.model.request.ConsumerConfigInfo;
 import org.apache.rocketmq.dashboard.model.request.DeleteSubGroupRequest;
 import org.apache.rocketmq.dashboard.model.request.ResetOffsetRequest;
 import org.apache.rocketmq.dashboard.service.impl.ConsumerServiceImpl;
 import org.apache.rocketmq.dashboard.util.MockObjectUtil;
-import org.apache.rocketmq.dashboard.model.TopicConsumerInfo;
-import org.apache.rocketmq.dashboard.model.QueueStatInfo;
-import org.apache.rocketmq.remoting.protocol.body.Connection;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.InjectMocks;
@@ -58,7 +53,6 @@ import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.isNull;
 import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.when;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
@@ -235,70 +229,24 @@ public class ConsumerControllerTest extends BaseControllerTest {
 
     @Test
     public void testQueryConsumerByTopic() throws Exception {
-        // Prepare test data
-        List<TopicConsumerInfo> topicConsumerInfoList = new ArrayList<>();
-        TopicConsumerInfo info = new TopicConsumerInfo("test-topic");
-        
-        // Add queue stats
-        List<QueueStatInfo> queueStatInfoList = new ArrayList<>();
-        QueueStatInfo queueStat1 = new QueueStatInfo();
-        queueStat1.setBrokerName("broker-0");
-        queueStat1.setQueueId(0);
-        info.appendQueueStatInfo(queueStat1);
-        
-        QueueStatInfo queueStat2 = new QueueStatInfo();
-        queueStat2.setBrokerName("broker-1");
-        queueStat2.setQueueId(1);
-        info.appendQueueStatInfo(queueStat2);
-        
-        topicConsumerInfoList.add(info);
-        
-        // Mock the service method directly
-        doReturn(topicConsumerInfoList).when(consumerService).queryConsumeStatsListByGroupName(anyString(), any());
-        
-        // Perform request and verify response
         final String url = "/consumer/queryTopicByConsumer.query";
         requestBuilder = MockMvcRequestBuilders.get(url);
         requestBuilder.param("consumerGroup", "group_test");
-        
         perform = mockMvc.perform(requestBuilder);
         perform.andExpect(status().isOk())
-               .andExpect(jsonPath("$.status").value(0))
-               .andExpect(jsonPath("$.data[0].topic").value("test-topic"))
-               .andExpect(jsonPath("$.data[0].queueStatInfoList", hasSize(2)))
-               .andExpect(jsonPath("$.data[0].queueStatInfoList[0].brokerName").value("broker-0"))
-               .andExpect(jsonPath("$.data[0].queueStatInfoList[1].brokerName").value("broker-1"));
+            .andExpect(jsonPath("$.data", hasSize(1)))
+            .andExpect(jsonPath("$.data[0].queueStatInfoList", hasSize(2)));
     }
 
     @Test
     public void testConsumerConnection() throws Exception {
-        // Prepare test data
-        ConsumerConnection connection = new ConsumerConnection();
-        connection.setConsumeType(ConsumeType.CONSUME_ACTIVELY);
-        connection.setMessageModel(MessageModel.CLUSTERING);
-        
-        // Setup connection set
-        HashSet<Connection> connections = new HashSet<>();
-        Connection conn = new Connection();
-        conn.setClientAddr("127.0.0.1");
-        conn.setClientId("clientId");
-        connections.add(conn);
-        connection.setConnectionSet(connections);
-        
-        // Mock the service method
-        doReturn(connection).when(consumerService).getConsumerConnection(anyString(), any());
-        
-        // Perform request and verify response
         final String url = "/consumer/consumerConnection.query";
         requestBuilder = MockMvcRequestBuilders.get(url);
         requestBuilder.param("consumerGroup", "group_test");
-        
         perform = mockMvc.perform(requestBuilder);
         perform.andExpect(status().isOk())
-               .andExpect(jsonPath("$.status").value(0))
-               .andExpect(jsonPath("$.data.consumeType").value("CONSUME_ACTIVELY"))
-               .andExpect(jsonPath("$.data.messageModel").value("CLUSTERING"))
-               .andExpect(jsonPath("$.data.connectionSet[0].clientAddr").value("127.0.0.1"));
+            .andExpect(jsonPath("$.data.consumeType").value(ConsumeType.CONSUME_ACTIVELY.name()))
+            .andExpect(jsonPath("$.data.messageModel").value(MessageModel.CLUSTERING.name()));
     }
 
     @Test

src/test/java/org/apache/rocketmq/dashboard/controller/DlqMessageControllerTest.java

@@ -21,10 +21,10 @@ import com.google.common.collect.Lists;
 import java.util.List;
 import org.apache.rocketmq.client.exception.MQClientException;
 import org.apache.rocketmq.common.MixAll;
-import org.apache.rocketmq.remoting.protocol.ResponseCode;
-import org.apache.rocketmq.remoting.protocol.body.CMResult;
-import org.apache.rocketmq.remoting.protocol.body.ConsumeMessageDirectlyResult;
-import org.apache.rocketmq.remoting.protocol.route.TopicRouteData;
+import org.apache.rocketmq.common.protocol.ResponseCode;
+import org.apache.rocketmq.common.protocol.body.CMResult;
+import org.apache.rocketmq.common.protocol.body.ConsumeMessageDirectlyResult;
+import org.apache.rocketmq.common.protocol.route.TopicRouteData;
 import org.apache.rocketmq.dashboard.model.DlqMessageRequest;
 import org.apache.rocketmq.dashboard.model.MessagePage;
 import org.apache.rocketmq.dashboard.model.MessageView;

src/test/java/org/apache/rocketmq/dashboard/controller/MessageControllerTest.java

@@ -32,9 +32,9 @@ import org.apache.rocketmq.client.exception.MQClientException;
 import org.apache.rocketmq.common.message.MessageClientIDSetter;
 import org.apache.rocketmq.common.message.MessageExt;
 import org.apache.rocketmq.common.message.MessageQueue;
-import org.apache.rocketmq.remoting.protocol.body.CMResult;
-import org.apache.rocketmq.remoting.protocol.body.ConsumeMessageDirectlyResult;
-import org.apache.rocketmq.remoting.protocol.body.ConsumerConnection;
+import org.apache.rocketmq.common.protocol.body.CMResult;
+import org.apache.rocketmq.common.protocol.body.ConsumeMessageDirectlyResult;
+import org.apache.rocketmq.common.protocol.body.ConsumerConnection;
 import org.apache.rocketmq.dashboard.model.QueueOffsetInfo;
 import org.apache.rocketmq.dashboard.model.request.MessageQuery;
 import org.apache.rocketmq.dashboard.service.impl.MessageServiceImpl;
@@ -90,31 +90,6 @@ public class MessageControllerTest extends BaseControllerTest {
             when(pullResult.getPullStatus()).thenReturn(PullStatus.FOUND);
             when(pullResult.getMsgFoundList()).thenReturn(wrappers);
             when(messageService.buildDefaultMQPullConsumer(any(), anyBoolean())).thenReturn(defaultMQPullConsumer);
-            
-            // Ensure searchOffset returns values that make sense for the test times
-            when(defaultMQPullConsumer.searchOffset(any(MessageQueue.class), anyLong())).thenAnswer(invocation -> {
-                long timestamp = invocation.getArgument(1);
-                if (timestamp <= System.currentTimeMillis()) {
-                    return 0L; // Beginning offset for timestamps in the past
-                } else {
-                    return Long.MAX_VALUE - 10L; // Near max offset for future timestamps
-                }
-            });
-            
-            // Make sure that messageService.queryMessageByTopicAndKey returns some messages for the test
-            MessageExt messageExt = MockObjectUtil.createMessageExt();
-            List<MessageExt> foundMessages = new ArrayList<>();
-            foundMessages.add(messageExt);
-            
-            // Ensure the PullResult always returns a message
-            PullResult pullResultWithMessages = mock(PullResult.class);
-            when(pullResultWithMessages.getPullStatus()).thenReturn(PullStatus.FOUND);
-            when(pullResultWithMessages.getMsgFoundList()).thenReturn(foundMessages);
-            when(pullResultWithMessages.getNextBeginOffset()).thenReturn(1L);
-            
-            // Override the previous mock to ensure the test finds messages
-            when(defaultMQPullConsumer.pull(any(MessageQueue.class), anyString(), anyLong(), anyInt()))
-                .thenReturn(pullResultWithMessages);
         }
     }
 
@@ -174,7 +149,8 @@ public class MessageControllerTest extends BaseControllerTest {
         requestBuilder.content(JSON.toJSONString(query));
         perform = mockMvc.perform(requestBuilder);
         perform.andExpect(status().isOk())
-            .andExpect(jsonPath("$.data.page.content", hasSize(0)));
+            .andExpect(jsonPath("$.data.page.content", hasSize(1)))
+            .andExpect(jsonPath("$.data.page.content[0].msgId").value("0A9A003F00002A9F0000000000000319"));
 
         String taskId = MessageClientIDSetter.createUniqID();
         {
@@ -194,7 +170,6 @@ public class MessageControllerTest extends BaseControllerTest {
 
         // hit cache
         query.setTaskId(taskId);
-        query.setPageNum(1);
         requestBuilder.content(JSON.toJSONString(query));
         perform = mockMvc.perform(requestBuilder);
         perform.andExpect(status().isOk())

src/test/java/org/apache/rocketmq/dashboard/controller/ProducerControllerTest.java

@@ -19,8 +19,8 @@ package org.apache.rocketmq.dashboard.controller;
 
 import java.util.HashSet;
 import org.apache.rocketmq.client.exception.MQClientException;
-import org.apache.rocketmq.remoting.protocol.body.Connection;
-import org.apache.rocketmq.remoting.protocol.body.ProducerConnection;
+import org.apache.rocketmq.common.protocol.body.Connection;
+import org.apache.rocketmq.common.protocol.body.ProducerConnection;
 import org.apache.rocketmq.dashboard.interceptor.AuthInterceptor;
 import org.apache.rocketmq.dashboard.service.impl.LoginServiceImpl;
 import org.apache.rocketmq.dashboard.service.impl.ProducerServiceImpl;

src/test/java/org/apache/rocketmq/dashboard/controller/TopicControllerTest.java

@@ -19,7 +19,6 @@ package org.apache.rocketmq.dashboard.controller;
 import com.alibaba.fastjson.JSON;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
-import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -30,19 +29,18 @@ import org.apache.rocketmq.client.producer.DefaultMQProducer;
 import org.apache.rocketmq.client.producer.SendResult;
 import org.apache.rocketmq.client.producer.SendStatus;
 import org.apache.rocketmq.common.TopicConfig;
-import org.apache.rocketmq.remoting.protocol.admin.ConsumeStats;
-import org.apache.rocketmq.remoting.protocol.admin.TopicStatsTable;
+import org.apache.rocketmq.common.admin.ConsumeStats;
+import org.apache.rocketmq.common.admin.TopicStatsTable;
 import org.apache.rocketmq.common.message.Message;
 import org.apache.rocketmq.common.message.MessageQueue;
-import org.apache.rocketmq.remoting.protocol.body.ClusterInfo;
-import org.apache.rocketmq.remoting.protocol.body.ConsumerConnection;
-import org.apache.rocketmq.remoting.protocol.body.ConsumerRunningInfo;
-import org.apache.rocketmq.remoting.protocol.body.GroupList;
-import org.apache.rocketmq.remoting.protocol.body.TopicList;
-import org.apache.rocketmq.remoting.protocol.route.TopicRouteData;
+import org.apache.rocketmq.common.protocol.body.ClusterInfo;
+import org.apache.rocketmq.common.protocol.body.ConsumerConnection;
+import org.apache.rocketmq.common.protocol.body.ConsumerRunningInfo;
+import org.apache.rocketmq.common.protocol.body.GroupList;
+import org.apache.rocketmq.common.protocol.body.TopicList;
+import org.apache.rocketmq.common.protocol.route.TopicRouteData;
 import org.apache.rocketmq.dashboard.model.request.SendTopicMessageRequest;
 import org.apache.rocketmq.dashboard.model.request.TopicConfigInfo;
-import org.apache.rocketmq.dashboard.model.request.TopicTypeList;
 import org.apache.rocketmq.dashboard.service.impl.ConsumerServiceImpl;
 import org.apache.rocketmq.dashboard.service.impl.TopicServiceImpl;
 import org.apache.rocketmq.dashboard.util.MockObjectUtil;
@@ -55,9 +53,8 @@ import org.mockito.Spy;
 import org.springframework.http.MediaType;
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
 
-import static org.hamcrest.Matchers.containsInAnyOrder;
-import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.hasSize;
+import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyBoolean;
 import static org.mockito.ArgumentMatchers.anyLong;
@@ -275,8 +272,9 @@ public class TopicControllerTest extends BaseControllerTest {
         requestBuilder.content(JSON.toJSONString(request));
         perform = mockMvc.perform(requestBuilder);
         perform.andExpect(status().isOk())
-            .andExpect(jsonPath("$.status").value(-1))
-            .andExpect(jsonPath("$.errMsg").value(containsString("NullPointerException")));
+            .andExpect(jsonPath("$.data.sendStatus").value(SendStatus.SEND_OK.name()))
+            .andExpect(jsonPath("$.data.msgId").value("7F000001E41A2E5D6D978B82C20F003D"));
+
     }
 
     @Test
@@ -319,45 +317,6 @@ public class TopicControllerTest extends BaseControllerTest {
             .andExpect(jsonPath("$.data").value(true));
     }
 
-    @Test
-    public void testListTopicType() throws Exception {
-        // Build test environment
-        // Set up scope at beginning with '{' and '}' to match the class pattern
-        {
-            // Create mock TopicTypeList to be returned by service
-            ArrayList<String> topicNames = new ArrayList<>();
-            topicNames.add("topic1");
-            topicNames.add("topic2");
-            topicNames.add("%SYS%topic3");
-            
-            ArrayList<String> messageTypes = new ArrayList<>();
-            messageTypes.add("NORMAL");
-            messageTypes.add("FIFO");
-            messageTypes.add("SYSTEM");
-            
-            TopicTypeList topicTypeList = new TopicTypeList(topicNames, messageTypes);
-            
-            // Mock service method
-            doReturn(topicTypeList).when(topicService).examineAllTopicType();
-        }
-        
-        // Execute request
-        final String url = "/topic/list.queryTopicType";
-        requestBuilder = MockMvcRequestBuilders.get(url);
-        perform = mockMvc.perform(requestBuilder);
-        
-        // Verify response
-        performOkExpect(perform)
-            .andExpect(jsonPath("$.data.topicNameList", hasSize(3)))
-            .andExpect(jsonPath("$.data.topicNameList[0]").value("topic1"))
-            .andExpect(jsonPath("$.data.topicNameList[1]").value("topic2"))
-            .andExpect(jsonPath("$.data.topicNameList[2]").value("%SYS%topic3"))
-            .andExpect(jsonPath("$.data.messageTypeList", hasSize(3)))
-            .andExpect(jsonPath("$.data.messageTypeList[0]").value("NORMAL"))
-            .andExpect(jsonPath("$.data.messageTypeList[1]").value("FIFO"))
-            .andExpect(jsonPath("$.data.messageTypeList[2]").value("SYSTEM"));
-    }
-
     @Override protected Object getTestController() {
         return topicController;
     }

src/test/java/org/apache/rocketmq/dashboard/service/impl/MessageServiceImplTest.java

@@ -1,480 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.rocketmq.dashboard.service.impl;
-
-import com.google.common.cache.Cache;
-import org.apache.rocketmq.acl.common.AclClientRPCHook;
-import org.apache.rocketmq.client.consumer.DefaultMQPullConsumer;
-import org.apache.rocketmq.client.consumer.PullResult;
-import org.apache.rocketmq.client.consumer.PullStatus;
-import org.apache.rocketmq.client.exception.MQClientException;
-import org.apache.rocketmq.common.Pair;
-import org.apache.rocketmq.common.message.MessageClientIDSetter;
-import org.apache.rocketmq.common.message.MessageExt;
-import org.apache.rocketmq.common.message.MessageQueue;
-import org.apache.rocketmq.dashboard.config.RMQConfigure;
-import org.apache.rocketmq.dashboard.exception.ServiceException;
-import org.apache.rocketmq.dashboard.model.MessagePage;
-import org.apache.rocketmq.dashboard.model.MessageView;
-import org.apache.rocketmq.dashboard.model.QueueOffsetInfo;
-import org.apache.rocketmq.dashboard.model.request.MessageQuery;
-import org.apache.rocketmq.dashboard.model.MessageQueryByPage;
-import org.apache.rocketmq.remoting.protocol.body.Connection;
-import org.apache.rocketmq.remoting.protocol.body.ConsumeMessageDirectlyResult;
-import org.apache.rocketmq.remoting.protocol.body.ConsumerConnection;
-import org.apache.rocketmq.tools.admin.MQAdminExt;
-import org.apache.rocketmq.tools.admin.api.MessageTrack;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.ArgumentCaptor;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.Spy;
-import org.mockito.junit.MockitoJUnitRunner;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageImpl;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyBoolean;
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.ArgumentMatchers.anyLong;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.doThrow;
-import static org.mockito.Mockito.lenient;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(MockitoJUnitRunner.Silent.class)
-public class MessageServiceImplTest {
-
-    @InjectMocks
-    @Spy
-    private MessageServiceImpl messageService;
-
-    @Mock
-    private MQAdminExt mqAdminExt;
-
-    @Mock
-    private RMQConfigure configure;
-
-    @Mock
-    private DefaultMQPullConsumer consumer;
-
-    @Mock
-    private Cache<String, MessagePage> messagePageCache;
-
-    private static final String TOPIC = "testTopic";
-    private static final String MSG_ID = "testMsgId";
-    private static final String CONSUMER_GROUP = "testConsumerGroup";
-    private static final String CLIENT_ID = "testClientId";
-    private static final String KEY = "testKey";
-    private static final String TASK_ID = "CID_RMQ_SYS_TASK12345";
-
-    @Before
-    public void setUp() throws Exception {
-        // Set up default mock responses
-        when(configure.getNamesrvAddr()).thenReturn("localhost:9876");
-        when(configure.isUseTLS()).thenReturn(false);
-        
-        // Mock the consumer creation to avoid actual RocketMQ calls
-        lenient().doReturn(consumer).when(messageService).buildDefaultMQPullConsumer(any(), anyBoolean());
-    }
-
-    @Test
-    public void testViewMessage() throws Exception {
-        // Setup
-        MessageExt messageExt = createMessageExt(MSG_ID, TOPIC, "test body", System.currentTimeMillis());
-        List<MessageTrack> tracks = Collections.singletonList(mock(MessageTrack.class));
-        
-        when(mqAdminExt.viewMessage(anyString(), anyString())).thenReturn(messageExt);
-        doReturn(tracks).when(messageService).messageTrackDetail(any(MessageExt.class));
-        
-        // Execute
-        Pair<MessageView, List<MessageTrack>> result = messageService.viewMessage(TOPIC, MSG_ID);
-        
-        // Verify
-        assertNotNull(result);
-        assertEquals(messageExt.getMsgId(), result.getObject1().getMsgId());
-        assertEquals(tracks, result.getObject2());
-        verify(mqAdminExt).viewMessage(TOPIC, MSG_ID);
-    }
-    
-    @Test(expected = ServiceException.class)
-    public void testViewMessageException() throws Exception {
-        // Setup
-        when(mqAdminExt.viewMessage(anyString(), anyString())).thenThrow(new RuntimeException("Test exception"));
-        
-        // Execute & Verify exception is thrown
-        messageService.viewMessage(TOPIC, MSG_ID);
-    }
-
-    @Test
-    public void testQueryMessageByTopicAndKey() throws Exception {
-        // Setup mock MessageExt objects
-        MessageExt msg1 = createMessageExt("id1", TOPIC, "body1", System.currentTimeMillis());
-        MessageExt msg2 = createMessageExt("id2", TOPIC, "body2", System.currentTimeMillis());
-        
-        // Create MessageView objects from the MessageExt objects
-        MessageView view1 = MessageView.fromMessageExt(msg1);
-        MessageView view2 = MessageView.fromMessageExt(msg2);
-        
-        // We'll use fresh objects for this test to avoid recursive mock issues
-        List<MessageView> expectedViews = Arrays.asList(view1, view2);
-        
-        // Skip the real implementation and provide test data directly
-        doReturn(expectedViews).when(messageService).queryMessageByTopicAndKey(TOPIC, KEY);
-        
-        // Execute
-        List<MessageView> result = messageService.queryMessageByTopicAndKey(TOPIC, KEY);
-        
-        // Verify we get the expected number of messages
-        assertEquals(2, result.size());
-    }
-    
-    @Test(expected = ServiceException.class)
-    public void testQueryMessageByTopicAndKeyMQException() throws Exception {
-        // Setup a fresh spy that's not part of our test setup to avoid recursive mocking issues
-        MessageServiceImpl testService = mock(MessageServiceImpl.class);
-        when(testService.queryMessageByTopicAndKey(TOPIC, KEY))
-            .thenThrow(new ServiceException(-1, "Test error"));
-            
-        // Execute & Verify exception is thrown
-        testService.queryMessageByTopicAndKey(TOPIC, KEY);
-    }
-    
-    @Test(expected = RuntimeException.class)
-    public void testQueryMessageByTopicAndKeyRuntimeException() throws Exception {
-        // Setup a fresh spy that's not part of our test setup to avoid recursive mocking issues
-        MessageServiceImpl testService = mock(MessageServiceImpl.class);
-        when(testService.queryMessageByTopicAndKey(TOPIC, KEY))
-            .thenThrow(new RuntimeException("Test exception"));
-            
-        // Execute & Verify exception is thrown
-        testService.queryMessageByTopicAndKey(TOPIC, KEY);
-    }
-
-    @Test
-    public void testQueryMessageByTopic() throws Exception {
-        // Setup message queues
-        Set<MessageQueue> messageQueues = new HashSet<>();
-        messageQueues.add(new MessageQueue(TOPIC, "broker-1", 0));
-        messageQueues.add(new MessageQueue(TOPIC, "broker-2", 1));
-        when(consumer.fetchSubscribeMessageQueues(TOPIC)).thenReturn(messageQueues);
-        
-        // Setup pull results for both queues
-        PullResult pullResult1 = createPullResult(PullStatus.FOUND, Arrays.asList(
-            createMessageExt("id1", TOPIC, "body1", 1500),
-            createMessageExt("id2", TOPIC, "body2", 2000)
-        ), 0, 10);
-        
-        PullResult pullResult2 = createPullResult(PullStatus.FOUND, Arrays.asList(
-            createMessageExt("id3", TOPIC, "body3", 1800),
-            createMessageExt("id4", TOPIC, "body4", 2200)
-        ), 0, 10);
-        
-        PullResult emptyResult = createPullResult(PullStatus.NO_NEW_MSG, Collections.emptyList(), 10, 10);
-        
-        // First pull gets messages, second pull gets empty to terminate loop
-        when(consumer.pull(any(MessageQueue.class), anyString(), anyLong(), anyInt()))
-            .thenReturn(pullResult1)
-            .thenReturn(emptyResult)
-            .thenReturn(pullResult2)
-            .thenReturn(emptyResult);
-        
-        // Execute
-        long beginTime = 1000;
-        long endTime = 3000;
-        List<MessageView> result = messageService.queryMessageByTopic(TOPIC, beginTime, endTime);
-        
-        // Verify
-        assertEquals(4, result.size());
-        
-        // Should be sorted by timestamp in descending order
-        assertEquals("id4", result.get(0).getMsgId()); // 2200
-        assertEquals("id2", result.get(1).getMsgId()); // 2000
-        assertEquals("id3", result.get(2).getMsgId()); // 1800
-        assertEquals("id1", result.get(3).getMsgId()); // 1500
-        
-        verify(consumer, times(4)).pull(any(MessageQueue.class), eq("*"), anyLong(), anyInt());
-        verify(consumer).start();
-        verify(consumer).shutdown();
-    }
-    
-    @Test
-    public void testQueryMessageByTopicWithOutOfRangeTimestamps() throws Exception {
-        // Setup message queues
-        Set<MessageQueue> messageQueues = new HashSet<>();
-        messageQueues.add(new MessageQueue(TOPIC, "broker-1", 0));
-        when(consumer.fetchSubscribeMessageQueues(TOPIC)).thenReturn(messageQueues);
-        
-        // Setup pull results - some messages are outside time range
-        PullResult pullResult = createPullResult(PullStatus.FOUND, Arrays.asList(
-            createMessageExt("id1", TOPIC, "body1", 500),  // Outside range (too early)
-            createMessageExt("id2", TOPIC, "body2", 1500), // Inside range
-            createMessageExt("id3", TOPIC, "body3", 3500)  // Outside range (too late)
-        ), 0, 10);
-        
-        PullResult emptyResult = createPullResult(PullStatus.NO_NEW_MSG, Collections.emptyList(), 10, 10);
-        
-        when(consumer.pull(any(MessageQueue.class), anyString(), anyLong(), anyInt()))
-            .thenReturn(pullResult)
-            .thenReturn(emptyResult);
-        
-        // Execute
-        long beginTime = 1000;
-        long endTime = 3000;
-        List<MessageView> result = messageService.queryMessageByTopic(TOPIC, beginTime, endTime);
-        
-        // Verify - only messages within time range should be included
-        assertEquals(1, result.size());
-        assertEquals("id2", result.get(0).getMsgId());
-    }
-    
-    @Test
-    public void testQueryMessageByTopicWithDifferentPullStatuses() throws Exception {
-        // Setup message queues
-        Set<MessageQueue> messageQueues = new HashSet<>();
-        messageQueues.add(new MessageQueue(TOPIC, "broker-1", 0));
-        when(consumer.fetchSubscribeMessageQueues(TOPIC)).thenReturn(messageQueues);
-        
-        // Test all different pull statuses
-        PullResult pullResult1 = createPullResult(PullStatus.FOUND, 
-            Collections.singletonList(createMessageExt("id1", TOPIC, "body1", 1500)), 0, 5);
-        
-        PullResult pullResult2 = createPullResult(PullStatus.NO_MATCHED_MSG, 
-            Collections.emptyList(), 5, 6);
-        
-        PullResult pullResult3 = createPullResult(PullStatus.NO_NEW_MSG, 
-            Collections.emptyList(), 6, 7);
-        
-        PullResult pullResult4 = createPullResult(PullStatus.OFFSET_ILLEGAL, 
-            Collections.emptyList(), 7, 8);
-        
-        when(consumer.pull(any(MessageQueue.class), anyString(), anyLong(), anyInt()))
-            .thenReturn(pullResult1)
-            .thenReturn(pullResult2)
-            .thenReturn(pullResult3)
-            .thenReturn(pullResult4);
-        
-        // Execute
-        long beginTime = 1000;
-        long endTime = 3000;
-        List<MessageView> result = messageService.queryMessageByTopic(TOPIC, beginTime, endTime);
-        
-        // Verify
-        assertEquals(1, result.size());
-        assertEquals("id1", result.get(0).getMsgId());
-    }
-
-    @Test
-    public void testMessageTrackDetail() throws Exception {
-        // Setup
-        MessageExt msg = createMessageExt(MSG_ID, TOPIC, "body", System.currentTimeMillis());
-        List<MessageTrack> tracks = Collections.singletonList(mock(MessageTrack.class));
-        
-        when(mqAdminExt.messageTrackDetail(any(MessageExt.class))).thenReturn(tracks);
-        
-        // Execute
-        List<MessageTrack> result = messageService.messageTrackDetail(msg);
-        
-        // Verify
-        assertEquals(tracks, result);
-        verify(mqAdminExt).messageTrackDetail(msg);
-    }
-    
-    @Test
-    public void testMessageTrackDetailException() throws Exception {
-        // Setup
-        MessageExt msg = createMessageExt(MSG_ID, TOPIC, "body", System.currentTimeMillis());
-        when(mqAdminExt.messageTrackDetail(any(MessageExt.class))).thenThrow(new RuntimeException("Test exception"));
-        
-        // Execute
-        List<MessageTrack> result = messageService.messageTrackDetail(msg);
-        
-        // Verify - should return empty list on exception
-        assertTrue(result.isEmpty());
-    }
-
-    @Test
-    public void testConsumeMessageDirectlyWithClientId() throws Exception {
-        // Setup
-        ConsumeMessageDirectlyResult expectedResult = new ConsumeMessageDirectlyResult();
-        
-        when(mqAdminExt.consumeMessageDirectly(CONSUMER_GROUP, CLIENT_ID, TOPIC, MSG_ID))
-            .thenReturn(expectedResult);
-        
-        // Execute
-        ConsumeMessageDirectlyResult result = messageService.consumeMessageDirectly(TOPIC, MSG_ID, CONSUMER_GROUP, CLIENT_ID);
-        
-        // Verify
-        assertEquals(expectedResult, result);
-        verify(mqAdminExt).consumeMessageDirectly(CONSUMER_GROUP, CLIENT_ID, TOPIC, MSG_ID);
-    }
-    
-    @Test
-    public void testConsumeMessageDirectlyWithoutClientId() throws Exception {
-        // Setup
-        ConsumeMessageDirectlyResult expectedResult = new ConsumeMessageDirectlyResult();
-        
-        ConsumerConnection consumerConnection = new ConsumerConnection();
-        HashSet<Connection> connectionSet = new HashSet<>();
-        
-        // Add a connection without clientId - should be skipped
-        Connection emptyConn = new Connection();
-        connectionSet.add(emptyConn);
-        
-        // Add a connection with clientId - should be used
-        Connection conn = new Connection();
-        conn.setClientId(CLIENT_ID);
-        connectionSet.add(conn);
-        
-        consumerConnection.setConnectionSet(connectionSet);
-        
-        when(mqAdminExt.examineConsumerConnectionInfo(CONSUMER_GROUP)).thenReturn(consumerConnection);
-        when(mqAdminExt.consumeMessageDirectly(CONSUMER_GROUP, CLIENT_ID, TOPIC, MSG_ID))
-            .thenReturn(expectedResult);
-        
-        // Execute
-        ConsumeMessageDirectlyResult result = messageService.consumeMessageDirectly(TOPIC, MSG_ID, CONSUMER_GROUP, null);
-        
-        // Verify
-        assertEquals(expectedResult, result);
-        verify(mqAdminExt).examineConsumerConnectionInfo(CONSUMER_GROUP);
-        verify(mqAdminExt).consumeMessageDirectly(CONSUMER_GROUP, CLIENT_ID, TOPIC, MSG_ID);
-    }
-    
-    @Test(expected = IllegalStateException.class)
-    public void testConsumeMessageDirectlyWithNoConsumer() throws Exception {
-        // Setup
-        ConsumerConnection consumerConnection = new ConsumerConnection();
-        consumerConnection.setConnectionSet(new HashSet<>());
-        
-        when(mqAdminExt.examineConsumerConnectionInfo(CONSUMER_GROUP)).thenReturn(consumerConnection);
-        
-        // Execute & Verify exception
-        messageService.consumeMessageDirectly(TOPIC, MSG_ID, CONSUMER_GROUP, null);
-    }
-
-    @Test
-    public void testMoveStartOffset() throws Exception {
-        // Create test queue offsets
-        List<QueueOffsetInfo> queueOffsets = new ArrayList<>();
-        MessageQueue mq1 = new MessageQueue(TOPIC, "broker", 0);
-        MessageQueue mq2 = new MessageQueue(TOPIC, "broker", 1);
-        MessageQueue mq3 = new MessageQueue(TOPIC, "broker", 2);
-        
-        QueueOffsetInfo qo1 = new QueueOffsetInfo(0, 0L, 10L, 0L, 0L, mq1);
-        QueueOffsetInfo qo2 = new QueueOffsetInfo(1, 0L, 20L, 0L, 0L, mq2);
-        QueueOffsetInfo qo3 = new QueueOffsetInfo(2, 0L, 30L, 0L, 0L, mq3);
-        
-        queueOffsets.add(qo1);
-        queueOffsets.add(qo2);
-        queueOffsets.add(qo3);
-        
-        // Create query with offset 15 (page 2 with size 15)
-        MessageQueryByPage query = new MessageQueryByPage(2, 15, TOPIC, 1000, 3000);
-        
-        // Access the private method
-        Method method = MessageServiceImpl.class.getDeclaredMethod("moveStartOffset", 
-            List.class, MessageQueryByPage.class);
-        method.setAccessible(true);
-        int nextIndex = (Integer) method.invoke(messageService, queueOffsets, query);
-        
-        // Verify - the actual implementation distributes 15 units of offset across 3 queues
-        assertEquals(15, qo1.getStartOffset() + qo2.getStartOffset() + qo3.getStartOffset());
-        assertTrue(nextIndex >= 0 && nextIndex < queueOffsets.size());
-    }
-    
-    @Test
-    public void testMoveEndOffset() throws Exception {
-        // Create test queue offsets
-        List<QueueOffsetInfo> queueOffsets = new ArrayList<>();
-        MessageQueue mq1 = new MessageQueue(TOPIC, "broker", 0);
-        MessageQueue mq2 = new MessageQueue(TOPIC, "broker", 1);
-        
-        QueueOffsetInfo qo1 = new QueueOffsetInfo(0, 0L, 10L, 5L, 5L, mq1);
-        QueueOffsetInfo qo2 = new QueueOffsetInfo(1, 0L, 20L, 10L, 10L, mq2);
-        
-        queueOffsets.add(qo1);
-        queueOffsets.add(qo2);
-        
-        // Create query with page size 10
-        MessageQueryByPage query = new MessageQueryByPage(2, 10, TOPIC, 1000, 3000);
-        int nextIndex = 0; // Start with the first queue
-        
-        // Access the private method
-        Method method = MessageServiceImpl.class.getDeclaredMethod("moveEndOffset", 
-            List.class, MessageQueryByPage.class, int.class);
-        method.setAccessible(true);
-        method.invoke(messageService, queueOffsets, query, nextIndex);
-        
-        // Verify total endOffset increment is page size
-        assertEquals(10, (qo1.getEndOffset() - 5L) + (qo2.getEndOffset() - 10L));
-    }
-    
-    @Test
-    public void testBuildDefaultMQPullConsumer() {
-        // Test with TLS enabled
-        DefaultMQPullConsumer tlsConsumer = messageService.buildDefaultMQPullConsumer(null, true);
-        assertNotNull(tlsConsumer);
-        
-        // Test with TLS disabled
-        DefaultMQPullConsumer nonTlsConsumer = messageService.buildDefaultMQPullConsumer(null, false);
-        assertNotNull(nonTlsConsumer);
-        
-        // Test with RPC hook
-        AclClientRPCHook rpcHook = mock(AclClientRPCHook.class);
-        DefaultMQPullConsumer hookConsumer = messageService.buildDefaultMQPullConsumer(rpcHook, false);
-        assertNotNull(hookConsumer);
-    }
-    
-    // Helper methods
-    
-    private MessageExt createMessageExt(String msgId, String topic, String body, long storeTimestamp) {
-        MessageExt msg = new MessageExt();
-        msg.setMsgId(msgId);
-        msg.setTopic(topic);
-        msg.setBody(body.getBytes());
-        msg.setStoreTimestamp(storeTimestamp);
-        return msg;
-    }
-    
-    private PullResult createPullResult(PullStatus status, List<MessageExt> msgFoundList, long nextBeginOffset, long minOffset) {
-        return new PullResult(status, nextBeginOffset, minOffset, minOffset + msgFoundList.size(), msgFoundList);
-    }
-} 

src/test/java/org/apache/rocketmq/dashboard/service/impl/TopicServiceImplTest.java

@@ -1,332 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.rocketmq.dashboard.service.impl;
-
-import org.apache.rocketmq.dashboard.model.request.TopicConfigInfo;
-import org.apache.rocketmq.dashboard.model.request.TopicTypeList;
-import org.apache.rocketmq.dashboard.util.MockObjectUtil;
-import org.apache.rocketmq.remoting.protocol.body.TopicList;
-import org.apache.rocketmq.tools.admin.MQAdminExt;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.Spy;
-import org.mockito.junit.MockitoJUnitRunner;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import static org.mockito.ArgumentMatchers.anyBoolean;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.when;
-
-import org.apache.rocketmq.acl.common.AclClientRPCHook;
-import org.apache.rocketmq.client.producer.DefaultMQProducer;
-import org.apache.rocketmq.client.producer.SendResult;
-import org.apache.rocketmq.client.producer.SendStatus;
-import org.apache.rocketmq.client.producer.TransactionMQProducer;
-import org.apache.rocketmq.common.attribute.TopicMessageType;
-import org.apache.rocketmq.common.message.Message;
-import org.apache.rocketmq.dashboard.config.RMQConfigure;
-import org.apache.rocketmq.dashboard.model.request.SendTopicMessageRequest;
-import org.mockito.ArgumentCaptor;
-import org.mockito.ArgumentMatchers;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyLong;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.ArgumentMatchers.isNull;
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.lenient;
-
-@RunWith(MockitoJUnitRunner.class)
-public class TopicServiceImplTest {
-
-    @InjectMocks
-    @Spy
-    private TopicServiceImpl topicService;
-
-    @Mock
-    private MQAdminExt mqAdminExt;
-    
-    @Mock
-    private RMQConfigure configure;
-
-    @Before
-    public void setUp() {
-        // Setup common mocks
-        when(configure.getNamesrvAddr()).thenReturn("localhost:9876");
-        
-        // Use lenient() to prevent the unnecessary stubbing error
-        lenient().when(configure.isUseTLS()).thenReturn(false);
-    }
-
-    @Test
-    public void testExamineAllTopicType() throws Exception {
-        // Create mock TopicList with different types of topics
-        TopicList topicList = new TopicList();
-        Set<String> topicSet = new HashSet<>();
-        topicSet.add("normalTopic");
-        topicSet.add("%RETRY%someGroup");
-        topicSet.add("%DLQ%someGroup");
-        topicSet.add("%SYS%sysTopic");
-        topicList.setTopicList(topicSet);
-        
-        // Mock fetchAllTopicList to return our test topics
-        doReturn(topicList).when(topicService).fetchAllTopicList(anyBoolean(), anyBoolean());
-        
-        // Mock examineTopicConfig for the normal topic
-        TopicConfigInfo configInfo = new TopicConfigInfo();
-        configInfo.setMessageType("NORMAL");
-        List<TopicConfigInfo> topicConfigInfos = new ArrayList<>();
-        topicConfigInfos.add(configInfo);
-        doReturn(topicConfigInfos).when(topicService).examineTopicConfig(anyString());
-        
-        // Call the method being tested
-        TopicTypeList result = topicService.examineAllTopicType();
-        
-        // Verify the results
-        Assert.assertNotNull(result);
-        Assert.assertEquals(4, result.getTopicNameList().size());
-        Assert.assertEquals(4, result.getMessageTypeList().size());
-        
-        // Verify that the topics contain the expected names and types
-        // Note: the actual order might be different due to sorting in the method
-        // So we're checking that all expected items are included
-        Assert.assertTrue(result.getTopicNameList().contains("normalTopic"));
-        Assert.assertTrue(result.getTopicNameList().contains("%RETRY%someGroup"));
-        Assert.assertTrue(result.getTopicNameList().contains("%DLQ%someGroup"));
-        Assert.assertTrue(result.getTopicNameList().contains("%SYS%sysTopic"));
-        
-        // Verify message types
-        Assert.assertTrue(result.getMessageTypeList().contains("NORMAL"));
-        Assert.assertTrue(result.getMessageTypeList().contains("RETRY"));
-        Assert.assertTrue(result.getMessageTypeList().contains("DELAY")); 
-        Assert.assertTrue(result.getMessageTypeList().contains("SYSTEM"));
-    }
-
-    @Test
-    public void testSendTopicMessageRequestNormal() throws Exception {
-        // Prepare test data
-        SendTopicMessageRequest request = new SendTopicMessageRequest();
-        request.setTopic("testTopic");
-        request.setTag("testTag");
-        request.setKey("testKey");
-        request.setMessageBody("Hello RocketMQ");
-        request.setTraceEnabled(false);
-        
-        // Mock the topic config
-        TopicConfigInfo configInfo = new TopicConfigInfo();
-        configInfo.setMessageType(TopicMessageType.NORMAL.name());
-        List<TopicConfigInfo> topicConfigInfos = new ArrayList<>();
-        topicConfigInfos.add(configInfo);
-        doReturn(topicConfigInfos).when(topicService).examineTopicConfig("testTopic");
-        
-        // Mock ACL disabled
-        when(configure.isACLEnabled()).thenReturn(false);
-        
-        // Mock producer
-        DefaultMQProducer mockProducer = mock(DefaultMQProducer.class);
-        doReturn(mockProducer).when(topicService).buildDefaultMQProducer(any(), any(), anyBoolean());
-        
-        // Mock send result
-        SendResult expectedResult = new SendResult();
-        expectedResult.setSendStatus(SendStatus.SEND_OK);
-        when(mockProducer.send(any(Message.class))).thenReturn(expectedResult);
-        
-        // Call the method
-        SendResult result = topicService.sendTopicMessageRequest(request);
-        
-        // Verify
-        Assert.assertEquals(expectedResult, result);
-        
-        // Verify producer configuration and message sending
-        verify(mockProducer).setInstanceName(anyString());
-        verify(mockProducer).setNamesrvAddr("localhost:9876");
-        verify(mockProducer).start();
-        
-        // Verify message content
-        ArgumentCaptor<Message> messageCaptor = ArgumentCaptor.forClass(Message.class);
-        verify(mockProducer).send(messageCaptor.capture());
-        Message sentMessage = messageCaptor.getValue();
-        Assert.assertEquals("testTopic", sentMessage.getTopic());
-        Assert.assertEquals("testTag", sentMessage.getTags());
-        Assert.assertEquals("testKey", sentMessage.getKeys());
-        Assert.assertEquals("Hello RocketMQ", new String(sentMessage.getBody()));
-        
-        // Verify producer shutdown
-        verify(mockProducer).shutdown();
-    }
-    
-    @Test
-    public void testSendTopicMessageRequestTransaction() throws Exception {
-        // Prepare test data
-        SendTopicMessageRequest request = new SendTopicMessageRequest();
-        request.setTopic("testTopic");
-        request.setTag("testTag");
-        request.setKey("testKey");
-        request.setMessageBody("Hello RocketMQ");
-        request.setTraceEnabled(false);
-        
-        // Mock the topic config
-        TopicConfigInfo configInfo = new TopicConfigInfo();
-        configInfo.setMessageType(TopicMessageType.TRANSACTION.name());
-        List<TopicConfigInfo> topicConfigInfos = new ArrayList<>();
-        topicConfigInfos.add(configInfo);
-        doReturn(topicConfigInfos).when(topicService).examineTopicConfig("testTopic");
-        
-        // Mock ACL disabled
-        when(configure.isACLEnabled()).thenReturn(false);
-        
-        // Mock producer
-        TransactionMQProducer mockProducer = mock(TransactionMQProducer.class);
-        doReturn(mockProducer).when(topicService).buildTransactionMQProducer(any(), any(), anyBoolean());
-        
-        // Mock send result - use org.apache.rocketmq.client.producer.TransactionSendResult instead of SendResult
-        org.apache.rocketmq.client.producer.TransactionSendResult expectedResult = new org.apache.rocketmq.client.producer.TransactionSendResult();
-        expectedResult.setSendStatus(SendStatus.SEND_OK);
-        when(mockProducer.sendMessageInTransaction(any(Message.class), isNull())).thenReturn(expectedResult);
-        
-        // Call the method
-        SendResult result = topicService.sendTopicMessageRequest(request);
-        
-        // Verify
-        Assert.assertEquals(expectedResult, result);
-        
-        // Verify producer configuration and message sending
-        verify(mockProducer).setInstanceName(anyString());
-        verify(mockProducer).setNamesrvAddr("localhost:9876");
-        verify(mockProducer).setTransactionListener(any());
-        verify(mockProducer).start();
-        
-        // Verify message content
-        ArgumentCaptor<Message> messageCaptor = ArgumentCaptor.forClass(Message.class);
-        verify(mockProducer).sendMessageInTransaction(messageCaptor.capture(), isNull());
-        Message sentMessage = messageCaptor.getValue();
-        Assert.assertEquals("testTopic", sentMessage.getTopic());
-        Assert.assertEquals("testTag", sentMessage.getTags());
-        Assert.assertEquals("testKey", sentMessage.getKeys());
-        Assert.assertEquals("Hello RocketMQ", new String(sentMessage.getBody()));
-        
-        // Verify producer shutdown
-        verify(mockProducer).shutdown();
-    }
-    
-    @Test
-    public void testSendTopicMessageRequestWithACLEnabled() throws Exception {
-        // Prepare test data
-        SendTopicMessageRequest request = new SendTopicMessageRequest();
-        request.setTopic("testTopic");
-        request.setTag("testTag");
-        request.setKey("testKey");
-        request.setMessageBody("Hello RocketMQ");
-        request.setTraceEnabled(false);
-        
-        // Mock the topic config
-        TopicConfigInfo configInfo = new TopicConfigInfo();
-        configInfo.setMessageType(TopicMessageType.NORMAL.name());
-        List<TopicConfigInfo> topicConfigInfos = new ArrayList<>();
-        topicConfigInfos.add(configInfo);
-        doReturn(topicConfigInfos).when(topicService).examineTopicConfig("testTopic");
-        
-        // Mock ACL enabled
-        when(configure.isACLEnabled()).thenReturn(true);
-        when(configure.getAccessKey()).thenReturn("testAccessKey");
-        when(configure.getSecretKey()).thenReturn("testSecretKey");
-        
-        // Mock producer
-        DefaultMQProducer mockProducer = mock(DefaultMQProducer.class);
-        doReturn(mockProducer).when(topicService).buildDefaultMQProducer(any(), any(AclClientRPCHook.class), anyBoolean());
-        
-        // Mock send result
-        SendResult expectedResult = new SendResult();
-        expectedResult.setSendStatus(SendStatus.SEND_OK);
-        when(mockProducer.send(any(Message.class))).thenReturn(expectedResult);
-        
-        // Call the method
-        SendResult result = topicService.sendTopicMessageRequest(request);
-        
-        // Verify
-        Assert.assertEquals(expectedResult, result);
-        
-        // Since we can't directly verify the AclClientRPCHook content, we verify that build was called with non-null hook
-        verify(topicService).buildDefaultMQProducer(any(), any(AclClientRPCHook.class), eq(false));
-        
-        // Verify producer methods
-        verify(mockProducer).start();
-        verify(mockProducer).send(any(Message.class));
-        verify(mockProducer).shutdown();
-    }
-    
-    @Test
-    public void testSendTopicMessageRequestWithTraceEnabled() throws Exception {
-        // Prepare test data
-        SendTopicMessageRequest request = new SendTopicMessageRequest();
-        request.setTopic("testTopic");
-        request.setTag("testTag");
-        request.setKey("testKey");
-        request.setMessageBody("Hello RocketMQ");
-        request.setTraceEnabled(true); // Enable tracing
-        
-        // Mock the topic config
-        TopicConfigInfo configInfo = new TopicConfigInfo();
-        configInfo.setMessageType(TopicMessageType.NORMAL.name());
-        List<TopicConfigInfo> topicConfigInfos = new ArrayList<>();
-        topicConfigInfos.add(configInfo);
-        doReturn(topicConfigInfos).when(topicService).examineTopicConfig("testTopic");
-        
-        // Mock ACL disabled
-        when(configure.isACLEnabled()).thenReturn(false);
-        
-        // Mock producer
-        DefaultMQProducer mockProducer = mock(DefaultMQProducer.class);
-        doReturn(mockProducer).when(topicService).buildDefaultMQProducer(any(), any(), eq(true));
-        
-        // Cannot mock waitSendTraceFinish as it's private
-        // doNothing().when(topicService).waitSendTraceFinish(any(DefaultMQProducer.class), eq(true));
-        
-        // Mock send result
-        SendResult expectedResult = new SendResult();
-        expectedResult.setSendStatus(SendStatus.SEND_OK);
-        when(mockProducer.send(any(Message.class))).thenReturn(expectedResult);
-        
-        // Call the method
-        SendResult result = topicService.sendTopicMessageRequest(request);
-        
-        // Verify
-        Assert.assertEquals(expectedResult, result);
-        
-        // Verify that buildDefaultMQProducer was called with traceEnabled=true
-        verify(topicService).buildDefaultMQProducer(any(), any(), eq(true));
-        
-        // Cannot verify waitSendTraceFinish as it's private
-        // verify(topicService).waitSendTraceFinish(mockProducer, true);
-    }
-} 

src/test/java/org/apache/rocketmq/dashboard/task/DashboardCollectTaskTest.java

@@ -33,12 +33,12 @@ import java.util.Set;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.TimeUnit;
 import org.apache.rocketmq.common.MixAll;
-import org.apache.rocketmq.remoting.protocol.body.BrokerStatsData;
-import org.apache.rocketmq.remoting.protocol.body.ClusterInfo;
-import org.apache.rocketmq.remoting.protocol.body.GroupList;
-import org.apache.rocketmq.remoting.protocol.body.KVTable;
-import org.apache.rocketmq.remoting.protocol.body.TopicList;
-import org.apache.rocketmq.remoting.protocol.route.TopicRouteData;
+import org.apache.rocketmq.common.protocol.body.BrokerStatsData;
+import org.apache.rocketmq.common.protocol.body.ClusterInfo;
+import org.apache.rocketmq.common.protocol.body.GroupList;
+import org.apache.rocketmq.common.protocol.body.KVTable;
+import org.apache.rocketmq.common.protocol.body.TopicList;
+import org.apache.rocketmq.common.protocol.route.TopicRouteData;
 import org.apache.rocketmq.dashboard.BaseTest;
 import org.apache.rocketmq.dashboard.config.CollectExecutorConfig;
 import org.apache.rocketmq.dashboard.config.RMQConfigure;

src/test/java/org/apache/rocketmq/dashboard/testbase/RocketMQConsoleTestBase.java

@@ -29,7 +29,7 @@ import org.apache.rocketmq.client.producer.SendResult;
 import org.apache.rocketmq.common.consumer.ConsumeFromWhere;
 import org.apache.rocketmq.common.message.Message;
 import org.apache.rocketmq.common.message.MessageExt;
-import org.apache.rocketmq.remoting.protocol.subscription.SubscriptionGroupConfig;
+import org.apache.rocketmq.common.subscription.SubscriptionGroupConfig;
 import org.apache.rocketmq.dashboard.model.request.ConsumerConfigInfo;
 import org.apache.rocketmq.dashboard.model.request.TopicConfigInfo;
 import org.apache.rocketmq.dashboard.service.ConsumerService;
@@ -78,8 +78,7 @@ public abstract class RocketMQConsoleTestBase {
                     }
                 }
             }
-            Throwables.throwIfUnchecked(exception);
-            throw new RuntimeException(exception);
+            throw Throwables.propagate(exception);
         }
     }
 
@@ -92,8 +91,7 @@ public abstract class RocketMQConsoleTestBase {
             producer.start();
         }
         catch (Exception e) {
-            Throwables.throwIfUnchecked(e);
-            throw new RuntimeException(e);
+            throw Throwables.propagate(e);
         }
     }
 
@@ -139,8 +137,7 @@ public abstract class RocketMQConsoleTestBase {
             consumer.start();
         }
         catch (Exception e) {
-            Throwables.throwIfUnchecked(e);
-            throw new RuntimeException(e);
+            throw Throwables.propagate(e);
         }
     }
 

src/test/java/org/apache/rocketmq/dashboard/util/AutoCloseConsumerWrapperTests.java

@@ -1,84 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.rocketmq.dashboard.util;
-
-import org.apache.rocketmq.client.consumer.DefaultMQPullConsumer;
-import org.apache.rocketmq.dashboard.support.AutoCloseConsumerWrapper;
-import org.apache.rocketmq.remoting.RPCHook;
-import java.lang.reflect.Field;
-import static org.mockito.Mockito.mock;
-import org.apache.rocketmq.client.exception.MQClientException;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.junit.jupiter.MockitoExtension;
-import java.time.Instant;
-import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.Mockito.*;
-
-@ExtendWith(MockitoExtension.class)
-class AutoCloseConsumerWrapperTests {
-
-    private static class TestableWrapper extends AutoCloseConsumerWrapper {
-        private DefaultMQPullConsumer mockConsumer = mock(DefaultMQPullConsumer.class);
-
-        @Override
-        protected DefaultMQPullConsumer createNewConsumer(RPCHook rpcHook, Boolean useTLS) {
-            return mockConsumer;
-        }
-    }
-
-    @Test
-    void shouldReuseConsumerInstance() throws Exception {
-        TestableWrapper wrapper = new TestableWrapper();
-
-        DefaultMQPullConsumer first = wrapper.getConsumer(mock(RPCHook.class), true);
-        assertNotNull(first);
-
-        DefaultMQPullConsumer second = wrapper.getConsumer(mock(RPCHook.class), true);
-        assertSame(first, second);
-    }
-
-    @Test
-    void shouldHandleStartFailure() throws Exception {
-        TestableWrapper wrapper = new TestableWrapper();
-        doThrow(new MQClientException("Simulated error", null))
-                .when(wrapper.mockConsumer).start();
-
-        assertThrows(RuntimeException.class, () ->
-                wrapper.getConsumer(mock(RPCHook.class), true));
-
-        verify(wrapper.mockConsumer).shutdown();
-    }
-
-
-
-    @Test
-    void shouldCloseIdleConsumer() throws Exception {
-        TestableWrapper wrapper = new TestableWrapper();
-
-        wrapper.getConsumer(mock(RPCHook.class), true);
-
-        Field lastUsedTime = AutoCloseConsumerWrapper.class.getDeclaredField("lastUsedTime");
-        lastUsedTime.setAccessible(true);
-        lastUsedTime.set(wrapper, Instant.now().minusSeconds(70));
-
-        wrapper.checkAndCloseIdleConsumer();
-
-        verify(wrapper.mockConsumer).shutdown();
-    }
-}

src/test/java/org/apache/rocketmq/dashboard/util/MockObjectUtil.java

@@ -33,39 +33,39 @@ import org.apache.rocketmq.client.producer.LocalTransactionState;
 import org.apache.rocketmq.client.trace.TraceConstants;
 import org.apache.rocketmq.client.trace.TraceType;
 import org.apache.rocketmq.common.AclConfig;
-import org.apache.rocketmq.remoting.protocol.DataVersion;
+import org.apache.rocketmq.common.DataVersion;
 import org.apache.rocketmq.common.MixAll;
 import org.apache.rocketmq.common.PlainAccessConfig;
 import org.apache.rocketmq.common.TopicConfig;
-import org.apache.rocketmq.remoting.protocol.admin.ConsumeStats;
-import org.apache.rocketmq.remoting.protocol.admin.OffsetWrapper;
-import org.apache.rocketmq.remoting.protocol.admin.TopicOffset;
-import org.apache.rocketmq.remoting.protocol.admin.TopicStatsTable;
+import org.apache.rocketmq.common.admin.ConsumeStats;
+import org.apache.rocketmq.common.admin.OffsetWrapper;
+import org.apache.rocketmq.common.admin.TopicOffset;
+import org.apache.rocketmq.common.admin.TopicStatsTable;
 import org.apache.rocketmq.common.consumer.ConsumeFromWhere;
 import org.apache.rocketmq.common.message.MessageExt;
 import org.apache.rocketmq.common.message.MessageQueue;
-import org.apache.rocketmq.remoting.protocol.body.BrokerStatsData;
-import org.apache.rocketmq.remoting.protocol.body.BrokerStatsItem;
-import org.apache.rocketmq.remoting.protocol.body.ClusterInfo;
-import org.apache.rocketmq.remoting.protocol.body.Connection;
-import org.apache.rocketmq.remoting.protocol.body.ConsumeStatus;
-import org.apache.rocketmq.remoting.protocol.body.ConsumerConnection;
-import org.apache.rocketmq.remoting.protocol.body.ConsumerRunningInfo;
-import org.apache.rocketmq.remoting.protocol.body.ProcessQueueInfo;
-import org.apache.rocketmq.remoting.protocol.body.SubscriptionGroupWrapper;
-import org.apache.rocketmq.remoting.protocol.body.TopicConfigSerializeWrapper;
-import org.apache.rocketmq.remoting.protocol.heartbeat.ConsumeType;
-import org.apache.rocketmq.remoting.protocol.heartbeat.MessageModel;
-import org.apache.rocketmq.remoting.protocol.heartbeat.SubscriptionData;
-import org.apache.rocketmq.remoting.protocol.route.BrokerData;
-import org.apache.rocketmq.remoting.protocol.route.QueueData;
-import org.apache.rocketmq.remoting.protocol.route.TopicRouteData;
-import org.apache.rocketmq.remoting.protocol.subscription.SubscriptionGroupConfig;
+import org.apache.rocketmq.common.protocol.body.BrokerStatsData;
+import org.apache.rocketmq.common.protocol.body.BrokerStatsItem;
+import org.apache.rocketmq.common.protocol.body.ClusterInfo;
+import org.apache.rocketmq.common.protocol.body.Connection;
+import org.apache.rocketmq.common.protocol.body.ConsumeStatus;
+import org.apache.rocketmq.common.protocol.body.ConsumerConnection;
+import org.apache.rocketmq.common.protocol.body.ConsumerRunningInfo;
+import org.apache.rocketmq.common.protocol.body.ProcessQueueInfo;
+import org.apache.rocketmq.common.protocol.body.SubscriptionGroupWrapper;
+import org.apache.rocketmq.common.protocol.body.TopicConfigSerializeWrapper;
+import org.apache.rocketmq.common.protocol.heartbeat.ConsumeType;
+import org.apache.rocketmq.common.protocol.heartbeat.MessageModel;
+import org.apache.rocketmq.common.protocol.heartbeat.SubscriptionData;
+import org.apache.rocketmq.common.protocol.route.BrokerData;
+import org.apache.rocketmq.common.protocol.route.QueueData;
+import org.apache.rocketmq.common.protocol.route.TopicRouteData;
+import org.apache.rocketmq.common.subscription.SubscriptionGroupConfig;
 import org.apache.rocketmq.dashboard.model.DlqMessageRequest;
 import org.apache.rocketmq.remoting.protocol.LanguageCode;
 import org.checkerframework.checker.units.qual.A;
 
-import static org.apache.rocketmq.remoting.protocol.heartbeat.ConsumeType.CONSUME_ACTIVELY;
+import static org.apache.rocketmq.common.protocol.heartbeat.ConsumeType.CONSUME_ACTIVELY;
 
 public class MockObjectUtil {