From 4ad15577f4aa9ecc9e8a957c3c871084c135bdae Mon Sep 17 00:00:00 2001
From: zeaslity <zeaslity@qq.com>
Date: Mon, 21 Nov 2022 16:49:08 +0800
Subject: [PATCH] add new common module

---
 agent/pom.xml                                 |  7 +++-
 common/.gitignore                             | 33 +++++++++++++++++++
 common/pom.xml                                | 32 ++++++++++++++++++
 .../java/io/wdd/common/CommonApplication.java | 13 ++++++++
 .../src/main/resources/application.properties |  1 +
 pom.xml                                       |  6 +---
 server/pom.xml                                |  7 +++-
 .../src/main/java/io/wdd/server}/R.java       |  2 +-
 .../main/java/io/wdd/server}/ResultStat.java  |  2 +-
 .../wdd/server/controller/AppController.java  |  2 +-
 .../server/controller/ServerController.java   |  2 +-
 .../handler/GlobalExceptionHandler.java       |  4 +--
 .../server/handler/MyRuntimeException.java    |  2 +-
 13 files changed, 99 insertions(+), 14 deletions(-)
 create mode 100644 common/.gitignore
 create mode 100644 common/pom.xml
 create mode 100644 common/src/main/java/io/wdd/common/CommonApplication.java
 create mode 100644 common/src/main/resources/application.properties
 rename {src/main/java/io/wdd/common => server/src/main/java/io/wdd/server}/R.java (97%)
 rename {src/main/java/io/wdd/common => server/src/main/java/io/wdd/server}/ResultStat.java (95%)

diff --git a/agent/pom.xml b/agent/pom.xml
index 25178f7..fad7267 100644
--- a/agent/pom.xml
+++ b/agent/pom.xml
@@ -23,11 +23,16 @@
 
         <dependency>
             <groupId>io.wdd</groupId>
-            <artifactId>ProjectOctopus</artifactId>
+            <artifactId>common</artifactId>
             <version>0.0.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-amqp</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>de.codecentric</groupId>
             <artifactId>spring-boot-admin-starter-client</artifactId>
diff --git a/common/.gitignore b/common/.gitignore
new file mode 100644
index 0000000..549e00a
--- /dev/null
+++ b/common/.gitignore
@@ -0,0 +1,33 @@
+HELP.md
+target/
+!.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**/target/
+!**/src/test/**/target/
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+build/
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### VS Code ###
+.vscode/
diff --git a/common/pom.xml b/common/pom.xml
new file mode 100644
index 0000000..446234e
--- /dev/null
+++ b/common/pom.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <artifactId>ProjectOctopus</artifactId>
+        <groupId>io.wdd</groupId>
+        <version>0.0.1-SNAPSHOT</version>
+    </parent>
+
+    <groupId>io.wdd</groupId>
+    <artifactId>common</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+
+    <name>common</name>
+    <description>common</description>
+
+    <properties>
+        <java.version>11</java.version>
+    </properties>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/common/src/main/java/io/wdd/common/CommonApplication.java b/common/src/main/java/io/wdd/common/CommonApplication.java
new file mode 100644
index 0000000..532d05b
--- /dev/null
+++ b/common/src/main/java/io/wdd/common/CommonApplication.java
@@ -0,0 +1,13 @@
+package io.wdd.common;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class CommonApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(CommonApplication.class, args);
+    }
+
+}
diff --git a/common/src/main/resources/application.properties b/common/src/main/resources/application.properties
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/common/src/main/resources/application.properties
@@ -0,0 +1 @@
+
diff --git a/pom.xml b/pom.xml
index 9bf57d6..3f0efac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,6 +21,7 @@
     <modules>
         <module>agent</module>
         <module>server</module>
+        <module>common</module>
     </modules>
 
     <properties>
@@ -66,11 +67,6 @@
         </dependency>
 
 
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-amqp</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-devtools</artifactId>
diff --git a/server/pom.xml b/server/pom.xml
index 180ad19..c9e39df 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -22,7 +22,7 @@
 
         <dependency>
             <groupId>io.wdd</groupId>
