Use rocketmq-dashboard instead of rocketmq-console

src/main/docker/Dockerfile

@@ -1,6 +1,6 @@
 FROM java:8
 VOLUME /tmp
-ADD rocketmq-console-ng-*.jar rocketmq-console-ng.jar
-RUN sh -c 'touch /rocketmq-console-ng.jar'
+ADD rocketmq-dashboard-*.jar rocketmq-dashboard.jar
+RUN sh -c 'touch /rocketmq-dashboard.jar'
 ENV JAVA_OPTS=""
-ENTRYPOINT [ "sh", "-c", "java $JAVA_OPTS -jar /rocketmq-console-ng.jar" ]
+ENTRYPOINT [ "sh", "-c", "java $JAVA_OPTS -jar /rocketmq-dashboard.jar" ]

src/main/java/org/apache/rocketmq/dashboard/App.java

@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.rocketmq.console;
+package org.apache.rocketmq.dashboard;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

src/main/java/org/apache/rocketmq/dashboard/aspect/admin/MQAdminAspect.java

@@ -14,11 +14,11 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.rocketmq.console.aspect.admin;
+package org.apache.rocketmq.dashboard.aspect.admin;
 
-import org.apache.rocketmq.console.aspect.admin.annotation.MultiMQAdminCmdMethod;
-import org.apache.rocketmq.console.config.RMQConfigure;
-import org.apache.rocketmq.console.service.client.MQAdminInstance;
+import org.apache.rocketmq.dashboard.aspect.admin.annotation.MultiMQAdminCmdMethod;
+import org.apache.rocketmq.dashboard.config.RMQConfigure;
+import org.apache.rocketmq.dashboard.service.client.MQAdminInstance;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
@@ -42,12 +42,12 @@ public class MQAdminAspect {
     public MQAdminAspect() {
     }
 
-    @Pointcut("execution(* org.apache.rocketmq.console.service.client.MQAdminExtImpl..*(..))")
+    @Pointcut("execution(* org.apache.rocketmq.dashboard.service.client.MQAdminExtImpl..*(..))")
     public void mQAdminMethodPointCut() {
 
     }
 
-    @Pointcut("@annotation(org.apache.rocketmq.console.aspect.admin.annotation.MultiMQAdminCmdMethod)")
+    @Pointcut("@annotation(org.apache.rocketmq.dashboard.aspect.admin.annotation.MultiMQAdminCmdMethod)")
     public void multiMQAdminMethodPointCut() {
 
     }

src/main/java/org/apache/rocketmq/dashboard/aspect/admin/annotation/MultiMQAdminCmdMethod.java

@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package org.apache.rocketmq.console.aspect.admin.annotation;
+package org.apache.rocketmq.dashboard.aspect.admin.annotation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

src/main/java/org/apache/rocketmq/dashboard/aspect/admin/annotation/OriginalControllerReturnValue.java

@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package org.apache.rocketmq.console.aspect.admin.annotation;
+package org.apache.rocketmq.dashboard.aspect.admin.annotation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

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

@@ -15,11 +15,11 @@
  *  limitations under the License.
  */
 
-package org.apache.rocketmq.console.config;
+package org.apache.rocketmq.dashboard.config;
 
-import org.apache.rocketmq.console.interceptor.AuthInterceptor;
-import org.apache.rocketmq.console.model.UserInfo;
-import org.apache.rocketmq.console.util.WebUtil;
+import org.apache.rocketmq.dashboard.interceptor.AuthInterceptor;
+import org.apache.rocketmq.dashboard.model.UserInfo;
+import org.apache.rocketmq.dashboard.util.WebUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.Configuration;

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

@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.rocketmq.console.config;
+package org.apache.rocketmq.dashboard.config;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.rocketmq.common.MixAll;
@@ -89,11 +89,11 @@ public class RMQConfigure {
         return !(StringUtils.isAnyBlank(this.accessKey, this.secretKey) ||
                  StringUtils.isAnyEmpty(this.accessKey, this.secretKey));
     }
-    public String getRocketMqConsoleDataPath() {
+    public String getRocketMqDashboardDataPath() {
         return dataPath;
     }
 
-    public String getConsoleCollectData() {
+    public String getDashboardCollectData() {
         return dataPath + File.separator + "dashboard";
     }
 

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

@@ -14,9 +14,9 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.rocketmq.console.controller;
+package org.apache.rocketmq.dashboard.controller;
 
-import org.apache.rocketmq.console.service.ClusterService;
+import org.apache.rocketmq.dashboard.service.ClusterService;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;

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

@@ -14,18 +14,18 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.rocketmq.console.controller;
+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.common.protocol.body.ConsumerConnection;
-import org.apache.rocketmq.console.model.ConnectionInfo;
-import org.apache.rocketmq.console.model.request.ConsumerConfigInfo;
-import org.apache.rocketmq.console.model.request.DeleteSubGroupRequest;
-import org.apache.rocketmq.console.model.request.ResetOffsetRequest;
-import org.apache.rocketmq.console.service.ConsumerService;
-import org.apache.rocketmq.console.util.JsonUtil;
+import org.apache.rocketmq.dashboard.model.ConnectionInfo;
+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.ConsumerService;
+import org.apache.rocketmq.dashboard.util.JsonUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Controller;

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

@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-package org.apache.rocketmq.console.controller;
+package org.apache.rocketmq.dashboard.controller;
 
 import javax.annotation.Resource;
 
 import com.google.common.base.Strings;
-import org.apache.rocketmq.console.service.DashboardService;
+import org.apache.rocketmq.dashboard.service.DashboardService;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;

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

@@ -15,15 +15,15 @@
  *  limitations under the License.
  */
 
-package org.apache.rocketmq.console.controller;
+package org.apache.rocketmq.dashboard.controller;
 
-import org.apache.rocketmq.console.config.RMQConfigure;
-import org.apache.rocketmq.console.model.LoginInfo;
-import org.apache.rocketmq.console.model.User;
-import org.apache.rocketmq.console.model.UserInfo;
-import org.apache.rocketmq.console.service.UserService;
-import org.apache.rocketmq.console.support.JsonResult;
-import org.apache.rocketmq.console.util.WebUtil;
+import org.apache.rocketmq.dashboard.config.RMQConfigure;
+import org.apache.rocketmq.dashboard.model.LoginInfo;
+import org.apache.rocketmq.dashboard.model.User;
+import org.apache.rocketmq.dashboard.model.UserInfo;
+import org.apache.rocketmq.dashboard.service.UserService;
+import org.apache.rocketmq.dashboard.support.JsonResult;
+import org.apache.rocketmq.dashboard.util.WebUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -14,16 +14,16 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.rocketmq.console.controller;
+package org.apache.rocketmq.dashboard.controller;
 
 import com.google.common.collect.Maps;
 import org.apache.rocketmq.common.Pair;
 import org.apache.rocketmq.common.protocol.body.ConsumeMessageDirectlyResult;
-import org.apache.rocketmq.console.model.MessagePage;
-import org.apache.rocketmq.console.model.MessageView;
-import org.apache.rocketmq.console.model.request.MessageQuery;
-import org.apache.rocketmq.console.service.MessageService;
-import org.apache.rocketmq.console.util.JsonUtil;
+import org.apache.rocketmq.dashboard.model.MessagePage;
+import org.apache.rocketmq.dashboard.model.MessageView;
+import org.apache.rocketmq.dashboard.model.request.MessageQuery;
+import org.apache.rocketmq.dashboard.service.MessageService;
+import org.apache.rocketmq.dashboard.util.JsonUtil;
 import org.apache.rocketmq.tools.admin.api.MessageTrack;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

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

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.rocketmq.console.controller;
+package org.apache.rocketmq.dashboard.controller;
 
 import com.google.common.collect.Maps;
 
@@ -24,10 +24,10 @@ import java.util.Map;
 import javax.annotation.Resource;
 
 import org.apache.rocketmq.common.Pair;
-import org.apache.rocketmq.console.model.MessageView;
-import org.apache.rocketmq.console.model.trace.MessageTraceGraph;
-import org.apache.rocketmq.console.service.MessageService;
-import org.apache.rocketmq.console.service.MessageTraceService;
+import org.apache.rocketmq.dashboard.model.MessageView;
+import org.apache.rocketmq.dashboard.model.trace.MessageTraceGraph;
+import org.apache.rocketmq.dashboard.service.MessageService;
+import org.apache.rocketmq.dashboard.service.MessageTraceService;
 import org.apache.rocketmq.tools.admin.api.MessageTrack;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;

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

@@ -14,11 +14,11 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.rocketmq.console.controller;
+package org.apache.rocketmq.dashboard.controller;
 
 import javax.annotation.Resource;
-import org.apache.rocketmq.console.model.ConsumerMonitorConfig;
-import org.apache.rocketmq.console.service.MonitorService;
+import org.apache.rocketmq.dashboard.model.ConsumerMonitorConfig;
+import org.apache.rocketmq.dashboard.service.MonitorService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Controller;

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

@@ -14,11 +14,11 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.rocketmq.console.controller;
+package org.apache.rocketmq.dashboard.controller;
 
 import javax.annotation.Resource;
-import org.apache.rocketmq.console.aspect.admin.annotation.OriginalControllerReturnValue;
-import org.apache.rocketmq.console.service.OpsService;
+import org.apache.rocketmq.dashboard.aspect.admin.annotation.OriginalControllerReturnValue;
+import org.apache.rocketmq.dashboard.service.OpsService;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;

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

@@ -14,10 +14,10 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.rocketmq.console.controller;
+package org.apache.rocketmq.dashboard.controller;
 
 import javax.annotation.Resource;
-import org.apache.rocketmq.console.service.OpsService;
+import org.apache.rocketmq.dashboard.service.OpsService;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;

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

@@ -14,12 +14,12 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.rocketmq.console.controller;
+package org.apache.rocketmq.dashboard.controller;
 
 import javax.annotation.Resource;
 import org.apache.rocketmq.common.protocol.body.ProducerConnection;
-import org.apache.rocketmq.console.model.ConnectionInfo;
-import org.apache.rocketmq.console.service.ProducerService;
+import org.apache.rocketmq.dashboard.model.ConnectionInfo;
+import org.apache.rocketmq.dashboard.service.ProducerService;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;

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

@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.rocketmq.console.controller;
+package org.apache.rocketmq.dashboard.controller;
 
 import org.apache.rocketmq.client.consumer.DefaultMQPushConsumer;
 import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyContext;
@@ -29,8 +29,8 @@ import org.apache.rocketmq.common.message.MessageExt;
 import org.apache.rocketmq.remoting.exception.RemotingException;
 import java.util.List;
 import javax.annotation.Resource;
-import org.apache.rocketmq.console.config.RMQConfigure;
-import org.apache.rocketmq.console.util.JsonUtil;
+import org.apache.rocketmq.dashboard.config.RMQConfigure;
+import org.apache.rocketmq.dashboard.util.JsonUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Controller;

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

@@ -14,15 +14,15 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.rocketmq.console.controller;
+package org.apache.rocketmq.dashboard.controller;
 
 import org.apache.rocketmq.client.exception.MQClientException;
 import org.apache.rocketmq.remoting.exception.RemotingException;
-import org.apache.rocketmq.console.model.request.SendTopicMessageRequest;
-import org.apache.rocketmq.console.model.request.TopicConfigInfo;
-import org.apache.rocketmq.console.service.ConsumerService;
-import org.apache.rocketmq.console.service.TopicService;
-import org.apache.rocketmq.console.util.JsonUtil;
+import org.apache.rocketmq.dashboard.model.request.SendTopicMessageRequest;
+import org.apache.rocketmq.dashboard.model.request.TopicConfigInfo;
+import org.apache.rocketmq.dashboard.service.ConsumerService;
+import org.apache.rocketmq.dashboard.service.TopicService;
+import org.apache.rocketmq.dashboard.util.JsonUtil;
 import com.google.common.base.Preconditions;
 import org.apache.commons.collections.CollectionUtils;
 import org.slf4j.Logger;

src/main/java/org/apache/rocketmq/dashboard/exception/ServiceException.java

@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.rocketmq.console.exception;
+package org.apache.rocketmq.dashboard.exception;
 
 public class ServiceException extends RuntimeException {
     private static final long serialVersionUID = 9213584003139969215L;

src/main/java/org/apache/rocketmq/dashboard/filter/HttpBasicAuthorizedFilter.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.rocketmq.console.filter;
+package org.apache.rocketmq.dashboard.filter;
 
 import java.io.IOException;
 import javax.servlet.Filter;

src/main/java/org/apache/rocketmq/dashboard/interceptor/AuthInterceptor.java

@@ -15,9 +15,9 @@
  *  limitations under the License.
  */
 
-package org.apache.rocketmq.console.interceptor;
+package org.apache.rocketmq.dashboard.interceptor;
 
-import org.apache.rocketmq.console.service.LoginService;
+import org.apache.rocketmq.dashboard.service.LoginService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;

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

@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.rocketmq.console.model;
+package org.apache.rocketmq.dashboard.model;
 
 import com.google.common.collect.Sets;
 import java.util.Collection;

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

@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.rocketmq.console.model;
+package org.apache.rocketmq.dashboard.model;
 
 import org.apache.rocketmq.common.admin.RollbackStats;
 import com.google.common.collect.Lists;

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

@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.rocketmq.console.model;
+package org.apache.rocketmq.dashboard.model;
 
 public class ConsumerMonitorConfig {
     private int minCount;

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

@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.rocketmq.console.model;
+package org.apache.rocketmq.dashboard.model;
 
 import org.apache.rocketmq.common.protocol.heartbeat.ConsumeType;
 import org.apache.rocketmq.common.protocol.heartbeat.MessageModel;

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

@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package org.apache.rocketmq.console.model;
+package org.apache.rocketmq.dashboard.model;
 
 public class LoginInfo {
     private boolean loginRequired;

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

@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.rocketmq.console.model;
+package org.apache.rocketmq.dashboard.model;
 
 
 import org.springframework.data.domain.Page;

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

@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.rocketmq.console.model;
+package org.apache.rocketmq.dashboard.model;
 
 import org.springframework.data.domain.Page;
 

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

@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.rocketmq.console.model;
+package org.apache.rocketmq.dashboard.model;
 
 
 import org.springframework.data.domain.PageRequest;

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

@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-package org.apache.rocketmq.console.model;
+package org.apache.rocketmq.dashboard.model;
 
 import com.google.common.base.Charsets;
 import org.apache.rocketmq.client.trace.TraceBean;
 import org.apache.rocketmq.client.trace.TraceContext;
 import org.apache.rocketmq.common.message.MessageExt;
-import org.apache.rocketmq.console.model.trace.MessageTraceStatusEnum;
-import org.apache.rocketmq.console.util.MsgTraceDecodeUtil;
+import org.apache.rocketmq.dashboard.model.trace.MessageTraceStatusEnum;
+import org.apache.rocketmq.dashboard.util.MsgTraceDecodeUtil;
 
 import java.util.ArrayList;
 import java.util.List;

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

@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.rocketmq.console.model;
+package org.apache.rocketmq.dashboard.model;
 
 import org.apache.rocketmq.common.message.MessageExt;
 import com.google.common.base.Charsets;

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

@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.rocketmq.console.model;
+package org.apache.rocketmq.dashboard.model;
 
 import org.apache.rocketmq.common.message.MessageQueue;
 

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

@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.rocketmq.console.model;
+package org.apache.rocketmq.dashboard.model;
 
 import org.apache.rocketmq.common.admin.OffsetWrapper;
 import org.apache.rocketmq.common.message.MessageQueue;

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

@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.rocketmq.console.model;
+package org.apache.rocketmq.dashboard.model;
 
 import com.google.common.collect.Lists;
 

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

@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.rocketmq.console.model;
+package org.apache.rocketmq.dashboard.model;
 
 import org.hibernate.validator.constraints.Range;
 

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

@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.rocketmq.console.model;
+package org.apache.rocketmq.dashboard.model;
 
 public class UserInfo {
     public static final String USER_INFO = "userInfo";

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

@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.rocketmq.console.model.request;
+package org.apache.rocketmq.dashboard.model.request;
 
 import org.apache.rocketmq.common.subscription.SubscriptionGroupConfig;
 

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

@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.rocketmq.console.model.request;
+package org.apache.rocketmq.dashboard.model.request;
 
 import java.util.List;
 

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

@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.rocketmq.console.model.request;
+package org.apache.rocketmq.dashboard.model.request;
 
 public class MessageQuery {
     /**

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

@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.rocketmq.console.model.request;
+package org.apache.rocketmq.dashboard.model.request;
 
 import java.util.List;
 

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

@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.rocketmq.console.model.request;
+package org.apache.rocketmq.dashboard.model.request;
 
 import lombok.Data;
 

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

@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.rocketmq.console.model.request;
+package org.apache.rocketmq.dashboard.model.request;
 
 import com.google.common.base.Objects;
 

src/main/java/org/apache/rocketmq/dashboard/model/trace/MessageTraceGraph.java

@@ -15,10 +15,10 @@
  *  limitations under the License.
  */
 
-package org.apache.rocketmq.console.model.trace;
+package org.apache.rocketmq.dashboard.model.trace;
 
 import lombok.Data;
-import org.apache.rocketmq.console.model.MessageTraceView;
+import org.apache.rocketmq.dashboard.model.MessageTraceView;
 
 import java.util.List;
 

src/main/java/org/apache/rocketmq/dashboard/model/trace/MessageTraceStatusEnum.java

@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package org.apache.rocketmq.console.model.trace;
+package org.apache.rocketmq.dashboard.model.trace;
 
 import lombok.Getter;
 

src/main/java/org/apache/rocketmq/dashboard/model/trace/ProducerNode.java

@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.rocketmq.console.model.trace;
+package org.apache.rocketmq.dashboard.model.trace;
 
 import lombok.Data;
 

src/main/java/org/apache/rocketmq/dashboard/model/trace/SubscriptionNode.java

@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.rocketmq.console.model.trace;
+package org.apache.rocketmq.dashboard.model.trace;
 
 import lombok.Data;
 

src/main/java/org/apache/rocketmq/dashboard/model/trace/TraceNode.java

@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package org.apache.rocketmq.console.model.trace;
+package org.apache.rocketmq.dashboard.model.trace;
 
 import lombok.Data;
 

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

@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.rocketmq.console.service;
+package org.apache.rocketmq.dashboard.service;
 
 import org.apache.rocketmq.tools.admin.MQAdminExt;
 import com.google.common.base.Throwables;

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

@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package org.apache.rocketmq.console.service;
+package org.apache.rocketmq.dashboard.service;
 
 import java.util.Map;
 import java.util.Properties;

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

@@ -15,16 +15,16 @@
  *  limitations under the License.
  */
 
-package org.apache.rocketmq.console.service;
+package org.apache.rocketmq.dashboard.service;
 
 import org.apache.rocketmq.common.protocol.body.ConsumerConnection;
 import org.apache.rocketmq.common.protocol.body.ConsumerRunningInfo;
-import org.apache.rocketmq.console.model.ConsumerGroupRollBackStat;
-import org.apache.rocketmq.console.model.GroupConsumeInfo;
-import org.apache.rocketmq.console.model.TopicConsumerInfo;
-import org.apache.rocketmq.console.model.request.ConsumerConfigInfo;
-import org.apache.rocketmq.console.model.request.DeleteSubGroupRequest;
-import org.apache.rocketmq.console.model.request.ResetOffsetRequest;
+import org.apache.rocketmq.dashboard.model.ConsumerGroupRollBackStat;
+import org.apache.rocketmq.dashboard.model.GroupConsumeInfo;
+import org.apache.rocketmq.dashboard.model.TopicConsumerInfo;
+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 java.util.List;
 import java.util.Map;

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

@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.rocketmq.console.service;
+package org.apache.rocketmq.dashboard.service;
 
 import com.google.common.cache.LoadingCache;
 import java.io.File;
@@ -22,7 +22,7 @@ import java.util.List;
 import java.util.Map;
 
 public interface DashboardCollectService {
-    // todo just move the task to org.apache.rocketmq.console.task.DashboardCollectTask
+    // todo just move the task to org.apache.rocketmq.dashboard.task.DashboardCollectTask
     // the code can be reconstruct
     LoadingCache<String, List<String>> getBrokerMap();
 

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

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.rocketmq.console.service;
+package org.apache.rocketmq.dashboard.service;
 
 import java.util.List;
 import java.util.Map;

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

@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package org.apache.rocketmq.console.service;
+package org.apache.rocketmq.dashboard.service;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

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

@@ -15,15 +15,15 @@
  *  limitations under the License.
  */
 
-package org.apache.rocketmq.console.service;
+package org.apache.rocketmq.dashboard.service;
 
 import org.apache.rocketmq.common.Pair;
 import org.apache.rocketmq.common.message.MessageExt;
 import org.apache.rocketmq.common.protocol.body.ConsumeMessageDirectlyResult;
-import org.apache.rocketmq.console.model.MessagePage;
-import org.apache.rocketmq.console.model.request.MessageQuery;
+import org.apache.rocketmq.dashboard.model.MessagePage;
+import org.apache.rocketmq.dashboard.model.request.MessageQuery;
 import org.apache.rocketmq.tools.admin.api.MessageTrack;
-import org.apache.rocketmq.console.model.MessageView;
+import org.apache.rocketmq.dashboard.model.MessageView;
 
 import java.util.List;
 

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

@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-package org.apache.rocketmq.console.service;
+package org.apache.rocketmq.dashboard.service;
 
 import java.util.List;
-import org.apache.rocketmq.console.model.MessageTraceView;
-import org.apache.rocketmq.console.model.trace.MessageTraceGraph;
+import org.apache.rocketmq.dashboard.model.MessageTraceView;
+import org.apache.rocketmq.dashboard.model.trace.MessageTraceGraph;
 
 public interface MessageTraceService {
 

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

@@ -14,10 +14,10 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.rocketmq.console.service;
+package org.apache.rocketmq.dashboard.service;
 
 import java.util.Map;
-import org.apache.rocketmq.console.model.ConsumerMonitorConfig;
+import org.apache.rocketmq.dashboard.model.ConsumerMonitorConfig;
 
 public interface MonitorService {
     boolean createOrUpdateConsumerMonitor(String name, ConsumerMonitorConfig config);

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

@@ -14,10 +14,10 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.rocketmq.console.service;
+package org.apache.rocketmq.dashboard.service;
 
 import java.util.Map;
-import org.apache.rocketmq.console.service.checker.CheckerType;
+import org.apache.rocketmq.dashboard.service.checker.CheckerType;
 
 public interface OpsService {
     Map<String, Object> homePageInfo();

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

@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package org.apache.rocketmq.console.service;
+package org.apache.rocketmq.dashboard.service;
 
 import org.apache.rocketmq.common.protocol.body.ProducerConnection;
 

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

@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package org.apache.rocketmq.console.service;
+package org.apache.rocketmq.dashboard.service;
 
 import org.apache.rocketmq.client.producer.SendResult;
 import org.apache.rocketmq.common.TopicConfig;
@@ -23,8 +23,8 @@ 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.console.model.request.SendTopicMessageRequest;
-import org.apache.rocketmq.console.model.request.TopicConfigInfo;
+import org.apache.rocketmq.dashboard.model.request.SendTopicMessageRequest;
+import org.apache.rocketmq.dashboard.model.request.TopicConfigInfo;
 
 import java.util.List;
 

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

@@ -14,9 +14,9 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.rocketmq.console.service;
+package org.apache.rocketmq.dashboard.service;
 
-import org.apache.rocketmq.console.model.User;
+import org.apache.rocketmq.dashboard.model.User;
 
 public interface UserService {
     User queryByName(String name);

src/main/java/org/apache/rocketmq/dashboard/service/checker/CheckerType.java

@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.rocketmq.console.service.checker;
+package org.apache.rocketmq.dashboard.service.checker;
 
 public enum CheckerType {
     CLUSTER_HEALTH_CHECK,

src/main/java/org/apache/rocketmq/dashboard/service/checker/RocketMqChecker.java

@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.rocketmq.console.service.checker;
+package org.apache.rocketmq.dashboard.service.checker;
 
 public interface RocketMqChecker {
     public Object doCheck();

src/main/java/org/apache/rocketmq/dashboard/service/checker/impl/ClusterHealthCheckerImpl.java

@@ -14,10 +14,10 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.rocketmq.console.service.checker.impl;
+package org.apache.rocketmq.dashboard.service.checker.impl;
 
-import org.apache.rocketmq.console.service.checker.CheckerType;
-import org.apache.rocketmq.console.service.checker.RocketMqChecker;
+import org.apache.rocketmq.dashboard.service.checker.CheckerType;
+import org.apache.rocketmq.dashboard.service.checker.RocketMqChecker;
 import org.springframework.stereotype.Service;
 
 @Service

src/main/java/org/apache/rocketmq/dashboard/service/checker/impl/TopicOnlyOneBrokerCheckerImpl.java

@@ -14,10 +14,10 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.rocketmq.console.service.checker.impl;
+package org.apache.rocketmq.dashboard.service.checker.impl;
 
-import org.apache.rocketmq.console.service.checker.CheckerType;
-import org.apache.rocketmq.console.service.checker.RocketMqChecker;
+import org.apache.rocketmq.dashboard.service.checker.CheckerType;
+import org.apache.rocketmq.dashboard.service.checker.RocketMqChecker;
 import org.springframework.stereotype.Service;
 
 

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

@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.rocketmq.console.service.client;
+package org.apache.rocketmq.dashboard.service.client;
 
 import com.google.common.base.Throwables;
 import java.io.UnsupportedEncodingException;
@@ -54,7 +54,7 @@ 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.console.util.JsonUtil;
+import org.apache.rocketmq.dashboard.util.JsonUtil;
 import org.apache.rocketmq.remoting.RemotingClient;
 import org.apache.rocketmq.remoting.exception.RemotingCommandException;
 import org.apache.rocketmq.remoting.exception.RemotingConnectException;
@@ -409,13 +409,13 @@ public class MQAdminExtImpl implements MQAdminExt {
     @Override
     @Deprecated
     public void start() throws MQClientException {
-        throw new IllegalStateException("thisMethod is deprecated.use org.apache.rocketmq.console.aspect.admin.MQAdminAspect instead of this");
+        throw new IllegalStateException("thisMethod is deprecated.use org.apache.rocketmq.dashboard.aspect.admin.MQAdminAspect instead of this");
     }
 
     @Override
     @Deprecated
     public void shutdown() {
-        throw new IllegalStateException("thisMethod is deprecated.use org.apache.rocketmq.console.aspect.admin.MQAdminAspect instead of this");
+        throw new IllegalStateException("thisMethod is deprecated.use org.apache.rocketmq.dashboard.aspect.admin.MQAdminAspect instead of this");
     }
 
     // below is 3.2.6->3.5.8 updated

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

@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.rocketmq.console.service.client;
+package org.apache.rocketmq.dashboard.service.client;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.rocketmq.acl.common.AclClientRPCHook;

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

@@ -15,14 +15,14 @@
  *  limitations under the License.
  */
 
-package org.apache.rocketmq.console.service.impl;
+package org.apache.rocketmq.dashboard.service.impl;
 
 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.console.service.ClusterService;
-import org.apache.rocketmq.console.util.JsonUtil;
+import org.apache.rocketmq.dashboard.service.ClusterService;
+import org.apache.rocketmq.dashboard.util.JsonUtil;
 import com.google.common.base.Throwables;
 import com.google.common.collect.Maps;
 import org.slf4j.Logger;

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

@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package org.apache.rocketmq.console.service.impl;
+package org.apache.rocketmq.dashboard.service.impl;
 
 import com.google.common.base.Predicate;
 import com.google.common.base.Throwables;
@@ -43,16 +43,16 @@ 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.console.aspect.admin.annotation.MultiMQAdminCmdMethod;
-import org.apache.rocketmq.console.model.ConsumerGroupRollBackStat;
-import org.apache.rocketmq.console.model.GroupConsumeInfo;
-import org.apache.rocketmq.console.model.QueueStatInfo;
-import org.apache.rocketmq.console.model.TopicConsumerInfo;
-import org.apache.rocketmq.console.model.request.ConsumerConfigInfo;
-import org.apache.rocketmq.console.model.request.DeleteSubGroupRequest;
-import org.apache.rocketmq.console.model.request.ResetOffsetRequest;
-import org.apache.rocketmq.console.service.AbstractCommonService;
-import org.apache.rocketmq.console.service.ConsumerService;
+import org.apache.rocketmq.dashboard.aspect.admin.annotation.MultiMQAdminCmdMethod;
+import org.apache.rocketmq.dashboard.model.ConsumerGroupRollBackStat;
+import org.apache.rocketmq.dashboard.model.GroupConsumeInfo;
+import org.apache.rocketmq.dashboard.model.QueueStatInfo;
+import org.apache.rocketmq.dashboard.model.TopicConsumerInfo;
+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.AbstractCommonService;
+import org.apache.rocketmq.dashboard.service.ConsumerService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;

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

@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.rocketmq.console.service.impl;
+package org.apache.rocketmq.dashboard.service.impl;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -35,8 +35,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import javax.annotation.Resource;
-import org.apache.rocketmq.console.config.RMQConfigure;
-import org.apache.rocketmq.console.service.DashboardCollectService;
+import org.apache.rocketmq.dashboard.config.RMQConfigure;
+import org.apache.rocketmq.dashboard.service.DashboardCollectService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
@@ -133,7 +133,7 @@ public class DashboardCollectServiceImpl implements DashboardCollectService {
 
     @Override
     public Map<String, List<String>> getBrokerCache(String date) {
-        String dataLocationPath = configure.getConsoleCollectData();
+        String dataLocationPath = configure.getDashboardCollectData();
         File file = new File(dataLocationPath + date + ".json");
         if (!file.exists()) {
             log.info(String.format("No dashboard data for broker cache data: %s", date));
@@ -144,7 +144,7 @@ public class DashboardCollectServiceImpl implements DashboardCollectService {
 
     @Override
     public Map<String, List<String>> getTopicCache(String date) {
-        String dataLocationPath = configure.getConsoleCollectData();
+        String dataLocationPath = configure.getDashboardCollectData();
         File file = new File(dataLocationPath + date + "_topic" + ".json");
         if (!file.exists()) {
             log.info(String.format("No dashboard data for data: %s", date));

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

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.rocketmq.console.service.impl;
+package org.apache.rocketmq.dashboard.service.impl;
 
 import com.google.common.collect.Lists;
 import java.text.DateFormat;
@@ -24,8 +24,8 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import javax.annotation.Resource;
-import org.apache.rocketmq.console.service.DashboardCollectService;
-import org.apache.rocketmq.console.service.DashboardService;
+import org.apache.rocketmq.dashboard.service.DashboardCollectService;
+import org.apache.rocketmq.dashboard.service.DashboardService;
 import org.springframework.stereotype.Service;
 
 @Service

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

@@ -15,12 +15,12 @@
  *  limitations under the License.
  */
 
-package org.apache.rocketmq.console.service.impl;
+package org.apache.rocketmq.dashboard.service.impl;
 
-import org.apache.rocketmq.console.config.RMQConfigure;
-import org.apache.rocketmq.console.service.LoginService;
-import org.apache.rocketmq.console.service.UserService;
-import org.apache.rocketmq.console.util.WebUtil;
+import org.apache.rocketmq.dashboard.config.RMQConfigure;
+import org.apache.rocketmq.dashboard.service.LoginService;
+import org.apache.rocketmq.dashboard.service.UserService;
+import org.apache.rocketmq.dashboard.util.WebUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package org.apache.rocketmq.console.service.impl;
+package org.apache.rocketmq.dashboard.service.impl;
 
 
 import com.google.common.base.Function;
@@ -39,15 +39,15 @@ import org.apache.rocketmq.common.message.MessageQueue;
 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.console.config.RMQConfigure;
-import org.apache.rocketmq.console.exception.ServiceException;
-import org.apache.rocketmq.console.model.QueueOffsetInfo;
-import org.apache.rocketmq.console.model.MessageView;
-import org.apache.rocketmq.console.model.MessagePage;
-import org.apache.rocketmq.console.model.MessagePageTask;
-import org.apache.rocketmq.console.model.MessageQueryByPage;
-import org.apache.rocketmq.console.model.request.MessageQuery;
-import org.apache.rocketmq.console.service.MessageService;
+import org.apache.rocketmq.dashboard.config.RMQConfigure;
+import org.apache.rocketmq.dashboard.exception.ServiceException;
+import org.apache.rocketmq.dashboard.model.QueueOffsetInfo;
+import org.apache.rocketmq.dashboard.model.MessageView;
+import org.apache.rocketmq.dashboard.model.MessagePage;
+import org.apache.rocketmq.dashboard.model.MessagePageTask;
+import org.apache.rocketmq.dashboard.model.MessageQueryByPage;
+import org.apache.rocketmq.dashboard.model.request.MessageQuery;
+import org.apache.rocketmq.dashboard.service.MessageService;
 import org.apache.rocketmq.remoting.RPCHook;
 import org.apache.rocketmq.tools.admin.MQAdminExt;
 import org.apache.rocketmq.tools.admin.api.MessageTrack;

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

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.rocketmq.console.service.impl;
+package org.apache.rocketmq.dashboard.service.impl;
 
 import com.google.common.base.Function;
 import com.google.common.collect.Lists;
@@ -33,14 +33,14 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.rocketmq.client.trace.TraceType;
 import org.apache.rocketmq.common.Pair;
 import org.apache.rocketmq.common.message.MessageExt;
-import org.apache.rocketmq.console.config.RMQConfigure;
-import org.apache.rocketmq.console.model.MessageTraceView;
-import org.apache.rocketmq.console.model.trace.ProducerNode;
-import org.apache.rocketmq.console.model.trace.MessageTraceGraph;
-import org.apache.rocketmq.console.model.trace.SubscriptionNode;
-import org.apache.rocketmq.console.model.trace.TraceNode;
-import org.apache.rocketmq.console.model.trace.MessageTraceStatusEnum;
-import org.apache.rocketmq.console.service.MessageTraceService;
+import org.apache.rocketmq.dashboard.config.RMQConfigure;
+import org.apache.rocketmq.dashboard.model.MessageTraceView;
+import org.apache.rocketmq.dashboard.model.trace.ProducerNode;
+import org.apache.rocketmq.dashboard.model.trace.MessageTraceGraph;
+import org.apache.rocketmq.dashboard.model.trace.SubscriptionNode;
+import org.apache.rocketmq.dashboard.model.trace.TraceNode;
+import org.apache.rocketmq.dashboard.model.trace.MessageTraceStatusEnum;
+import org.apache.rocketmq.dashboard.service.MessageTraceService;
 import org.apache.rocketmq.tools.admin.MQAdminExt;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

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

@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.rocketmq.console.service.impl;
+package org.apache.rocketmq.dashboard.service.impl;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.google.common.base.Throwables;
@@ -25,10 +25,10 @@ import java.util.concurrent.ConcurrentHashMap;
 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
 import org.apache.rocketmq.common.MixAll;
-import org.apache.rocketmq.console.config.RMQConfigure;
-import org.apache.rocketmq.console.model.ConsumerMonitorConfig;
-import org.apache.rocketmq.console.service.MonitorService;
-import org.apache.rocketmq.console.util.JsonUtil;
+import org.apache.rocketmq.dashboard.config.RMQConfigure;
+import org.apache.rocketmq.dashboard.model.ConsumerMonitorConfig;
+import org.apache.rocketmq.dashboard.service.MonitorService;
+import org.apache.rocketmq.dashboard.util.JsonUtil;
 import org.springframework.stereotype.Service;
 
 @Service
@@ -66,7 +66,7 @@ public class MonitorServiceImpl implements MonitorService {
 
     //rocketmq.console.data.path/monitor/consumerMonitorConfig.json
     private String getConsumerMonitorConfigDataPath() {
-        return configure.getRocketMqConsoleDataPath() + File.separatorChar + "monitor" + File.separatorChar + "consumerMonitorConfig.json";
+        return configure.getRocketMqDashboardDataPath() + File.separatorChar + "monitor" + File.separatorChar + "consumerMonitorConfig.json";
     }
 
     private String getConsumerMonitorConfigDataPathBackUp() {

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

@@ -14,18 +14,18 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.rocketmq.console.service.impl;
+package org.apache.rocketmq.dashboard.service.impl;
 
 import com.google.common.base.Splitter;
 import com.google.common.collect.Maps;
 import java.util.List;
 import java.util.Map;
 import javax.annotation.Resource;
-import org.apache.rocketmq.console.config.RMQConfigure;
-import org.apache.rocketmq.console.service.AbstractCommonService;
-import org.apache.rocketmq.console.service.OpsService;
-import org.apache.rocketmq.console.service.checker.CheckerType;
-import org.apache.rocketmq.console.service.checker.RocketMqChecker;
+import org.apache.rocketmq.dashboard.config.RMQConfigure;
+import org.apache.rocketmq.dashboard.service.AbstractCommonService;
+import org.apache.rocketmq.dashboard.service.OpsService;
+import org.apache.rocketmq.dashboard.service.checker.CheckerType;
+import org.apache.rocketmq.dashboard.service.checker.RocketMqChecker;
 import org.springframework.stereotype.Service;
 
 @Service

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

@@ -15,12 +15,12 @@
  *  limitations under the License.
  */
 
-package org.apache.rocketmq.console.service.impl;
+package org.apache.rocketmq.dashboard.service.impl;
 
 import com.google.common.base.Throwables;
 import javax.annotation.Resource;
 import org.apache.rocketmq.common.protocol.body.ProducerConnection;
-import org.apache.rocketmq.console.service.ProducerService;
+import org.apache.rocketmq.dashboard.service.ProducerService;
 import org.apache.rocketmq.tools.admin.MQAdminExt;
 import org.springframework.stereotype.Service;
 

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

@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package org.apache.rocketmq.console.service.impl;
+package org.apache.rocketmq.dashboard.service.impl;
 
 import com.google.common.base.Throwables;
 import com.google.common.collect.Lists;
@@ -36,11 +36,11 @@ 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.console.config.RMQConfigure;
-import org.apache.rocketmq.console.model.request.SendTopicMessageRequest;
-import org.apache.rocketmq.console.model.request.TopicConfigInfo;
-import org.apache.rocketmq.console.service.AbstractCommonService;
-import org.apache.rocketmq.console.service.TopicService;
+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.service.AbstractCommonService;
+import org.apache.rocketmq.dashboard.service.TopicService;
 import org.apache.rocketmq.remoting.RPCHook;
 import org.apache.rocketmq.tools.command.CommandUtil;
 import org.joor.Reflect;

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

@@ -15,12 +15,12 @@
  *  limitations under the License.
  */
 
-package org.apache.rocketmq.console.service.impl;
+package org.apache.rocketmq.dashboard.service.impl;
 
-import org.apache.rocketmq.console.config.RMQConfigure;
-import org.apache.rocketmq.console.exception.ServiceException;
-import org.apache.rocketmq.console.model.User;
-import org.apache.rocketmq.console.service.UserService;
+import org.apache.rocketmq.dashboard.config.RMQConfigure;
+import org.apache.rocketmq.dashboard.exception.ServiceException;
+import org.apache.rocketmq.dashboard.model.User;
+import org.apache.rocketmq.dashboard.service.UserService;
 import org.apache.rocketmq.srvutil.FileWatchService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -70,14 +70,14 @@ public class UserServiceImpl implements UserService, InitializingBean {
 
 
         public FileBasedUserInfoStore(RMQConfigure configure) {
-            filePath = configure.getRocketMqConsoleDataPath() + File.separator + FILE_NAME;
+            filePath = configure.getRocketMqDashboardDataPath() + File.separator + FILE_NAME;
             if (!new File(filePath).exists()) {
                 //Use the default path
                 InputStream inputStream = getClass().getResourceAsStream("/" + FILE_NAME);
                 if (inputStream == null) {
                     log.error(String.format("Can not found the file %s in Spring Boot jar", FILE_NAME));
-                    System.out.printf(String.format("Can not found file %s in Spring Boot jar or %s, stop the  console starting",
-                            FILE_NAME, configure.getRocketMqConsoleDataPath()));
+                    System.out.printf(String.format("Can not found file %s in Spring Boot jar or %s, stop the dashboard starting",
+                            FILE_NAME, configure.getRocketMqDashboardDataPath()));
                     System.exit(1);
                 } else {
                     load(inputStream);

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

@@ -15,17 +15,17 @@
  * limitations under the License.
  */
 
-package org.apache.rocketmq.console.support;
+package org.apache.rocketmq.dashboard.support;
 
 import javax.servlet.http.HttpServletRequest;
-import org.apache.rocketmq.console.exception.ServiceException;
+import org.apache.rocketmq.dashboard.exception.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.web.bind.annotation.ControllerAdvice;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-@ControllerAdvice(basePackages = "org.apache.rocketmq.console")
+@ControllerAdvice(basePackages = "org.apache.rocketmq.dashboard")
 public class GlobalExceptionHandler {
     private Logger logger = LoggerFactory.getLogger(GlobalExceptionHandler.class);
 

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

@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-package org.apache.rocketmq.console.support;
+package org.apache.rocketmq.dashboard.support;
 
 import java.lang.annotation.Annotation;
-import org.apache.rocketmq.console.aspect.admin.annotation.OriginalControllerReturnValue;
+import org.apache.rocketmq.dashboard.aspect.admin.annotation.OriginalControllerReturnValue;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.core.MethodParameter;
@@ -29,7 +29,7 @@ import org.springframework.http.server.ServerHttpResponse;
 import org.springframework.web.bind.annotation.ControllerAdvice;
 import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice;
 
-@ControllerAdvice(basePackages = "org.apache.rocketmq.console")
+@ControllerAdvice(basePackages = "org.apache.rocketmq.dashboard")
 public class GlobalRestfulResponseBodyAdvice implements ResponseBodyAdvice<Object> {
 
     private Logger logger = LoggerFactory.getLogger(GlobalRestfulResponseBodyAdvice.class);

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

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.rocketmq.console.support;
+package org.apache.rocketmq.dashboard.support;
 
 public class JsonResult<T> {
     private int status = 0;

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

@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.rocketmq.console.task;
+package org.apache.rocketmq.dashboard.task;
 
 import com.google.common.base.Stopwatch;
 import org.apache.rocketmq.common.protocol.body.ClusterInfo;
@@ -24,7 +24,7 @@ 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.console.aspect.admin.annotation.MultiMQAdminCmdMethod;
+import org.apache.rocketmq.dashboard.aspect.admin.annotation.MultiMQAdminCmdMethod;
 import org.apache.rocketmq.store.stats.BrokerStatsManager;
 import org.apache.rocketmq.tools.admin.MQAdminExt;
 import org.apache.rocketmq.tools.command.stats.StatsAllSubCommand;
@@ -47,9 +47,9 @@ import java.util.concurrent.ExecutionException;
 import javax.annotation.Resource;
 import org.apache.rocketmq.common.MixAll;
 import org.apache.rocketmq.common.protocol.body.BrokerStatsData;
-import org.apache.rocketmq.console.config.RMQConfigure;
-import org.apache.rocketmq.console.service.DashboardCollectService;
-import org.apache.rocketmq.console.util.JsonUtil;
+import org.apache.rocketmq.dashboard.config.RMQConfigure;
+import org.apache.rocketmq.dashboard.service.DashboardCollectService;
+import org.apache.rocketmq.dashboard.util.JsonUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.scheduling.annotation.Scheduled;
@@ -233,7 +233,7 @@ public class DashboardCollectTask {
             return;
         }
         //one day refresh cache one time
-        String dataLocationPath = rmqConfigure.getConsoleCollectData();
+        String dataLocationPath = rmqConfigure.getDashboardCollectData();
         DateFormat format = new SimpleDateFormat("yyyy-MM-dd");
         String nowDateStr = format.format(new Date());
         String currentDateStr = format.format(currentDate);

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

@@ -14,15 +14,15 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.rocketmq.console.task;
+package org.apache.rocketmq.dashboard.task;
 
 import java.util.Map;
 import javax.annotation.Resource;
-import org.apache.rocketmq.console.model.ConsumerMonitorConfig;
-import org.apache.rocketmq.console.model.GroupConsumeInfo;
-import org.apache.rocketmq.console.service.ConsumerService;
-import org.apache.rocketmq.console.service.MonitorService;
-import org.apache.rocketmq.console.util.JsonUtil;
+import org.apache.rocketmq.dashboard.model.ConsumerMonitorConfig;
+import org.apache.rocketmq.dashboard.model.GroupConsumeInfo;
+import org.apache.rocketmq.dashboard.service.ConsumerService;
+import org.apache.rocketmq.dashboard.service.MonitorService;
+import org.apache.rocketmq.dashboard.util.JsonUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;

src/main/java/org/apache/rocketmq/dashboard/util/JsonUtil.java

@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package org.apache.rocketmq.console.util;
+package org.apache.rocketmq.dashboard.util;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.core.type.TypeReference;

src/main/java/org/apache/rocketmq/dashboard/util/MsgTraceDecodeUtil.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.rocketmq.console.util;
+package org.apache.rocketmq.dashboard.util;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/org/apache/rocketmq/dashboard/util/WebUtil.java

@@ -15,11 +15,11 @@
  *  limitations under the License.
  */
 
-package org.apache.rocketmq.console.util;
+package org.apache.rocketmq.dashboard.util;
 
 import org.apache.commons.lang3.StringUtils;
-import org.apache.rocketmq.console.model.User;
-import org.apache.rocketmq.console.model.UserInfo;
+import org.apache.rocketmq.dashboard.model.User;
+import org.apache.rocketmq.dashboard.model.UserInfo;
 
 import javax.servlet.ServletRequest;
 import javax.servlet.http.HttpServletRequest;

src/main/resources/application.properties

@@ -8,7 +8,7 @@ server.port=8080
 #server.ssl.keyAlias=rmqcngkey
 
 #spring.application.index=true
-spring.application.name=rocketmq-console
+spring.application.name=rocketmq-dashboard
 spring.http.encoding.charset=UTF-8
 spring.http.encoding.enabled=true
 spring.http.encoding.force=true

src/main/resources/static/index.html

@@ -18,7 +18,7 @@
 <html lang="en" ng-app="app">
 <head>
     <meta charset="UTF-8">
-    <title>RocketMq-console-ng</title>
+    <title>RocketMQ-Dashboard</title>
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name='description' content=''>

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

@@ -1,5 +1,5 @@
 var en = {
-    "TITLE": "RocketMQ-Console",
+    "TITLE": "RocketMQ-Dashboard",
     "CLOSE": "Close",
     "NO": "NO.",
     "ADDRESS": "Address",
@@ -84,6 +84,6 @@ var en = {
     "PASSWORD":"Password",
     "NO_DATA":"Don't have ",
     "SYSTEM":"SYSTEM",
-    "WELCOME":"Hi, welcome using RocketMQ Console",
+    "WELCOME":"Hi, welcome using RocketMQ Dashboard",
     "ENABLE_MESSAGE_TRACE":"Enable Message Trace"
 }

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

@@ -1,5 +1,5 @@
 var zh = {
-    "TITLE": "RocketMQ控制台",
+    "TITLE": "RocketMQ仪表板",
     "CLOSE": "关闭",
     "NO": "编号",
     "ADDRESS": "地址",
@@ -85,6 +85,6 @@ var zh = {
     "PASSWORD":"密码",
     "NO_DATA":"不存在 ",
     "SYSTEM":"系统",
-    "WELCOME":"您好，欢迎使用RocketMQ控制台",
+    "WELCOME":"您好，欢迎使用RocketMQ仪表盘",
     "ENABLE_MESSAGE_TRACE":"开启消息轨迹"
 }

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

@@ -18,7 +18,7 @@
   -->
 <head>
     <meta charset="UTF-8">
-    <title>RocketMq-console-ng</title>
+    <title>RocketMQ-Dashboard</title>
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name='description' content=''>

src/main/resources/users.properties

@@ -1,4 +1,4 @@
-# This file supports hot change, any change will be auto-reloaded without Console restarting.
+# This file supports hot change, any change will be auto-reloaded without Dashboard restarting.
 # Format: a user per line, username=password[,N] #N is optional, 0 (Normal User); 1 (Admin)
 
 # Define Admin

src/test/java/org/apache/rocketmq/dashboard/BaseTest.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.rocketmq.console;
+package org.apache.rocketmq.dashboard;
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;

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

@@ -1,10 +1,10 @@
-package org.apache.rocketmq.console.admin;
+package org.apache.rocketmq.dashboard.admin;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
-import org.apache.rocketmq.console.aspect.admin.MQAdminAspect;
-import org.apache.rocketmq.console.aspect.admin.annotation.MultiMQAdminCmdMethod;
-import org.apache.rocketmq.console.config.RMQConfigure;
+import org.apache.rocketmq.dashboard.aspect.admin.MQAdminAspect;
+import org.apache.rocketmq.dashboard.aspect.admin.annotation.MultiMQAdminCmdMethod;
+import org.apache.rocketmq.dashboard.config.RMQConfigure;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.reflect.MethodSignature;
 import org.junit.Test;

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

@@ -1,4 +1,4 @@
-package org.apache.rocketmq.console.admin;
+package org.apache.rocketmq.dashboard.admin;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
@@ -38,9 +38,9 @@ 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.console.service.client.MQAdminExtImpl;
-import org.apache.rocketmq.console.service.client.MQAdminInstance;
-import org.apache.rocketmq.console.util.MockObjectUtil;
+import org.apache.rocketmq.dashboard.service.client.MQAdminExtImpl;
+import org.apache.rocketmq.dashboard.service.client.MQAdminInstance;
+import org.apache.rocketmq.dashboard.util.MockObjectUtil;
 import org.apache.rocketmq.remoting.RemotingClient;
 import org.apache.rocketmq.remoting.protocol.RemotingCommand;
 import org.apache.rocketmq.remoting.protocol.RemotingSerializable;

src/test/java/org/apache/rocketmq/dashboard/config/RMQConfigureTest.java

@@ -1,4 +1,4 @@
-package org.apache.rocketmq.console.config;
+package org.apache.rocketmq.dashboard.config;
 
 import java.io.File;
 import org.apache.rocketmq.common.topic.TopicValidator;
@@ -32,8 +32,8 @@ public class RMQConfigureTest {
         Assert.assertEquals(rmqConfigure.getSecretKey(), "12345678");
         Assert.assertTrue(rmqConfigure.isACLEnabled());
         Assert.assertTrue(rmqConfigure.isUseTLS());
-        Assert.assertEquals(rmqConfigure.getConsoleCollectData(), "/tmp/rocketmq-console/data/test" + File.separator + "dashboard");
-        Assert.assertEquals(rmqConfigure.getRocketMqConsoleDataPath(), "/tmp/rocketmq-console/data/test");
+        Assert.assertEquals(rmqConfigure.getDashboardCollectData(), "/tmp/rocketmq-console/data/test" + File.separator + "dashboard");
+        Assert.assertEquals(rmqConfigure.getRocketMqDashboardDataPath(), "/tmp/rocketmq-console/data/test");
         Assert.assertEquals(rmqConfigure.getIsVIPChannel(), "true");
         Assert.assertTrue(rmqConfigure.isEnableDashBoardCollect());
         Assert.assertTrue(rmqConfigure.isLoginRequired());

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

@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-package org.apache.rocketmq.console.controller;
+package org.apache.rocketmq.dashboard.controller;
 
-import org.apache.rocketmq.console.BaseTest;
-import org.apache.rocketmq.console.config.RMQConfigure;
-import org.apache.rocketmq.console.support.GlobalExceptionHandler;
-import org.apache.rocketmq.console.support.GlobalRestfulResponseBodyAdvice;
-import org.apache.rocketmq.console.util.MyPrintingResultHandler;
+import org.apache.rocketmq.dashboard.BaseTest;
+import org.apache.rocketmq.dashboard.config.RMQConfigure;
+import org.apache.rocketmq.dashboard.support.GlobalExceptionHandler;
+import org.apache.rocketmq.dashboard.support.GlobalRestfulResponseBodyAdvice;
+import org.apache.rocketmq.dashboard.util.MyPrintingResultHandler;
 import org.apache.rocketmq.tools.admin.MQAdminExt;
 import org.junit.Before;
 import org.mockito.Mock;

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

@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.rocketmq.console.controller;
+package org.apache.rocketmq.dashboard.controller;
 
 import java.util.HashMap;
 import java.util.Properties;
 import org.apache.rocketmq.common.protocol.body.ClusterInfo;
 import org.apache.rocketmq.common.protocol.body.KVTable;
-import org.apache.rocketmq.console.service.impl.ClusterServiceImpl;
-import org.apache.rocketmq.console.util.MockObjectUtil;
+import org.apache.rocketmq.dashboard.service.impl.ClusterServiceImpl;
+import org.apache.rocketmq.dashboard.util.MockObjectUtil;
 import org.junit.Test;
 import org.mockito.InjectMocks;
 import org.mockito.Spy;

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

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.rocketmq.console.controller;
+package org.apache.rocketmq.dashboard.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.google.common.collect.Lists;
@@ -34,11 +34,11 @@ 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.console.model.request.ConsumerConfigInfo;
-import org.apache.rocketmq.console.model.request.DeleteSubGroupRequest;
-import org.apache.rocketmq.console.model.request.ResetOffsetRequest;
-import org.apache.rocketmq.console.service.impl.ConsumerServiceImpl;
-import org.apache.rocketmq.console.util.MockObjectUtil;
+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.junit.Before;
 import org.junit.Test;
 import org.mockito.InjectMocks;