zeaslity/ProjectOctopus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

first can version

Browse Source
This commit is contained in:
zeaslity
2022-11-21 18:20:33 +08:00
parent a6402a5f61
commit 64cf98cf7e
14 changed files with 78 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
server/pom.xml
View File

@@ -6,11 +6,12 @@
<parent>
<groupId>io.wdd</groupId>
<artifactId>ProjectOctopus</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>1.0.0</version>
</parent>
<artifactId>server</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>${project.version}</version>
<name>server</name>
<description>server</description>
@@ -22,9 +23,8 @@
<dependency>
<groupId>io.wdd</groupId>
<artifactId>common</artifactId>
<version>0.0.1-SNAPSHOT</version>
<!--<scope>compile</scope>-->
<artifactId>wdd-common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -87,10 +87,19 @@
<type>pom</type>
<scope>import</scope>
</dependency>
<!-- <dependency>-->
<!-- <groupId>io.wdd</groupId>-->
<!-- <artifactId>wdd-common</artifactId>-->
<!-- <version>${project.version}</version>-->
<!-- <type>jar</type>-->
<!-- <scope>import</scope>-->
<!-- </dependency>-->
</dependencies>
</dependencyManagement>
<build>
<!--<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
@@ -105,6 +114,6 @@
</configuration>
</plugin>
</plugins>
</build>
</build>-->
</project>

2
server/src/main/java/io/wdd/server/controller/AppController.java
View File

@@ -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.*;

2
server/src/main/java/io/wdd/server/controller/ServerController.java
View File

@@ -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;

4
server/src/main/java/io/wdd/server/handler/GlobalExceptionHandler.java
View File

@@ -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;

2
server/src/main/java/io/wdd/server/handler/MyRuntimeException.java
View File

@@ -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;