-            <artifactId>ProjectOctopus</artifactId>
+            <artifactId>common</artifactId>
             <version>0.0.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
@@ -38,6 +38,11 @@
             <scope>runtime</scope>
         </dependency>-->
 
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-amqp</artifactId>
+        </dependency>
+
         <!--mybatis-plus的依赖-->
         <dependency>
             <groupId>com.baomidou</groupId>
diff --git a/src/main/java/io/wdd/common/R.java b/server/src/main/java/io/wdd/server/R.java
similarity index 97%
rename from src/main/java/io/wdd/common/R.java
rename to server/src/main/java/io/wdd/server/R.java
index d404074..da7209f 100644
--- a/src/main/java/io/wdd/common/R.java
+++ b/server/src/main/java/io/wdd/server/R.java
@@ -1,4 +1,4 @@
-package io.wdd.common;
+package io.wdd.server;
 
 
 import lombok.Data;
diff --git a/src/main/java/io/wdd/common/ResultStat.java b/server/src/main/java/io/wdd/server/ResultStat.java
similarity index 95%
rename from src/main/java/io/wdd/common/ResultStat.java
rename to server/src/main/java/io/wdd/server/ResultStat.java
index 9f0041a..a2652d1 100644
--- a/src/main/java/io/wdd/common/ResultStat.java
+++ b/server/src/main/java/io/wdd/server/ResultStat.java
@@ -1,4 +1,4 @@
-package io.wdd.common;
+package io.wdd.server;
 
 public enum ResultStat {
 
diff --git a/server/src/main/java/io/wdd/server/controller/AppController.java b/server/src/main/java/io/wdd/server/controller/AppController.java
index cb286d5..1687f67 100644
--- a/server/src/main/java/io/wdd/server/controller/AppController.java
+++ b/server/src/main/java/io/wdd/server/controller/AppController.java
@@ -1,7 +1,7 @@
 package io.wdd.server.controller;
 
 
-import io.wdd.common.R;
+import io.wdd.server.R;
 import io.wdd.server.beans.vo.AppInfoVO;
 import io.wdd.server.coreService.CoreAppService;
 import org.springframework.validation.annotation.Validated;
diff --git a/server/src/main/java/io/wdd/server/controller/ServerController.java b/server/src/main/java/io/wdd/server/controller/ServerController.java
index 5700649..1641c48 100644
--- a/server/src/main/java/io/wdd/server/controller/ServerController.java
+++ b/server/src/main/java/io/wdd/server/controller/ServerController.java
@@ -1,7 +1,7 @@
 package io.wdd.server.controller;
 
 
-import io.wdd.common.R;
+import io.wdd.server.R;
 import io.wdd.server.beans.po.ServerInfoPO;
 import io.wdd.server.beans.vo.ServerInfoVO;
 import io.wdd.server.coreService.CoreServerService;
diff --git a/server/src/main/java/io/wdd/server/handler/GlobalExceptionHandler.java b/server/src/main/java/io/wdd/server/handler/GlobalExceptionHandler.java
index 77cf2de..baaba33 100644
--- a/server/src/main/java/io/wdd/server/handler/GlobalExceptionHandler.java
+++ b/server/src/main/java/io/wdd/server/handler/GlobalExceptionHandler.java
@@ -1,8 +1,8 @@
 package io.wdd.server.handler;
 
 import com.google.common.collect.Maps;
-import io.wdd.common.R;
-import io.wdd.common.ResultStat;
+import io.wdd.server.R;
+import io.wdd.server.ResultStat;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server/src/main/java/io/wdd/server/handler/MyRuntimeException.java b/server/src/main/java/io/wdd/server/handler/MyRuntimeException.java
index 42ac59d..751ac71 100644
--- a/server/src/main/java/io/wdd/server/handler/MyRuntimeException.java
+++ b/server/src/main/java/io/wdd/server/handler/MyRuntimeException.java
@@ -1,6 +1,6 @@
 package io.wdd.server.handler;
 
-import io.wdd.common.ResultStat;
+import io.wdd.server.ResultStat;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;