test: 完成从controller添加注册中心，启动同步服务和健康检查的流程

eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/controller/MetaController.java

@@ -0,0 +1,60 @@
+/*
+ * 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.
+ */
+
+package org.apache.eventmesh.dashboard.console.controller;
+
+import java.sql.Timestamp;
+
+import org.apache.eventmesh.dashboard.common.enums.RecordStatus;
+
+import org.apache.eventmesh.dashboard.console.entity.meta.MetaEntity;
+import org.apache.eventmesh.dashboard.console.modle.dto.meta.NewMetaDTO;
+import org.apache.eventmesh.dashboard.console.service.registry.RegistryDataService;
+
+import org.apache.kafka.common.protocol.types.Field.Str;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class MetaController {
+
+    @Autowired
+    private RegistryDataService metaService;
+
+    @PostMapping("/meta/newMeta")
+    public String addRegistry(@Validated @RequestBody NewMetaDTO newMetaDTO) {
+        MetaEntity query = new MetaEntity();
+        query.setName("");
+        query.setType("");
+        query.setVersion("");
+        query.setClusterId(0L);
+        query.setHost(newMetaDTO.getMetaHost());
+        query.setPort(newMetaDTO.getMetaPort());
+        query.setRole("");
+        query.setUsername("");
+        query.setParams("");
+        query.setClusterId(0L);
+
+        metaService.insert(query);
+
+        return "success";
+    }
+}

eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/controller/MetricsController.java

@@ -36,9 +36,4 @@ public Object druidStat() {
     public Result<String> hello() {
         return Result.success("Hello, EventMesh Dashboard!");
     }
-
-    @GetMapping("/hello2")
-    public String hello2() {
-        return "Hello, EventMesh Dashboard!";
-    }
 }

eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/client/ClientEntity.java

