diff --git a/pom.xml b/pom.xml index 6ce2d38..b45d80a 100644 --- a/pom.xml +++ b/pom.xml @@ -65,10 +65,10 @@ 1.2 4.7.1 2.19.1 - 1.6.11 + 1.8.10 ${basedir}/../.. apacherocketmq - 1.4.3.RELEASE + 2.2.2.RELEASE @@ -88,6 +88,12 @@ ${spring.boot.version} test + + org.springframework.boot + spring-boot-configuration-processor + ${spring.boot.version} + compile + commons-collections commons-collections @@ -97,16 +103,54 @@ org.apache.rocketmq rocketmq-tools ${rocketmq.version} + + + ch.qos.logback + logback-classic + + + ch.qos.logback + logback-core + + org.apache.rocketmq rocketmq-namesrv ${rocketmq.version} + + + org.slf4j + slf4j-api + + + ch.qos.logback + logback-classic + + + ch.qos.logback + logback-core + + org.apache.rocketmq rocketmq-broker ${rocketmq.version} + + + org.slf4j + slf4j-api + + + ch.qos.logback + logback-classic + + + ch.qos.logback + logback-core + + com.google.guava @@ -118,6 +162,11 @@ aspectjrt ${aspectj.version} + + + + + org.aspectj @@ -154,6 +203,13 @@ org.springframework.boot spring-boot-maven-plugin ${spring.boot.version} + + + + repackage + + + com.spotify diff --git a/src/main/java/org/apache/rocketmq/console/config/RMQConfigure.java b/src/main/java/org/apache/rocketmq/console/config/RMQConfigure.java index 1bcb861..f25ce2c 100644 --- a/src/main/java/org/apache/rocketmq/console/config/RMQConfigure.java +++ b/src/main/java/org/apache/rocketmq/console/config/RMQConfigure.java @@ -23,9 +23,9 @@ import org.apache.rocketmq.common.MixAll; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.boot.web.servlet.ErrorPage; -import org.springframework.boot.web.servlet.ErrorPageRegistrar; -import org.springframework.boot.web.servlet.ErrorPageRegistry; +import org.springframework.boot.web.server.ErrorPage; +import org.springframework.boot.web.server.ErrorPageRegistrar; +import org.springframework.boot.web.server.ErrorPageRegistry; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.http.HttpStatus; diff --git a/src/main/java/org/apache/rocketmq/console/filter/HttpBasicAuthorizedFilter.java b/src/main/java/org/apache/rocketmq/console/filter/HttpBasicAuthorizedFilter.java index 0bb113f..73b2eb9 100644 --- a/src/main/java/org/apache/rocketmq/console/filter/HttpBasicAuthorizedFilter.java +++ b/src/main/java/org/apache/rocketmq/console/filter/HttpBasicAuthorizedFilter.java @@ -26,9 +26,8 @@ import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; import javax.servlet.annotation.WebFilter; import javax.servlet.http.HttpServletResponse; -import org.springframework.stereotype.Component; -@Component + @WebFilter(urlPatterns = "/*", filterName = "httpBasicAuthorizedFilter") public class HttpBasicAuthorizedFilter implements Filter { diff --git a/src/main/java/org/apache/rocketmq/console/service/checker/impl/TopicOnlyOneBrokerCheckerImpl.java b/src/main/java/org/apache/rocketmq/console/service/checker/impl/TopicOnlyOneBrokerCheckerImpl.java index 0f06a13..e276978 100644 --- a/src/main/java/org/apache/rocketmq/console/service/checker/impl/TopicOnlyOneBrokerCheckerImpl.java +++ b/src/main/java/org/apache/rocketmq/console/service/checker/impl/TopicOnlyOneBrokerCheckerImpl.java @@ -20,6 +20,11 @@ import org.apache.rocketmq.console.service.checker.CheckerType; import org.apache.rocketmq.console.service.checker.RocketMqChecker; import org.springframework.stereotype.Service; + +/** + * TODO + * here the checkers is not implemented yet + */ @Service public class TopicOnlyOneBrokerCheckerImpl implements RocketMqChecker { @Override diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index c34688e..3bf0235 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,4 +1,4 @@ -server.contextPath= +server.address=0.0.0.0 server.port=8080 ### SSL setting