Introduce dependencies for a unified return front-end format

zzxxiansheng · Apr 16, 2024 · e6756d9 · e6756d9
1 parent 139f943
commit e6756d9
Show file tree

Hide file tree

Showing 11 changed files with 34 additions and 270 deletions.
diff --git a/eventmesh-dashboard-common/pom.xml b/eventmesh-dashboard-common/pom.xml
@@ -41,6 +41,7 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <!-- Utility -->

diff --git a/eventmesh-dashboard-console/pom.xml b/eventmesh-dashboard-console/pom.xml
@@ -1,21 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one or more
-  ~ contributor license agreements.  See the NOTICE file distributed with
-  ~ this work for additional information regarding copyright ownership.
-  ~ The ASF licenses this file to You under the Apache License, Version 2.0
-  ~ (the "License"); you may not use this file except in compliance with
-  ~ the License.  You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
 <project xmlns="http://maven.apache.org/POM/4.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -36,46 +19,30 @@
     </properties>
 
     <dependencies>
-        <!-- Spring Boot Starter -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
-
         <!-- EventMesh Dashboard modules -->
-        <dependency>
-            <groupId>org.apache.eventmesh.dashboard.common</groupId>
-            <artifactId>eventmesh-dashboard-common</artifactId>
-            <version>0.0.1-SNAPSHOT</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.eventmesh.dashboard.core</groupId>
             <artifactId>eventmesh-dashboard-core</artifactId>
             <version>0.0.1-SNAPSHOT</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.eventmesh.dashboard.service</groupId>
-            <artifactId>eventmesh-dashboard-service</artifactId>
-            <version>0.0.1-SNAPSHOT</version>
-        </dependency>
 
         <!-- AOP -->
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-aspects</artifactId>
         </dependency>
 
-        <!-- Unit Test -->
+        <!-- mybatis laohu-->
         <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
+            <groupId>io.github.githublaohu</groupId>
+            <artifactId>mybatis-dependent</artifactId>
+            <version>0.1.4</version>
         </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.13.2</version>
-            <scope>test</scope>
+
+         <dependency>
+            <groupId>com.github.pagehelper</groupId>
+            <artifactId>pagehelper-spring-boot-starter</artifactId>
+            <version>2.1.0</version>
         </dependency>
 
         <!-- Swagger -->
@@ -90,46 +57,24 @@
             <version>1.7.0</version>
         </dependency>
 
-        <!-- Database -->
+        <!-- github laohu-->
         <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>druid-spring-boot-starter</artifactId>
-            <version>1.2.21</version>
+            <groupId>io.github.githublaohu</groupId>
+            <artifactId>dubbo-springmvc</artifactId>
+            <version>0.1.4</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.dubbo</groupId>
+                    <artifactId>dubbo-spring-boot-starter</artifactId>
+                </exclusion></exclusions>
         </dependency>
+        <!--lampup -->
         <dependency>
-            <groupId>org.mybatis.spring.boot</groupId>
-            <artifactId>mybatis-spring-boot-starter</artifactId>
+            <groupId>cn.lampup</groupId>
+            <artifactId>decoration-core</artifactId>
+            <version>0.1.7</version>
         </dependency>
 
-        <dependency>
-            <groupId>com.mysql</groupId>
-            <artifactId>mysql-connector-j</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-
-        <!-- health check client -->
-        <!-- EventMesh SDK -->
-        <!--        <dependency>-->
-        <!--            <groupId>org.apache.eventmesh</groupId>-->
-        <!--            <artifactId>eventmesh-sdk-java</artifactId>-->
-        <!--            <version>1.10.0-release</version>-->
-        <!--            <exclusions>-->
-        <!--                <exclusion>-->
-        <!--                    <groupId>junit</groupId>-->
-        <!--                    <artifactId>junit</artifactId>-->
-        <!--                </exclusion>-->
-        <!--                <exclusion>-->
-        <!--                    <groupId>junit</groupId>-->
-        <!--                    <artifactId>junit-dep</artifactId>-->
-        <!--                </exclusion>-->
-        <!--                <exclusion>-->
-        <!--                    <groupId>org.apache.logging.log4j</groupId>-->
-        <!--                    <artifactId>log4j-slf4j-impl</artifactId>-->
-        <!--                </exclusion>-->
-        <!--            </exclusions>-->
-        <!--        </dependency>-->
-
-        <!-- health check client end -->
     </dependencies>
 
     <build>