@@ -26,11 +26,13 @@
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
+@EqualsAndHashCode(callSuper = true, exclude = "status")
 public class ClientEntity extends BaseEntity {
 
     private static final long serialVersionUID = 8204133370609215856L;

eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/cluster/ClusterEntity.java

@@ -22,12 +22,14 @@
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
+@EqualsAndHashCode(callSuper = true, exclude = "status")
 public class ClusterEntity extends BaseEntity {
 
     private String name;

eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/connection/ConnectionEntity.java

@@ -36,7 +36,7 @@
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-@EqualsAndHashCode(callSuper = true, exclude = {"endTime"})
+@EqualsAndHashCode(callSuper = true, exclude = {"status", "endTime"})
 public class ConnectionEntity extends BaseEntity {
 
     private static final long serialVersionUID = 6565578252656944905L;

eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/connector/ConnectorEntity.java

@@ -32,7 +32,7 @@
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-@EqualsAndHashCode(callSuper = true)
+@EqualsAndHashCode(callSuper = true, exclude = "status")
 @Builder
 public class ConnectorEntity extends BaseEntity {
 

eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/group/GroupEntity.java

@@ -23,11 +23,13 @@
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
 @NoArgsConstructor
 @AllArgsConstructor
 @Data
+@EqualsAndHashCode(callSuper = true, exclude = "status")
 public class GroupEntity extends BaseEntity {
 
     private Long id;

eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/groupmember/GroupMemberEntity.java

@@ -23,11 +23,13 @@
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
+@EqualsAndHashCode(callSuper = true, exclude = "status")
 public class GroupMemberEntity extends BaseEntity {
 
     private Long id;

eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/health/HealthCheckResultEntity.java

@@ -24,12 +24,14 @@
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
 @Data
 @Builder
 @AllArgsConstructor
 @NoArgsConstructor
+@EqualsAndHashCode(callSuper = true, exclude = "resultDesc")
 @Schema(name = "HealthCheckResultEntity", description = "Health check result entity")
 public class HealthCheckResultEntity extends BaseEntity {
 

eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/log/LogEntity.java

@@ -23,11 +23,13 @@
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
+@EqualsAndHashCode(callSuper = true, exclude = {"endTime", "operationUser", "result"})
 public class LogEntity extends BaseEntity {
 
     private Long id;

eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/meta/MetaEntity.java

@@ -24,11 +24,13 @@
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
+@EqualsAndHashCode(callSuper = true, exclude = "status")
 public class MetaEntity extends BaseEntity {
 
     private static final long serialVersionUID = 7176263169716424469L;

eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/runtime/RuntimeEntity.java

@@ -23,12 +23,13 @@
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-
+@EqualsAndHashCode(callSuper = true, exclude = "status")
 public class RuntimeEntity extends BaseEntity {
     private Long clusterId;
 

eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/storage/StoreEntity.java

@@ -24,11 +24,13 @@
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
+@EqualsAndHashCode(callSuper = true, exclude = "status")
 public class StoreEntity extends BaseEntity {
 
     private Long clusterId;

eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/topic/TopicEntity.java

@@ -25,11 +25,13 @@
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
+@EqualsAndHashCode(callSuper = true, exclude = "status")
 public class TopicEntity extends BaseEntity {
 
     private Long id;

eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/health/HealthService.java

@@ -104,10 +104,9 @@ public void insertCheckService(HealthCheckObjectConfig config) {
                     Class<?> clazz = entry.getValue();
                     HealthCheckType annotation = clazz.getAnnotation(HealthCheckType.class);
                     if (Objects.isNull(annotation)) {
-                        throw new IllegalStateException(
-                            "HealthCheckService must be annotated with HealthCheckType, class is {}" + clazz.getSimpleName());
+                        continue;
                     }
-                    if (annotation.value().equals(config.getHealthCheckResourceType()) || annotation.value()
+                    if (annotation.type().equals(config.getHealthCheckResourceType()) && annotation.subType()
                         .equals(config.getHealthCheckResourceSubType())) {
                         healthCheckService = createCheckService(clazz, config);
                     }

eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/health/annotation/HealthCheckType.java

@@ -31,8 +31,11 @@
 public @interface HealthCheckType {
     /**
      * type of resource. runtime, topic etc.
-     * if resource have a subtype, '-' is used to connect type and subtype.
-     * such as rocketmq4-broker
      */
-    String value();
+    String type();
+
+    /**
+     * subtype of resource. For resource storage, it can be redis, rocketmq etc.
+     */
+    String subType() default "";
 }

eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/health/check/impl/meta/NacosConfigCheck.java

@@ -18,6 +18,7 @@
 package org.apache.eventmesh.dashboard.console.function.health.check.impl.meta;
 
 import static org.apache.eventmesh.dashboard.common.constant.health.HealthCheckTypeConstant.HEALTH_CHECK_SUBTYPE_NACOS_CONFIG;
+import static org.apache.eventmesh.dashboard.common.constant.health.HealthCheckTypeConstant.HEALTH_CHECK_TYPE_META;
 import static org.apache.eventmesh.dashboard.common.constant.health.HealthConstant.NACOS_CHECK_CONTENT;
 import static org.apache.eventmesh.dashboard.common.constant.health.HealthConstant.NACOS_CHECK_DATA_ID;
 import static org.apache.eventmesh.dashboard.common.constant.health.HealthConstant.NACOS_CHECK_GROUP;
@@ -40,7 +41,7 @@
  *
  */
 @Slf4j
-@HealthCheckType(value = HEALTH_CHECK_SUBTYPE_NACOS_CONFIG)
+@HealthCheckType(type = HEALTH_CHECK_TYPE_META, subType = HEALTH_CHECK_SUBTYPE_NACOS_CONFIG)
 public class NacosConfigCheck extends AbstractHealthCheckService {
 
     private ConfigService configService;

eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/health/check/impl/meta/NacosNamingServiceCheck.java

@@ -18,6 +18,7 @@
 package org.apache.eventmesh.dashboard.console.function.health.check.impl.meta;
 
 import static org.apache.eventmesh.dashboard.common.constant.health.HealthCheckTypeConstant.HEALTH_CHECK_SUBTYPE_NACOS_REGISTRY;
+import static org.apache.eventmesh.dashboard.common.constant.health.HealthCheckTypeConstant.HEALTH_CHECK_TYPE_META;
 import static org.apache.eventmesh.dashboard.common.constant.health.HealthConstant.NACOS_CHECK_SERVICE_CLUSTER_NAME;
 import static org.apache.eventmesh.dashboard.common.constant.health.HealthConstant.NACOS_CHECK_SERVICE_NAME;
 
@@ -41,7 +42,7 @@
  */
 
 @Slf4j
-@HealthCheckType(value = HEALTH_CHECK_SUBTYPE_NACOS_REGISTRY)
+@HealthCheckType(type = HEALTH_CHECK_TYPE_META, subType = HEALTH_CHECK_SUBTYPE_NACOS_REGISTRY)
 public class NacosNamingServiceCheck extends AbstractHealthCheckService {
 
     private NamingService namingService;

eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/health/check/impl/storage/RedisCheck.java

@@ -34,7 +34,7 @@
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
-@HealthCheckType(value = HealthCheckTypeConstant.HEALTH_CHECK_SUBTYPE_REDIS)
+@HealthCheckType(type = HealthCheckTypeConstant.HEALTH_CHECK_TYPE_STORAGE, subType = HealthCheckTypeConstant.HEALTH_CHECK_SUBTYPE_REDIS)
 public class RedisCheck extends AbstractHealthCheckService {
 
     private RedisClient redisClient;

eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/health/check/impl/storage/rocketmq4/Rocketmq4NameServerCheck.java

@@ -36,7 +36,7 @@
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
-@HealthCheckType(HealthCheckTypeConstant.HEALTH_CHECK_TYPE_STORAGE)
+@HealthCheckType(type = HealthCheckTypeConstant.HEALTH_CHECK_TYPE_STORAGE, subType = HealthCheckTypeConstant.HEALTH_CHECK_SUBTYPE_ROCKETMQ)
 public class Rocketmq4NameServerCheck extends AbstractHealthCheckService {
 
     private RemotingClient remotingClient;

eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/metadata/handler/db/GroupMetadataHandlerToDbImpl.java

@@ -40,7 +40,8 @@ public class GroupMetadataHandlerToDbImpl implements MetadataHandler<GroupMetada
     @Override
     public void addMetadata(GroupMetadata meta) {
         meta.setMemberCount(0);
-        groupService.addGroup(converter.convert(meta));
+        GroupEntity groupEntity = converter.convert(meta);
+        groupService.addGroup(groupEntity);
     }
 
     @Override

eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/metadata/util/convert/metadata/GroupMetadata2EntityConverter.java

@@ -39,6 +39,6 @@ public GroupEntity convert(GroupMetadata source) {
 
     @Override
     public String getUnique(GroupMetadata source) {
-        return null;
+        return source.getName();
     }
 }

eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/metadata/util/convert/metadata/TopicMetadata2EntityConverter.java

@@ -34,6 +34,7 @@ public TopicEntity convert(TopicMetadata source) {
         topicEntity.setDescription(source.getDescription());
         topicEntity.setStatus(1);
         topicEntity.setClusterId(source.getClusterId());
+        topicEntity.setCreateProgress(1);
 
         return topicEntity;
     }

eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/modle/dto/meta/NewMetaDTO.java

@@ -0,0 +1,31 @@
+/*
+ * 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.
+ */
+
+package org.apache.eventmesh.dashboard.console.modle.dto.meta;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@NoArgsConstructor
+@AllArgsConstructor
+@Data
+public class NewMetaDTO {
+
+    String metaHost;
+    Integer metaPort;
+}

eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/group/GroupService.java

@@ -34,7 +34,7 @@ public interface GroupService {
 
     List<GroupEntity> getGroupByClusterId(GroupEntity groupEntity);
 
-    GroupEntity addGroup(GroupEntity groupEntity);
+    void addGroup(GroupEntity groupEntity);
 
     void updateGroup(GroupEntity groupEntity);
 

eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/group/Impl/GroupServiceImpl.java

@@ -58,9 +58,8 @@ public List<GroupEntity> getGroupByClusterId(GroupEntity groupEntity) {
 
     @EmLog(OprType = "add", OprTarget = "Group")
     @Override
-    public GroupEntity addGroup(GroupEntity groupEntity) {
+    public void addGroup(GroupEntity groupEntity) {
         oprGroupMapper.addGroup(groupEntity);
-        return groupEntity;
     }
 
     @Override