Merge branch 'dev' into pil0txia/dev

# Conflicts: # .gitattributes # .gitignore # README.md # docker/Dockerfile # eventmesh-dashboard-core/pom.xml # eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/EventMeshDashboardApplication.java # eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/config/AdminProperties.java # eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/config/BeanTypeConfig.java # eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/constant/ConfigConst.java # eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/constant/NacosConst.java # eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/controller/ConnectionController.java # eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/controller/MetricsController.java # eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/controller/SubscriptionController.java # eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/controller/TopicController.java # eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/dto/CreateTopicRequest.java # eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/dto/DeleteTopicRequest.java # eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/dto/Result.java # eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/enums/Status.java # eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/exception/BaseException.java # eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/exception/EventMeshAdminException.java # eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/exception/EventMeshException.java # eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/exception/GlobalExceptionHandler.java # eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/exception/MetaException.java # eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/model/ConnectionInfo.java # eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/model/SubscriptionInfo.java # eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/model/TopicProperties.java # eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/service/ConnectionService.java # eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/service/SubscriptionService.java # eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/service/TopicService.java # eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/service/meta/EtcdConnectionService.java # eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/service/meta/EtcdSubscriptionService.java # eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/service/meta/NacosConnectionService.java # eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/service/meta/NacosSubscriptionService.java # eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/service/store/RocketmqTopicService.java # eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/util/ExceptionUtil.java # eventmesh-dashboard-core/src/main/resources/application-dev.yml # eventmesh-dashboard-core/src/main/resources/logback.xml # pom.xml # style/checkstyle-header1.txt
apache · Jan 11, 2024 · 4985859 · 4985859
2 parents daf1e31 + b7106e4
commit 4985859
Show file tree

Hide file tree

Showing 55 changed files with 14 additions and 10,855 deletions.
diff --git a/.dockerignore b/.dockerignore
diff --git a/docs/UserGuide_CN.md b/docs/UserGuide_CN.md
diff --git a/docs/UserGuide_EN.md b/docs/UserGuide_EN.md
diff --git a/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/Main.java b/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/Main.java
@@ -0,0 +1,7 @@
+package org.apache.eventmesh.dashboard.core;
+
+public class Main {
+ public static void main(String[] args) {
+ System.out.println("Hello world!");
+ }
+}
diff --git a/eventmesh-dashboard-service/src/main/java/org/apache/eventmesh/dashboard/service/Main.java b/eventmesh-dashboard-service/src/main/java/org/apache/eventmesh/dashboard/service/Main.java
@@ -0,0 +1,7 @@
+package org.apache.eventmesh.dashboard.service;
+
+public class Main {
+ public static void main(String[] args) {
+ System.out.println("Hello world!");
+ }
+}
diff --git a/frontend/.gitignore → eventmesh-dashboard-view/.gitignore b/frontend/.gitignore → eventmesh-dashboard-view/.gitignore
diff --git a/frontend/.dockerignore b/frontend/.dockerignore
diff --git a/frontend/README.md b/frontend/README.md
diff --git a/frontend/components/client/GrpcClientTable.tsx b/frontend/components/client/GrpcClientTable.tsx