diff --git a/eventmesh-dashboard-common/pom.xml b/eventmesh-dashboard-common/pom.xml index 9c1e227b..bb686e9a 100644 --- a/eventmesh-dashboard-common/pom.xml +++ b/eventmesh-dashboard-common/pom.xml @@ -19,6 +19,17 @@ + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-test + test + + org.projectlombok diff --git a/eventmesh-dashboard-console/pom.xml b/eventmesh-dashboard-console/pom.xml index 9f154be2..d059fcb4 100644 --- a/eventmesh-dashboard-console/pom.xml +++ b/eventmesh-dashboard-console/pom.xml @@ -19,17 +19,6 @@ - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-test - test - - org.springframework diff --git a/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/exception/GlobalExceptionHandler.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/exception/GlobalExceptionHandler.java similarity index 95% rename from eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/exception/GlobalExceptionHandler.java rename to eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/exception/GlobalExceptionHandler.java index 9d31eacd..891255d6 100644 --- a/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/exception/GlobalExceptionHandler.java +++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/exception/GlobalExceptionHandler.java @@ -15,11 +15,12 @@ * limitations under the License. */ -package org.apache.eventmesh.dashboard.common.exception; +package org.apache.eventmesh.dashboard.console.exception; -import org.apache.eventmesh.dashboard.common.enums.Status; import org.apache.eventmesh.dashboard.common.dto.Result; import org.apache.eventmesh.dashboard.common.dto.Result.StatusMessage; +import org.apache.eventmesh.dashboard.common.enums.Status; +import org.apache.eventmesh.dashboard.common.exception.BaseException; import javax.servlet.http.HttpServletRequest; diff --git a/eventmesh-dashboard-console/src/main/resources/logback.xml b/eventmesh-dashboard-console/src/main/resources/logback.xml deleted file mode 100644 index c9925d33..00000000 --- a/eventmesh-dashboard-console/src/main/resources/logback.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - [%d{yyyy-MM-dd HH:mm:ss.SSS}] %p %t - %m%n - - - - - ${user.home}/logs/eventmesh-dashboard.log - true - - ${user.home}/logs/eventmesh-dashboard-%d{yyyy-MM-dd}.%i.log - - - 104857600 - - 10 - - - [%d{yyyy-MM-dd HH:mm:ss.SSS}] %p %t - %m%n - UTF-8 - - - - - - - - - \ No newline at end of file diff --git a/eventmesh-dashboard-core/pom.xml b/eventmesh-dashboard-core/pom.xml index fbe1ba17..61d9a01d 100644 --- a/eventmesh-dashboard-core/pom.xml +++ b/eventmesh-dashboard-core/pom.xml @@ -52,17 +52,6 @@ 0.0.1-SNAPSHOT - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-test - test - - com.alibaba.nacos diff --git a/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/config/AdminProperties.java b/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/config/AdminProperties.java index 5a2a6265..127d2e3c 100644 --- a/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/config/AdminProperties.java +++ b/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/config/AdminProperties.java @@ -24,6 +24,11 @@ import lombok.Data; +/** + * TODO get configs from DB (console module's work) + */ + +@Deprecated @Data @Component @ConfigurationProperties(prefix = ConfigConst.ADMIN_PROPS_PREFIX) diff --git a/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/config/BeanTypeConfig.java b/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/config/BeanTypeConfig.java index 18a74be7..92266b6f 100644 --- a/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/config/BeanTypeConfig.java +++ b/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/config/BeanTypeConfig.java @@ -18,14 +18,14 @@ package org.apache.eventmesh.dashboard.core.config; import org.apache.eventmesh.dashboard.common.constant.ConfigConst; -import org.apache.eventmesh.dashboard.service.meta.ConnectionService; -import org.apache.eventmesh.dashboard.service.meta.SubscriptionService; -import org.apache.eventmesh.dashboard.service.store.TopicService; import org.apache.eventmesh.dashboard.core.service.meta.EtcdConnectionService; import org.apache.eventmesh.dashboard.core.service.meta.EtcdSubscriptionService; import org.apache.eventmesh.dashboard.core.service.meta.NacosConnectionService; import org.apache.eventmesh.dashboard.core.service.meta.NacosSubscriptionService; import org.apache.eventmesh.dashboard.core.service.store.RocketmqTopicService; +import org.apache.eventmesh.dashboard.service.meta.ConnectionService; +import org.apache.eventmesh.dashboard.service.meta.SubscriptionService; +import org.apache.eventmesh.dashboard.service.store.TopicService; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -33,7 +33,9 @@ /** * Use different registry SDK depending on the configured meta type; * Use different storage SDK depending on the configured storage type. + * TODO get configs from DB (console module's work) */ +@Deprecated @Configuration public class BeanTypeConfig { diff --git a/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/service/meta/NacosSubscriptionService.java b/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/service/meta/NacosSubscriptionService.java index 41db2788..4d385cd3 100644 --- a/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/service/meta/NacosSubscriptionService.java +++ b/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/service/meta/NacosSubscriptionService.java @@ -23,13 +23,13 @@ import static org.apache.eventmesh.dashboard.common.enums.Status.NACOS_LOGIN_ERR; import static org.apache.eventmesh.dashboard.common.enums.Status.NACOS_SDK_CONFIG_ERR; -import org.apache.eventmesh.dashboard.core.config.AdminProperties; import org.apache.eventmesh.dashboard.common.constant.ConfigConst; import org.apache.eventmesh.dashboard.common.constant.NacosConst; import org.apache.eventmesh.dashboard.common.dto.Result; import org.apache.eventmesh.dashboard.common.exception.EventMeshAdminException; import org.apache.eventmesh.dashboard.common.exception.MetaException; import org.apache.eventmesh.dashboard.common.model.SubscriptionInfo; +import org.apache.eventmesh.dashboard.core.config.AdminProperties; import org.apache.eventmesh.dashboard.service.meta.SubscriptionService; import java.util.ArrayList; diff --git a/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/service/store/RocketmqTopicService.java b/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/service/store/RocketmqTopicService.java index fff59ee3..57b4ade5 100644 --- a/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/service/store/RocketmqTopicService.java +++ b/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/service/store/RocketmqTopicService.java @@ -17,8 +17,8 @@ package org.apache.eventmesh.dashboard.core.service.store; -import org.apache.eventmesh.dashboard.core.config.AdminProperties; import org.apache.eventmesh.dashboard.common.model.TopicProperties; +import org.apache.eventmesh.dashboard.core.config.AdminProperties; import org.apache.eventmesh.dashboard.service.store.TopicService; import java.util.List; diff --git a/eventmesh-dashboard-core/src/main/resources/logback.xml b/eventmesh-dashboard-core/src/main/resources/logback.xml deleted file mode 100644 index 447ace7c..00000000 --- a/eventmesh-dashboard-core/src/main/resources/logback.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - [%d{yyyy-MM-dd HH:mm:ss.SSS}] %p %t - %m%n - - - - - ${user.home}/logs/eventmesh-dashboard.log - true - - ${user.home}/logs/eventmesh-dashboard-%d{yyyy-MM-dd}.%i.log - - - 104857600 - - 10 - - - [%d{yyyy-MM-dd HH:mm:ss.SSS}] %p %t - %m%n - UTF-8 - - - - - - - - - \ No newline at end of file