diff --git a/common/pom.xml b/common/pom.xml index 446234e..1f80a6a 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -25,6 +25,14 @@ org.springframework.boot spring-boot-maven-plugin + + + + org.projectlombok + lombok + + + diff --git a/server/src/main/java/io/wdd/server/R.java b/common/src/main/java/io/wdd/common/R.java similarity index 97% rename from server/src/main/java/io/wdd/server/R.java rename to common/src/main/java/io/wdd/common/R.java index da7209f..d404074 100644 --- a/server/src/main/java/io/wdd/server/R.java +++ b/common/src/main/java/io/wdd/common/R.java @@ -1,4 +1,4 @@ -package io.wdd.server; +package io.wdd.common; import lombok.Data; diff --git a/server/src/main/java/io/wdd/server/ResultStat.java b/common/src/main/java/io/wdd/common/ResultStat.java similarity index 95% rename from server/src/main/java/io/wdd/server/ResultStat.java rename to common/src/main/java/io/wdd/common/ResultStat.java index a2652d1..9f0041a 100644 --- a/server/src/main/java/io/wdd/server/ResultStat.java +++ b/common/src/main/java/io/wdd/common/ResultStat.java @@ -1,4 +1,4 @@ -package io.wdd.server; +package io.wdd.common; public enum ResultStat { diff --git a/server/pom.xml b/server/pom.xml index c9e39df..22ca9c3 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -24,7 +24,7 @@ io.wdd common 0.0.1-SNAPSHOT - compile + 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 1687f67..cb286d5 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.server.R; +import io.wdd.common.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 1641c48..5700649 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.server.R; +import io.wdd.common.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 baaba33..77cf2de 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.server.R; -import io.wdd.server.ResultStat; +import io.wdd.common.R; +import io.wdd.common.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 751ac71..42ac59d 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.server.ResultStat; +import io.wdd.common.ResultStat; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor;