fix(*):1.解决冲突

apache · Jun 6, 2024 · 7477785 · 7477785
2 parents ae4da16 + fac7d3d
commit 7477785
Show file tree

Hide file tree

Showing 13 changed files with 188 additions and 38 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 ### STS ###
 .apt_generated
 .classpath
@@ -44,26 +45,72 @@ out/
 .settings
 .springBeans
 .sts4-cache
+=======
+.settings/
+.project
+.classpath
+.target
+./**/.settings/
+./**/.project
+./**/.classpath
+./**/target/
+
+
+#gitignore文件的内容
+.factorypath
+.DS_Store
+.project
+*.prefs
+.classpath
+.setting/h
+.settings/
+.idea/
+*.iml
+*.ipr
+*.iws
+logs/
+
+#忽略eclipse相关
+>>>>>>> main
 org.eclipse.core.resources.prefs
 org.eclipse.jdt.core.prefs
 org.eclipse.m2e.core.prefs
 org.eclipse.wst.common.component
 org.eclipse.wst.common.project.facet.core.xml
+<<<<<<< HEAD
 *.prefs
 
 ### Java ###
 *.class
 *.trc
 
 ### Package Files ###
+=======
+
+#忽略java相关的文件
+*.class
+*.trc
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+>>>>>>> main
 *.jar
 *.war
 *.ear
 
+<<<<<<< HEAD
 ### Maven ###
 .target
 target/
 ./**/target/
+=======
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+
+#忽略maven相关的文件
+target/
+>>>>>>> main
 pom.xml.tag
 pom.xml.releaseBackup
 pom.xml.versionsBackup
@@ -73,6 +120,7 @@ dependency-reduced-pom.xml
 buildNumber.properties
 .mvn/timing.properties
 
+<<<<<<< HEAD
 ### Gradle ###
 .gradle
 build/
@@ -87,4 +135,72 @@ logs/
 hs_err_pid*
 
 ### Devops ###
-.env
+.env
+=======
+# Built application files
+*.apk
+*.ap_
+
+
+#忽略andriod相关的文件
+# Files for the Dalvik VM
+*.dex
+# Generated files
+bin/
+gen/
+# Gradle files
+.gradle/
+build/
+*/build/
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Proguard folder generated by Eclipse
+proguard/
+# Log Files
+*.log
+# Android Studio Navigation editor temp files
+.navigation/
+# Android Studio captures folder
+captures/
+
+target/
+!.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**/target/
+!**/src/test/**/target/
+
+### IntelliJ IDEA ###
+.idea/modules.xml
+.idea/jarRepositories.xml
+.idea/compiler.xml
+.idea/libraries/
+*.iws
+*.iml
+*.ipr
+
+### Eclipse ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+build/
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### VS Code ###
+.vscode/
+
+### Mac OS ###
+.DS_Store
+>>>>>>> main
diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar
diff --git a/README.md b/README.md
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 # Apache EventMesh Dashboard
 
 [🌐 简体中文](README.zh-CN.md)
@@ -149,4 +150,30 @@ docker run -d --name eventmesh-dashboard -p 8080:8080 yourname/eventmesh-dashboa
  4. config
  5. 关联
 7. 集群元数据复制并创建
-8. 集群恢复
+8. 集群恢复
+=======
+
+
+## 介绍
+
+
+## 业务架构
+
+
+## 技术架构
+
+
+### 模块依赖图
+
+### 模块介绍
+
+1. eventmesh-dashboard-console 业务模块的代码
+2. eventmesh-dashboard-observe 监控模块的代码
+3. eventmesh-dashboard-core 对eventmesh以及相关组件的代码
+4. eventmesh-dashboard-service 公用接口
+5. eventmesh-dashboard-common 公共模块的代码
+6. eventmesh-dashboard-view 前端代码
+
+
+### eventmesh-dashboard-core 介绍
+>>>>>>> main
diff --git a/eventmesh-dashboard-common/pom.xml b/eventmesh-dashboard-common/pom.xml
@@ -26,6 +26,7 @@
  <version>0.0.1-SNAPSHOT</version>
  </parent>
 
+ <groupId>org.apache.eventmesh.dashboard.common</groupId>
  <artifactId>eventmesh-dashboard-common</artifactId>
 
  <properties>

diff --git a/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/Main.java b/eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/Main.java
@@ -0,0 +1,7 @@
+package org.apache.eventmesh.dashboard.common;
+
+public class Main {
+ public static void main(String[] args) {
+ System.out.println("Hello world!");
+ }
+}
diff --git a/eventmesh-dashboard-console/pom.xml b/eventmesh-dashboard-console/pom.xml
@@ -26,7 +26,7 @@
  <version>0.0.1-SNAPSHOT</version>
  </parent>
 
- <groupId>org.apache.eventmesh.dashboard</groupId>
+ <groupId>org.apache.eventmesh.dashboard.console</groupId>
  <artifactId>eventmesh-dashboard-console</artifactId>
 
  <properties>
@@ -38,17 +38,17 @@
  <dependencies>
  <!-- EventMesh Dashboard modules -->
  <dependency>
- <groupId>org.apache.eventmesh.dashboard</groupId>
+ <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</groupId>
+ <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</groupId>
+ <groupId>org.apache.eventmesh.dashboard.service</groupId>
  <artifactId>eventmesh-dashboard-service</artifactId>
  <version>0.0.1-SNAPSHOT</version>
  </dependency>
@@ -65,7 +65,7 @@
  <artifactId>mybatis-dependent</artifactId>
  <version>0.1.4</version>
  </dependency>
-  <dependency>
+ <dependency>
  <groupId>com.github.pagehelper</groupId>
  <artifactId>pagehelper-spring-boot-starter</artifactId>
  <version>2.1.0</version>

diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/Main.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/Main.java
@@ -0,0 +1,7 @@
+package org.apache.eventmesh.dashboard.console;
+
+public class Main {
+ public static void main(String[] args) {
+ System.out.println("Hello world!");
+ }
+}
diff --git a/eventmesh-dashboard-core/pom.xml b/eventmesh-dashboard-core/pom.xml
@@ -25,6 +25,7 @@
  <artifactId>eventmesh-dashboard</artifactId>
  <version>0.0.1-SNAPSHOT</version>
  </parent>
+ <groupId>org.apache.eventmesh.dashboard.core</groupId>
  <artifactId>eventmesh-dashboard-core</artifactId>
  <version>0.0.1-SNAPSHOT</version>
  <name>eventmesh-dashboard-core</name>
@@ -50,12 +51,12 @@
 
  <!-- EventMesh Dashboard modules -->
  <dependency>
- <groupId>org.apache.eventmesh.dashboard</groupId>
+ <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</groupId>
+ <groupId>org.apache.eventmesh.dashboard.service</groupId>
  <artifactId>eventmesh-dashboard-service</artifactId>
  <version>0.0.1-SNAPSHOT</version>
  </dependency>
@@ -94,12 +95,12 @@
  <dependency>
  <groupId>org.apache.rocketmq</groupId>
  <artifactId>rocketmq-client</artifactId>
- <version>5.2.0</version>
+ <version>4.9.8</version>
  </dependency>
  <dependency>
  <groupId>org.apache.rocketmq</groupId>
  <artifactId>rocketmq-tools</artifactId>
- <version>5.2.0</version>
+ <version>4.9.8</version>
  </dependency>
  <!-- kafka client -->
  <dependency>
@@ -120,4 +121,4 @@
  <scope>provided</scope>
  </dependency>
  </dependencies>
-</project>
+</project>
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-observe/pom.xml b/eventmesh-dashboard-observe/pom.xml
@@ -26,7 +26,7 @@
  <version>0.0.1-SNAPSHOT</version>
  </parent>
 
- <groupId>org.apache.eventmesh.dashboard</groupId>
+ <groupId>org.apache.eventmesh.dashboard.observe</groupId>
  <artifactId>eventmesh-dashboard-observe</artifactId>
 
  <properties>

diff --git a/eventmesh-dashboard-observe/src/main/java/org/apache/eventmesh/dashboard/observe/Main.java b/eventmesh-dashboard-observe/src/main/java/org/apache/eventmesh/dashboard/observe/Main.java
diff --git a/eventmesh-dashboard-service/pom.xml b/eventmesh-dashboard-service/pom.xml
@@ -25,6 +25,7 @@
  <artifactId>eventmesh-dashboard</artifactId>
  <version>0.0.1-SNAPSHOT</version>
  </parent>
+ <groupId>org.apache.eventmesh.dashboard.service</groupId>
  <artifactId>eventmesh-dashboard-service</artifactId>
  <version>0.0.1-SNAPSHOT</version>
  <name>eventmesh-dashboard-service</name>
@@ -37,7 +38,7 @@
  <dependencies>
  <!-- EventMesh Dashboard modules -->
  <dependency>
- <groupId>org.apache.eventmesh.dashboard</groupId>
+ <groupId>org.apache.eventmesh.dashboard.common</groupId>
  <artifactId>eventmesh-dashboard-common</artifactId>
  <version>0.0.1-SNAPSHOT</version>
  </dependency>

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!");
+ }
+}