diff --git a/agent/pom.xml b/agent/pom.xml
index fad7267..4333b6d 100644
--- a/agent/pom.xml
+++ b/agent/pom.xml
@@ -4,13 +4,13 @@
4.0.0
io.wdd
- 0.0.1-SNAPSHOT
+ 1.0.0
ProjectOctopus
io.wdd
agent
- 0.0.1-SNAPSHOT
+ ${project.version}
agent
agent
@@ -23,9 +23,9 @@
io.wdd
- common
- 0.0.1-SNAPSHOT
- compile
+ wdd-common
+ ${project.version}
+
diff --git a/common/pom.xml b/common/pom.xml
deleted file mode 100644
index 1f80a6a..0000000
--- a/common/pom.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
- 4.0.0
-
-
- ProjectOctopus
- io.wdd
- 0.0.1-SNAPSHOT
-
-
- io.wdd
- common
- 0.0.1-SNAPSHOT
-
- common
- common
-
-
- 11
-
-
-
-
-
- org.springframework.boot
- spring-boot-maven-plugin
-
-
-
- org.projectlombok
- lombok
-
-
-
-
-
-
-
-
diff --git a/pom.xml b/pom.xml
index 3f0efac..cb1e664 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,20 +14,22 @@
ProjectOctopus
pom
- 0.0.1-SNAPSHOT
+ 1.0.0
ProjectOctopus
ProjectOctopus
agent
server
- common
+ wdd-common
11
2.1.3
2.7.4
+ 1.1.1
+
@@ -100,7 +102,7 @@
-
+
diff --git a/server/pom.xml b/server/pom.xml
index 22ca9c3..145373c 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -6,11 +6,12 @@
io.wdd
ProjectOctopus
- 0.0.1-SNAPSHOT
+ 1.0.0
server
- 0.0.1-SNAPSHOT
+ ${project.version}
+
server
server
@@ -22,9 +23,8 @@
io.wdd
- common
- 0.0.1-SNAPSHOT
-
+ wdd-common
+ ${project.version}
@@ -87,10 +87,19 @@
pom
import
+
+
+
+
+
+
+
+
+
-
+
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..9f77984 100644
--- a/server/src/main/java/io/wdd/server/controller/AppController.java
+++ b/server/src/main/java/io/wdd/server/controller/AppController.java
@@ -1,9 +1,9 @@
package io.wdd.server.controller;
-import io.wdd.common.R;
import io.wdd.server.beans.vo.AppInfoVO;
import io.wdd.server.coreService.CoreAppService;
+import io.wdd.wddcommon.utils.R;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
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..c3d2788 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.wddcommon.utils.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..8b1f73f 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.wddcommon.utils.R;
+import io.wdd.wddcommon.utils.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..c5b0bb5 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.wddcommon.utils.ResultStat;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
diff --git a/common/.gitignore b/wdd-common/.gitignore
similarity index 100%
rename from common/.gitignore
rename to wdd-common/.gitignore
diff --git a/wdd-common/pom.xml b/wdd-common/pom.xml
new file mode 100644
index 0000000..c0404b8
--- /dev/null
+++ b/wdd-common/pom.xml
@@ -0,0 +1,41 @@
+
+
+ 4.0.0
+
+
+ ProjectOctopus
+ io.wdd
+ 1.0.0
+
+
+ io.wdd
+ wdd-common
+
+ ${project.version}
+
+ wdd-common
+ wdd-common
+
+
+ 11
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/common/src/main/java/io/wdd/common/CommonApplication.java b/wdd-common/src/main/java/io/wdd/wddcommon/WddCommonApplication.java
similarity index 61%
rename from common/src/main/java/io/wdd/common/CommonApplication.java
rename to wdd-common/src/main/java/io/wdd/wddcommon/WddCommonApplication.java
index 532d05b..9fd54e5 100644
--- a/common/src/main/java/io/wdd/common/CommonApplication.java
+++ b/wdd-common/src/main/java/io/wdd/wddcommon/WddCommonApplication.java
@@ -1,13 +1,13 @@
-package io.wdd.common;
+package io.wdd.wddcommon;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
@SpringBootApplication
-public class CommonApplication {
+public class WddCommonApplication {
public static void main(String[] args) {
- SpringApplication.run(CommonApplication.class, args);
+ SpringApplication.run(WddCommonApplication.class, args);
}
}
diff --git a/common/src/main/java/io/wdd/common/R.java b/wdd-common/src/main/java/io/wdd/wddcommon/utils/R.java
similarity index 96%
rename from common/src/main/java/io/wdd/common/R.java
rename to wdd-common/src/main/java/io/wdd/wddcommon/utils/R.java
index d404074..42bed63 100644
--- a/common/src/main/java/io/wdd/common/R.java
+++ b/wdd-common/src/main/java/io/wdd/wddcommon/utils/R.java
@@ -1,4 +1,4 @@
-package io.wdd.common;
+package io.wdd.wddcommon.utils;
import lombok.Data;
diff --git a/common/src/main/java/io/wdd/common/ResultStat.java b/wdd-common/src/main/java/io/wdd/wddcommon/utils/ResultStat.java
similarity index 94%
rename from common/src/main/java/io/wdd/common/ResultStat.java
rename to wdd-common/src/main/java/io/wdd/wddcommon/utils/ResultStat.java
index 9f0041a..bfcd684 100644
--- a/common/src/main/java/io/wdd/common/ResultStat.java
+++ b/wdd-common/src/main/java/io/wdd/wddcommon/utils/ResultStat.java
@@ -1,4 +1,4 @@
-package io.wdd.common;
+package io.wdd.wddcommon.utils;
public enum ResultStat {
diff --git a/common/src/main/resources/application.properties b/wdd-common/src/main/resources/application.properties
similarity index 100%
rename from common/src/main/resources/application.properties
rename to wdd-common/src/main/resources/application.properties