From ace652a33d826122859dbcf4ecf7a6937bea6292 Mon Sep 17 00:00:00 2001 From: vongosling Date: Mon, 27 Jul 2020 17:08:05 +0800 Subject: [PATCH] Update to be compitable with the latest spring and rocketmq release version --- README.md | 8 +- pom.xml | 201 ++++++------------ .../controller/MessageTraceController.java | 4 +- .../service/client/MQAdminExtImpl.java | 38 ++++ .../service/impl/MessageServiceImpl.java | 2 +- 5 files changed, 111 insertions(+), 142 deletions(-) diff --git a/README.md b/README.md index 72ab1e3..cfa5f66 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -## RocketMQ-Console-Ng[![Build Status](https://travis-ci.org/apache/rocketmq-externals.svg?branch=master)](https://travis-ci.org/apache/rocketmq-externals) [![Coverage Status](https://coveralls.io/repos/github/rocketmq/rocketmq-console-ng/badge.svg?branch=master)](https://coveralls.io/github/rocketmq/rocketmq-console-ng?branch=master) +## RocketMQ-Console-NG [![Coverage Status](https://coveralls.io/repos/github/rocketmq/rocketmq-console-ng/badge.svg?branch=master)](https://coveralls.io/github/rocketmq/rocketmq-console-ng?branch=master) [![License](https://img.shields.io/badge/license-Apache%202-4EB1BA.svg)](https://www.apache.org/licenses/LICENSE-2.0.html) ## How To Install @@ -13,7 +13,7 @@ mvn clean package -Dmaven.test.skip=true docker:build or ``` -docker pull styletang/rocketmq-console-ng +docker pull apacherocketmq/rocketmq-console-ng ``` * run it (change namesvrAddr and port yourself) @@ -22,14 +22,14 @@ docker run -e "JAVA_OPTS=-Drocketmq.namesrv.addr=127.0.0.1:9876 -Dcom.rocketmq.s ``` ### Without Docker -require java 1.7 +require java 1.8+ ``` mvn spring-boot:run ``` or ``` mvn clean package -Dmaven.test.skip=true -java -jar target/rocketmq-console-ng-1.0.1.jar +java -jar target/rocketmq-console-ng-2.0.0.jar ``` #### Tips diff --git a/pom.xml b/pom.xml index ab596a7..6ce2d38 100644 --- a/pom.xml +++ b/pom.xml @@ -2,44 +2,90 @@ - 4.0.0 + - org.springframework.boot - spring-boot-starter-parent - 1.4.3.RELEASE + org.apache + apache + 18 + + 4.0.0 org.apache rocketmq-console-ng jar - 1.0.1 + 2.0.0 rocketmq-console-ng + + + + Development List + dev-subscribe@rocketmq.apache.org + dev-unsubscribe@rocketmq.apache.org + dev@rocketmq.apache.org + + + User List + users-subscribe@rocketmq.apache.org + users-unsubscribe@rocketmq.apache.org + users@rocketmq.apache.org + + + Commits List + commits-subscribe@rocketmq.apache.org + commits-unsubscribe@rocketmq.apache.org + commits@rocketmq.apache.org + + + + + + Apache RocketMQ + Apache RocketMQ of ASF + https://rocketmq.apache.org/ + + + + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + repo + + + UTF-8 - 1.7 + 1.8 + 1.8 + 16.0.1 2.1 2.6 2.4 1.2 - 4.4.0 + 4.7.1 2.19.1 1.6.11 ${basedir}/../.. - styletang + apacherocketmq + 1.4.3.RELEASE org.springframework.boot spring-boot-starter-web + ${spring.boot.version} org.springframework.boot spring-boot-starter-actuator + ${spring.boot.version} org.springframework.boot spring-boot-starter-test + ${spring.boot.version} test @@ -93,9 +139,21 @@ + + maven-compiler-plugin + 3.5.1 + + ${maven.compiler.source} + ${maven.compiler.target} + ${maven.compiler.source} + true + true + + org.springframework.boot spring-boot-maven-plugin + ${spring.boot.version} com.spotify @@ -138,138 +196,11 @@ - - maven-surefire-plugin - ${surefire.version} - - - src/test/** - - 1 - true - - - - org.apache.maven.plugins - maven-failsafe-plugin - 2.19.1 - - 1 - true - @{failsafeArgLine} - - src/test/** - - - - - - integration-test - verify - - - - - - maven-source-plugin - 3.0.1 - - - attach-sources - - jar - - - - - - - - - - - - - - - - - - - - - org.jacoco - jacoco-maven-plugin - 0.7.9 - - - default-prepare-agent - - prepare-agent - - - ${project.build.directory}/jacoco.exec - - - - default-prepare-agent-integration - pre-integration-test - - prepare-agent-integration - - - ${project.build.directory}/jacoco-it.exec - failsafeArgLine - - - - default-report - - report - - - - default-report-integration - - report-integration - - - - default-check - - check - - - - - - BUNDLE - - - - COMPLEXITY - COVEREDRATIO - 0.20 - - - - - - - - - - org.eluder.coveralls - coveralls-maven-plugin - 4.3.0 - org.codehaus.mojo findbugs-maven-plugin 3.0.4 - - diff --git a/src/main/java/org/apache/rocketmq/console/controller/MessageTraceController.java b/src/main/java/org/apache/rocketmq/console/controller/MessageTraceController.java index ae99c9e..2e999d1 100644 --- a/src/main/java/org/apache/rocketmq/console/controller/MessageTraceController.java +++ b/src/main/java/org/apache/rocketmq/console/controller/MessageTraceController.java @@ -22,8 +22,8 @@ import java.util.List; import java.util.Map; import javax.annotation.Resource; import org.apache.commons.lang3.StringUtils; -import org.apache.rocketmq.common.MixAll; import org.apache.rocketmq.common.Pair; +import org.apache.rocketmq.common.topic.TopicValidator; import org.apache.rocketmq.console.config.RMQConfigure; import org.apache.rocketmq.console.model.MessageView; import org.apache.rocketmq.console.service.MessageService; @@ -65,7 +65,7 @@ public class MessageTraceController { public Object viewTraceMessages(@RequestParam(required = false) String topic, @RequestParam String msgId) { String queryTopic = rmqConfigure.getMsgTrackTopicName(); if (StringUtils.isEmpty(queryTopic)) { - queryTopic = MixAll.RMQ_SYS_TRACE_TOPIC; + queryTopic = TopicValidator.RMQ_SYS_TRACE_TOPIC; } logger.info("query data topic name is:{}",queryTopic); return messageTraceService.queryMessageTraceByTopicAndKey(queryTopic, msgId); diff --git a/src/main/java/org/apache/rocketmq/console/service/client/MQAdminExtImpl.java b/src/main/java/org/apache/rocketmq/console/service/client/MQAdminExtImpl.java index 77a3784..ddb386e 100644 --- a/src/main/java/org/apache/rocketmq/console/service/client/MQAdminExtImpl.java +++ b/src/main/java/org/apache/rocketmq/console/service/client/MQAdminExtImpl.java @@ -26,6 +26,8 @@ import org.apache.rocketmq.client.QueryResult; import org.apache.rocketmq.client.exception.MQBrokerException; import org.apache.rocketmq.client.exception.MQClientException; import org.apache.rocketmq.client.impl.MQAdminImpl; +import org.apache.rocketmq.common.AclConfig; +import org.apache.rocketmq.common.PlainAccessConfig; import org.apache.rocketmq.common.TopicConfig; import org.apache.rocketmq.common.admin.ConsumeStats; import org.apache.rocketmq.common.admin.RollbackStats; @@ -36,6 +38,7 @@ import org.apache.rocketmq.common.message.MessageQueue; import org.apache.rocketmq.common.protocol.RequestCode; import org.apache.rocketmq.common.protocol.ResponseCode; import org.apache.rocketmq.common.protocol.body.BrokerStatsData; +import org.apache.rocketmq.common.protocol.body.ClusterAclVersionInfo; import org.apache.rocketmq.common.protocol.body.ClusterInfo; import org.apache.rocketmq.common.protocol.body.ConsumeMessageDirectlyResult; import org.apache.rocketmq.common.protocol.body.ConsumeStatsList; @@ -88,6 +91,31 @@ public class MQAdminExtImpl implements MQAdminExt { MQAdminInstance.threadLocalMQAdminExt().createAndUpdateTopicConfig(addr, config); } + @Override public void createAndUpdatePlainAccessConfig(String addr, + PlainAccessConfig plainAccessConfig) throws RemotingException, MQBrokerException, InterruptedException, MQClientException { + + } + + @Override public void deletePlainAccessConfig(String addr, + String accessKey) throws RemotingException, MQBrokerException, InterruptedException, MQClientException { + + } + + @Override public void updateGlobalWhiteAddrConfig(String addr, + String globalWhiteAddrs) throws RemotingException, MQBrokerException, InterruptedException, MQClientException { + + } + + @Override public ClusterAclVersionInfo examineBrokerClusterAclVersionInfo( + String addr) throws RemotingException, MQBrokerException, InterruptedException, MQClientException { + return null; + } + + @Override public AclConfig examineBrokerClusterAclConfig( + String addr) throws RemotingException, MQBrokerException, InterruptedException, MQClientException { + return null; + } + @Override public void createAndUpdateSubscriptionGroupConfig(String addr, SubscriptionGroupConfig config) throws RemotingException, MQBrokerException, InterruptedException, MQClientException { @@ -505,4 +533,14 @@ public class MQAdminExtImpl implements MQAdminExt { String consumerGroup) throws InterruptedException, RemotingTimeoutException, RemotingSendRequestException, RemotingConnectException, MQClientException { return null; } + + @Override public boolean resumeCheckHalfMessage( + String msgId) throws RemotingException, MQClientException, InterruptedException, MQBrokerException { + return false; + } + + @Override public boolean resumeCheckHalfMessage(String topic, + String msgId) throws RemotingException, MQClientException, InterruptedException, MQBrokerException { + return false; + } } diff --git a/src/main/java/org/apache/rocketmq/console/service/impl/MessageServiceImpl.java b/src/main/java/org/apache/rocketmq/console/service/impl/MessageServiceImpl.java index 14cc31c..fb41634 100644 --- a/src/main/java/org/apache/rocketmq/console/service/impl/MessageServiceImpl.java +++ b/src/main/java/org/apache/rocketmq/console/service/impl/MessageServiceImpl.java @@ -88,7 +88,7 @@ public class MessageServiceImpl implements MessageService { @Override public List queryMessageByTopic(String topic, final long begin, final long end) { - DefaultMQPullConsumer consumer = new DefaultMQPullConsumer(MixAll.TOOLS_CONSUMER_GROUP, null); + DefaultMQPullConsumer consumer = new DefaultMQPullConsumer(MixAll.TOOLS_CONSUMER_GROUP); List messageViewList = Lists.newArrayList(); try { String subExpression = "*";