Use rocketmq-dashboard instead of rocketmq-console

This commit is contained in:
StyleTang
2021-08-13 22:46:16 +08:00
parent 446d89789f
commit 119cf0d58c
123 changed files with 366 additions and 366 deletions

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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());

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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 com.google.common.collect.Maps;
import com.google.common.io.Files;
@@ -26,9 +26,9 @@ import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
import org.apache.rocketmq.console.service.impl.DashboardCollectServiceImpl;
import org.apache.rocketmq.console.service.impl.DashboardServiceImpl;
import org.apache.rocketmq.console.util.JsonUtil;
import org.apache.rocketmq.dashboard.service.impl.DashboardCollectServiceImpl;
import org.apache.rocketmq.dashboard.service.impl.DashboardServiceImpl;
import org.apache.rocketmq.dashboard.util.JsonUtil;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -70,7 +70,7 @@ public class DashboardControllerTest extends BaseControllerTest {
// generate today's brokerData and topicData cache file
brokerDataFile = this.createBrokerTestCollectDataFile(nowDateStr);
topicDataFile = this.createTopicTestCollectDataFile(nowDateStr);
when(configure.getConsoleCollectData()).thenReturn("");
when(configure.getDashboardCollectData()).thenReturn("");
}
@After

View File

@@ -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 java.lang.reflect.Field;
import org.apache.rocketmq.console.model.User;
import org.apache.rocketmq.console.service.impl.UserServiceImpl;
import org.apache.rocketmq.console.util.WebUtil;
import org.apache.rocketmq.dashboard.model.User;
import org.apache.rocketmq.dashboard.service.impl.UserServiceImpl;
import org.apache.rocketmq.dashboard.util.WebUtil;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -47,7 +47,7 @@ public class LoginControllerTest extends BaseControllerTest {
public void init() {
super.mockRmqConfigure();
when(configure.isLoginRequired()).thenReturn(true);
when(configure.getRocketMqConsoleDataPath()).thenReturn("");
when(configure.getRocketMqDashboardDataPath()).thenReturn("");
Field contextPathField = ReflectionUtils.findField(LoginController.class, "contextPath");
ReflectionUtils.makeAccessible(contextPathField);
ReflectionUtils.setField(contextPathField, loginController, contextPath);

View File

@@ -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 com.alibaba.fastjson.JSON;
import com.google.common.cache.Cache;
@@ -35,10 +35,10 @@ import org.apache.rocketmq.common.message.MessageQueue;
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.console.model.QueueOffsetInfo;
import org.apache.rocketmq.console.model.request.MessageQuery;
import org.apache.rocketmq.console.service.impl.MessageServiceImpl;
import org.apache.rocketmq.console.util.MockObjectUtil;
import org.apache.rocketmq.dashboard.model.QueueOffsetInfo;
import org.apache.rocketmq.dashboard.model.request.MessageQuery;
import org.apache.rocketmq.dashboard.service.impl.MessageServiceImpl;
import org.apache.rocketmq.dashboard.util.MockObjectUtil;
import org.apache.rocketmq.tools.admin.api.MessageTrack;
import org.apache.rocketmq.tools.admin.api.TrackType;
import org.junit.Before;

View File

@@ -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 java.util.ArrayList;
import java.util.List;
@@ -23,9 +23,9 @@ import org.apache.rocketmq.client.exception.MQClientException;
import org.apache.rocketmq.client.trace.TraceType;
import org.apache.rocketmq.common.message.MessageExt;
import org.apache.rocketmq.common.topic.TopicValidator;
import org.apache.rocketmq.console.service.impl.MessageServiceImpl;
import org.apache.rocketmq.console.service.impl.MessageTraceServiceImpl;
import org.apache.rocketmq.console.util.MockObjectUtil;
import org.apache.rocketmq.dashboard.service.impl.MessageServiceImpl;
import org.apache.rocketmq.dashboard.service.impl.MessageTraceServiceImpl;
import org.apache.rocketmq.dashboard.util.MockObjectUtil;
import org.apache.rocketmq.tools.admin.api.MessageTrack;
import org.apache.rocketmq.tools.admin.api.TrackType;
import org.junit.Before;

View File

@@ -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.fasterxml.jackson.core.type.TypeReference;
import java.io.File;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import org.apache.rocketmq.common.MixAll;
import org.apache.rocketmq.console.model.ConsumerMonitorConfig;
import org.apache.rocketmq.console.service.impl.MonitorServiceImpl;
import org.apache.rocketmq.console.util.JsonUtil;
import org.apache.rocketmq.dashboard.model.ConsumerMonitorConfig;
import org.apache.rocketmq.dashboard.service.impl.MonitorServiceImpl;
import org.apache.rocketmq.dashboard.util.JsonUtil;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
@@ -54,12 +54,12 @@ public class MonitorControllerTest extends BaseControllerTest {
@Before
public void init() {
super.mockRmqConfigure();
when(configure.getRocketMqConsoleDataPath()).thenReturn("/tmp/rocketmq-console/test/data");
when(configure.getRocketMqDashboardDataPath()).thenReturn("/tmp/rocketmq-console/test/data");
Map<String, ConsumerMonitorConfig> configMap = new ConcurrentHashMap<>();
configMap.put(consumeGroupName, new ConsumerMonitorConfig(0, 100));
configMap.put(consumeGroupName1, new ConsumerMonitorConfig(10, 200));
ReflectionTestUtils.setField(monitorService, "configMap", configMap);
filePath = configure.getRocketMqConsoleDataPath()
filePath = configure.getRocketMqDashboardDataPath()
+ File.separatorChar + "monitor" + File.separatorChar + "consumerMonitorConfig.json";
}

View File

@@ -15,9 +15,9 @@
* limitations under the License.
*/
package org.apache.rocketmq.console.controller;
package org.apache.rocketmq.dashboard.controller;
import org.apache.rocketmq.console.service.impl.OpsServiceImpl;
import org.apache.rocketmq.dashboard.service.impl.OpsServiceImpl;
import org.junit.Assert;
import org.junit.Test;
import org.mockito.InjectMocks;

View File

@@ -15,14 +15,14 @@
* limitations under the License.
*/
package org.apache.rocketmq.console.controller;
package org.apache.rocketmq.dashboard.controller;
import java.util.ArrayList;
import java.util.List;
import org.apache.rocketmq.console.service.checker.RocketMqChecker;
import org.apache.rocketmq.console.service.checker.impl.ClusterHealthCheckerImpl;
import org.apache.rocketmq.console.service.checker.impl.TopicOnlyOneBrokerCheckerImpl;
import org.apache.rocketmq.console.service.impl.OpsServiceImpl;
import org.apache.rocketmq.dashboard.service.checker.RocketMqChecker;
import org.apache.rocketmq.dashboard.service.checker.impl.ClusterHealthCheckerImpl;
import org.apache.rocketmq.dashboard.service.checker.impl.TopicOnlyOneBrokerCheckerImpl;
import org.apache.rocketmq.dashboard.service.impl.OpsServiceImpl;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;

View File

@@ -15,19 +15,19 @@
* limitations under the License.
*/
package org.apache.rocketmq.console.controller;
package org.apache.rocketmq.dashboard.controller;
import java.util.HashSet;
import org.apache.rocketmq.client.exception.MQClientException;
import org.apache.rocketmq.common.protocol.body.Connection;
import org.apache.rocketmq.common.protocol.body.ProducerConnection;
import org.apache.rocketmq.console.interceptor.AuthInterceptor;
import org.apache.rocketmq.console.service.impl.LoginServiceImpl;
import org.apache.rocketmq.console.service.impl.ProducerServiceImpl;
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.console.util.WebUtil;
import org.apache.rocketmq.dashboard.interceptor.AuthInterceptor;
import org.apache.rocketmq.dashboard.service.impl.LoginServiceImpl;
import org.apache.rocketmq.dashboard.service.impl.ProducerServiceImpl;
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.dashboard.util.WebUtil;
import org.apache.rocketmq.remoting.protocol.LanguageCode;
import org.junit.Before;
import org.junit.Test;

View File

@@ -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 com.alibaba.fastjson.JSON;
import com.google.common.collect.Lists;
@@ -39,11 +39,11 @@ 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.console.model.request.SendTopicMessageRequest;
import org.apache.rocketmq.console.model.request.TopicConfigInfo;
import org.apache.rocketmq.console.service.impl.ConsumerServiceImpl;
import org.apache.rocketmq.console.service.impl.TopicServiceImpl;
import org.apache.rocketmq.console.util.MockObjectUtil;
import org.apache.rocketmq.dashboard.model.request.SendTopicMessageRequest;
import org.apache.rocketmq.dashboard.model.request.TopicConfigInfo;
import org.apache.rocketmq.dashboard.service.impl.ConsumerServiceImpl;
import org.apache.rocketmq.dashboard.service.impl.TopicServiceImpl;
import org.apache.rocketmq.dashboard.util.MockObjectUtil;
import org.junit.Before;
import org.junit.Test;
import org.mockito.InjectMocks;

View File

@@ -1,4 +1,4 @@
package org.apache.rocketmq.console.task;
package org.apache.rocketmq.dashboard.task;
import com.fasterxml.jackson.core.type.TypeReference;
import com.google.common.cache.LoadingCache;
@@ -20,11 +20,11 @@ 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.console.BaseTest;
import org.apache.rocketmq.console.config.RMQConfigure;
import org.apache.rocketmq.console.service.impl.DashboardCollectServiceImpl;
import org.apache.rocketmq.console.util.JsonUtil;
import org.apache.rocketmq.console.util.MockObjectUtil;
import org.apache.rocketmq.dashboard.BaseTest;
import org.apache.rocketmq.dashboard.config.RMQConfigure;
import org.apache.rocketmq.dashboard.service.impl.DashboardCollectServiceImpl;
import org.apache.rocketmq.dashboard.util.JsonUtil;
import org.apache.rocketmq.dashboard.util.MockObjectUtil;
import org.apache.rocketmq.tools.admin.MQAdminExt;
import org.junit.After;
import org.junit.Assert;
@@ -60,10 +60,10 @@ public class DashboardCollectTaskTest extends BaseTest {
@Before
public void init() throws Exception {
MockitoAnnotations.initMocks(this);
when(rmqConfigure.getConsoleCollectData()).thenReturn("/tmp/rocketmq-console/test/data");
when(rmqConfigure.getDashboardCollectData()).thenReturn("/tmp/rocketmq-console/test/data");
ClusterInfo clusterInfo = MockObjectUtil.createClusterInfo();
when(mqAdminExt.examineBrokerClusterInfo()).thenReturn(clusterInfo);
String dataLocationPath = rmqConfigure.getConsoleCollectData();
String dataLocationPath = rmqConfigure.getDashboardCollectData();
DateFormat format = new SimpleDateFormat("yyyy-MM-dd");
String nowDateStr = format.format(new Date());
brokerFile = new File(dataLocationPath + nowDateStr + ".json");

View File

@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.rocketmq.console.testbase;
package org.apache.rocketmq.dashboard.testbase;
import com.google.common.base.Throwables;
import com.google.common.collect.Lists;
@@ -30,11 +30,11 @@ 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.common.subscription.SubscriptionGroupConfig;
import org.apache.rocketmq.console.model.request.ConsumerConfigInfo;
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.ConsumerConfigInfo;
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 org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.annotation.ComponentScan;

View File

@@ -15,7 +15,7 @@
* limitations under the License.
*/
package org.apache.rocketmq.console.testbase;
package org.apache.rocketmq.dashboard.testbase;
import static java.io.File.separator;

View File

@@ -15,7 +15,7 @@
* limitations under the License.
*/
package org.apache.rocketmq.console.testbase;
package org.apache.rocketmq.dashboard.testbase;
import java.io.File;
import java.text.SimpleDateFormat;
@@ -35,9 +35,9 @@ import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
import static java.io.File.separator;
import static org.apache.rocketmq.console.testbase.TestConstant.TEST_BROKER_NAME;
import static org.apache.rocketmq.console.testbase.TestConstant.TEST_CLUSTER_NAME;
import static org.apache.rocketmq.console.testbase.TestConstant.TEST_FILE_ROOT_DIR;
import static org.apache.rocketmq.dashboard.testbase.TestConstant.TEST_BROKER_NAME;
import static org.apache.rocketmq.dashboard.testbase.TestConstant.TEST_CLUSTER_NAME;
import static org.apache.rocketmq.dashboard.testbase.TestConstant.TEST_FILE_ROOT_DIR;
@Service
public class TestRocketMQServer {

View File

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

View File

@@ -1,4 +1,4 @@
package org.apache.rocketmq.console.util;
package org.apache.rocketmq.dashboard.util;
import java.util.List;
import org.apache.rocketmq.client.trace.TraceConstants;

View File

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

View File

@@ -15,7 +15,7 @@
* limitations under the License.
*/
package org.apache.rocketmq.console.web;
package org.apache.rocketmq.dashboard.web;
import com.google.common.collect.Maps;
import java.util.Map;

View File

@@ -1,7 +1,7 @@
server.contextPath=
server.port=8080
#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