This is an automated email from the ASF dual-hosted git repository.

vongosling pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/rocketmq-dashboard.git

commit 39d9db8a48c432116d498ad9509c223495239d20
Merge: 446d897 cd3f0fc
Author: von gosling <[email protected]>
AuthorDate: Fri Aug 13 23:22:06 2021 +0800

    Merge pull request #3 from apache/init
    
    [#2] Use rocketmq-dashboard instead of rocketmq-console

 NOTICE                                             |  2 +-
 README.md                                          |  8 ++++----
 doc/1_0_0/UserGuide_CN.md                          |  8 ++++----
 doc/1_0_0/UserGuide_EN.md                          | 14 +++++++-------
 pom.xml                                            |  4 ++--
 src/main/docker/Dockerfile                         |  6 +++---
 .../rocketmq/{console => dashboard}/App.java       |  2 +-
 .../aspect/admin/MQAdminAspect.java                | 12 ++++++------
 .../admin/annotation/MultiMQAdminCmdMethod.java    |  2 +-
 .../annotation/OriginalControllerReturnValue.java  |  2 +-
 .../config/AuthWebMVCConfigurerAdapter.java        |  8 ++++----
 .../config/RMQConfigure.java                       |  6 +++---
 .../controller/ClusterController.java              |  4 ++--
 .../controller/ConsumerController.java             | 14 +++++++-------
 .../controller/DashboardController.java            |  4 ++--
 .../controller/LoginController.java                | 16 ++++++++--------
 .../controller/MessageController.java              | 12 ++++++------
 .../controller/MessageTraceController.java         | 10 +++++-----
 .../controller/MonitorController.java              |  6 +++---
 .../controller/NamesvrController.java              |  6 +++---
 .../controller/OpsController.java                  |  4 ++--
 .../controller/ProducerController.java             |  6 +++---
 .../controller/TestController.java                 |  6 +++---
 .../controller/TopicController.java                | 12 ++++++------
 .../exception/ServiceException.java                |  2 +-
 .../filter/HttpBasicAuthorizedFilter.java          |  2 +-
 .../interceptor/AuthInterceptor.java               |  4 ++--
 .../model/ConnectionInfo.java                      |  2 +-
 .../model/ConsumerGroupRollBackStat.java           |  2 +-
 .../model/ConsumerMonitorConfig.java               |  2 +-
 .../model/GroupConsumeInfo.java                    |  2 +-
 .../{console => dashboard}/model/LoginInfo.java    |  2 +-
 .../{console => dashboard}/model/MessagePage.java  |  2 +-
 .../model/MessagePageTask.java                     |  2 +-
 .../model/MessageQueryByPage.java                  |  2 +-
 .../model/MessageTraceView.java                    |  6 +++---
 .../{console => dashboard}/model/MessageView.java  |  2 +-
 .../model/QueueOffsetInfo.java                     |  2 +-
 .../model/QueueStatInfo.java                       |  2 +-
 .../model/TopicConsumerInfo.java                   |  2 +-
 .../{console => dashboard}/model/User.java         |  2 +-
 .../{console => dashboard}/model/UserInfo.java     |  2 +-
 .../model/request/ConsumerConfigInfo.java          |  2 +-
 .../model/request/DeleteSubGroupRequest.java       |  2 +-
 .../model/request/MessageQuery.java                |  2 +-
 .../model/request/ResetOffsetRequest.java          |  2 +-
 .../model/request/SendTopicMessageRequest.java     |  2 +-
 .../model/request/TopicConfigInfo.java             |  2 +-
 .../model/trace/MessageTraceGraph.java             |  4 ++--
 .../model/trace/MessageTraceStatusEnum.java        |  2 +-
 .../model/trace/ProducerNode.java                  |  2 +-
 .../model/trace/SubscriptionNode.java              |  2 +-
 .../model/trace/TraceNode.java                     |  2 +-
 .../service/AbstractCommonService.java             |  2 +-
 .../service/ClusterService.java                    |  2 +-
 .../service/ConsumerService.java                   | 14 +++++++-------
 .../service/DashboardCollectService.java           |  4 ++--
 .../service/DashboardService.java                  |  2 +-
 .../service/LoginService.java                      |  2 +-
 .../service/MessageService.java                    |  8 ++++----
 .../service/MessageTraceService.java               |  6 +++---
 .../service/MonitorService.java                    |  4 ++--
 .../{console => dashboard}/service/OpsService.java |  4 ++--
 .../service/ProducerService.java                   |  2 +-
 .../service/TopicService.java                      |  6 +++---
 .../service/UserService.java                       |  4 ++--
 .../service/checker/CheckerType.java               |  2 +-
 .../service/checker/RocketMqChecker.java           |  2 +-
 .../checker/impl/ClusterHealthCheckerImpl.java     |  6 +++---
 .../impl/TopicOnlyOneBrokerCheckerImpl.java        |  6 +++---
 .../service/client/MQAdminExtImpl.java             |  8 ++++----
 .../service/client/MQAdminInstance.java            |  2 +-
 .../service/impl/ClusterServiceImpl.java           |  6 +++---
 .../service/impl/ConsumerServiceImpl.java          | 22 +++++++++++-----------
 .../service/impl/DashboardCollectServiceImpl.java  | 10 +++++-----
 .../service/impl/DashboardServiceImpl.java         |  6 +++---
 .../service/impl/LoginServiceImpl.java             | 10 +++++-----
 .../service/impl/MessageServiceImpl.java           | 20 ++++++++++----------
 .../service/impl/MessageTraceServiceImpl.java      | 18 +++++++++---------
 .../service/impl/MonitorServiceImpl.java           | 12 ++++++------
 .../service/impl/OpsServiceImpl.java               | 12 ++++++------
 .../service/impl/ProducerServiceImpl.java          |  4 ++--
 .../service/impl/TopicServiceImpl.java             | 12 ++++++------
 .../service/impl/UserServiceImpl.java              | 16 ++++++++--------
 .../support/GlobalExceptionHandler.java            |  6 +++---
 .../support/GlobalRestfulResponseBodyAdvice.java   |  6 +++---
 .../{console => dashboard}/support/JsonResult.java |  2 +-
 .../task/DashboardCollectTask.java                 | 12 ++++++------
 .../{console => dashboard}/task/MonitorTask.java   | 12 ++++++------
 .../{console => dashboard}/util/JsonUtil.java      |  2 +-
 .../util/MsgTraceDecodeUtil.java                   |  2 +-
 .../{console => dashboard}/util/WebUtil.java       |  6 +++---
 src/main/resources/application.properties          |  2 +-
 src/main/resources/static/index.html               |  2 +-
 src/main/resources/static/src/i18n/en.js           |  4 ++--
 src/main/resources/static/src/i18n/zh.js           |  4 ++--
 .../static/view/pages/un_support_browser.html      |  2 +-
 src/main/resources/users.properties                |  2 +-
 .../rocketmq/{console => dashboard}/BaseTest.java  |  2 +-
 .../admin/MQAdminAspectTest.java                   |  8 ++++----
 .../admin/MQAdminExtImplTest.java                  |  8 ++++----
 .../config/RMQConfigureTest.java                   |  6 +++---
 .../controller/BaseControllerTest.java             | 12 ++++++------
 .../controller/ClusterControllerTest.java          |  6 +++---
 .../controller/ConsumerControllerTest.java         | 12 ++++++------
 .../controller/DashboardControllerTest.java        | 10 +++++-----
 .../controller/LoginControllerTest.java            | 10 +++++-----
 .../controller/MessageControllerTest.java          | 10 +++++-----
 .../controller/MessageTraceControllerTest.java     |  8 ++++----
 .../controller/MonitorControllerTest.java          | 12 ++++++------
 .../controller/NamesvrControllerTest.java          |  4 ++--
 .../controller/OpsControllerTest.java              | 10 +++++-----
 .../controller/ProducerControllerTest.java         | 16 ++++++++--------
 .../controller/TopicControllerTest.java            | 12 ++++++------
 .../task/DashboardCollectTaskTest.java             | 16 ++++++++--------
 .../testbase/RocketMQConsoleTestBase.java          | 12 ++++++------
 .../testbase/TestConstant.java                     |  2 +-
 .../testbase/TestRocketMQServer.java               |  8 ++++----
 .../util/MockObjectUtil.java                       |  2 +-
 .../util/MsgTraceDecodeUtilTest.java               |  2 +-
 .../util/MyPrintingResultHandler.java              |  2 +-
 .../web/WebStaticApplicationTests.java             |  2 +-
 src/test/resources/application.properties          |  2 +-
 123 files changed, 366 insertions(+), 366 deletions(-)

Reply via email to