diff --git a/...le/src/main/java/org/apache/eventmesh/dashboard/console/controller/MetricsController.java b/...le/src/main/java/org/apache/eventmesh/dashboard/console/controller/MetricsController.java
diff --git a/...-console/src/main/java/org/apache/eventmesh/dashboard/console/dto/ConnectionResponse.java b/...-console/src/main/java/org/apache/eventmesh/dashboard/console/dto/ConnectionResponse.java
diff --git a/...-console/src/main/java/org/apache/eventmesh/dashboard/console/dto/CreateTopicRequest.java b/...-console/src/main/java/org/apache/eventmesh/dashboard/console/dto/CreateTopicRequest.java
diff --git a/...-console/src/main/java/org/apache/eventmesh/dashboard/console/dto/DeleteTopicRequest.java b/...-console/src/main/java/org/apache/eventmesh/dashboard/console/dto/DeleteTopicRequest.java
diff --git a/.../src/main/java/org/apache/eventmesh/dashboard/console/modle/dto/topic/CreateTopicDTO.java b/.../src/main/java/org/apache/eventmesh/dashboard/console/modle/dto/topic/CreateTopicDTO.java
@@ -17,7 +17,6 @@
 
 package org.apache.eventmesh.dashboard.console.modle.dto.topic;
 
-import java.sql.Timestamp;
 
 import lombok.Data;
 
@@ -38,7 +37,7 @@ public class CreateTopicDTO {
 
     private Integer replicasNums;
 
-    private Timestamp saveTime;
+    private Long saveTime;
 
     private Integer cleanupStrategy;
 }
diff --git a/.../src/main/java/org/apache/eventmesh/dashboard/console/service/topic/TopicServiceImpl.java b/.../src/main/java/org/apache/eventmesh/dashboard/console/service/topic/TopicServiceImpl.java
@@ -99,7 +99,7 @@ public void createTopic(CreateTopicDTO createTopicDTO) {
         topicEntity.setClusterId(createTopicDTO.getClusterId());
         topicEntity.setTopicName(createTopicDTO.getName());
         topicEntity.setDescription(createTopicDTO.getDescription());
-        topicEntity.setRetentionMs(createTopicDTO.getSaveTime().getTime());
+        topicEntity.setRetentionMs(createTopicDTO.getSaveTime());
         StoreEntity storeEntity = new StoreEntity();
         storeEntity.setClusterId(topicEntity.getClusterId());
         topicEntity.setStorageId(String.valueOf(storeMapper.selectStoreByCluster(storeEntity).getId()));

diff --git a/eventmesh-dashboard-console/src/main/resources/application-dev.yml b/eventmesh-dashboard-console/src/main/resources/application-dev.yml
@@ -53,5 +53,10 @@ logging:
 mybatis:
   type-aliases-package: org.apache.eventmesh.dashboard.console.entity
 
+decoration:
+  constantConfig:
+    all: true
+  corsEnable: true
+
 
 
diff --git a/eventmesh-dashboard-console/src/main/resources/eventmesh-dashboard.sql b/eventmesh-dashboard-console/src/main/resources/eventmesh-dashboard.sql
@@ -290,6 +290,7 @@ CREATE TABLE `topic`
     `create_time`  timestamp       NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间(尽量与Topic实际创建时间一致)',
     `update_time`  timestamp       NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间(尽量与Topic实际创建时间一致)',
     `status`       int             NOT NULL DEFAULT '1',
+    create_progress int            NOT NULL DEFAULT 1 COMMENT '0:创建成功，1：创建中，2：创建失败',
     PRIMARY KEY (`id`),
     UNIQUE KEY `uniq_cluster_phy_id_topic_name` (`cluster_id`, `topic_name`),
     KEY            `cluster_id` (`cluster_id`, `topic_name`)

diff --git a/eventmesh-dashboard-core/pom.xml b/eventmesh-dashboard-core/pom.xml
@@ -137,10 +137,9 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.13.2</version>
-            <scope>test</scope>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 </project>