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

10
agent/pom.xml
View File

@@ -4,13 +4,13 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>io.wdd</groupId>
<version>0.0.1-SNAPSHOT</version>
<version>1.0.0</version>
<artifactId>ProjectOctopus</artifactId>
</parent>
<groupId>io.wdd</groupId>
<artifactId>agent</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>${project.version}</version>
<name>agent</name>
<description>agent</description>
@@ -23,9 +23,9 @@
<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>
<!-- <scope>compile</scope>-->
</dependency>
<dependency>

40
common/pom.xml
View File

@@ -1,40 +0,0 @@
<?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>
<configuration>
<excludes>
<exclude>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</exclude>
</excludes>
</configuration>
</plugin>
</plugins>
</build>
</project>

10
pom.xml
View File

@@ -14,20 +14,22 @@
<artifactId>ProjectOctopus</artifactId>
<packaging>pom</packaging>
<version>0.0.1-SNAPSHOT</version>
<version>1.0.0</version>
<name>ProjectOctopus</name>
<description>ProjectOctopus</description>
<modules>
<module>agent</module>
<module>server</module>
<module>common</module>
<module>wdd-common</module>
</modules>
<properties>
<java.version>11</java.version>
<spring-shell.version>2.1.3</spring-shell.version>
<spring-boot-admin.version>2.7.4</spring-boot-admin.version>
<project.version>1.1.1</project.version>
</properties>
<dependencies>
@@ -100,7 +102,7 @@
</dependencies>
</dependencyManagement>
<build>
<!--<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
@@ -115,6 +117,6 @@
</configuration>
</plugin>
</plugins>
</build>
</build>-->
</project>

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;

0
common/.gitignore → wdd-common/.gitignore vendored
View File

41
wdd-common/pom.xml Normal file
View File

@@ -0,0 +1,41 @@
<?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>1.0.0</version>
</parent>
<groupId>io.wdd</groupId>
<artifactId>wdd-common</artifactId>
<version>${project.version}</version>
<name>wdd-common</name>
<description>wdd-common</description>
<properties>
<java.version>11</java.version>
</properties>
<!-- <build>-->
<!-- <plugins>-->
<!-- <plugin>-->
<!-- <groupId>org.springframework.boot</groupId>-->
<!-- <artifactId>spring-boot-maven-plugin</artifactId>-->
<!-- <configuration>-->
<!-- <excludes>-->
<!-- <exclude>-->
<!-- <groupId>org.projectlombok</groupId>-->
<!-- <artifactId>lombok</artifactId>-->
<!-- </exclude>-->
<!-- </excludes>-->
<!-- </configuration>-->
<!-- </plugin>-->
<!-- </plugins>-->
<!-- </build>-->
</project>

6
common/src/main/java/io/wdd/common/CommonApplication.java → wdd-common/src/main/java/io/wdd/wddcommon/WddCommonApplication.java
View File

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

2
common/src/main/java/io/wdd/common/R.java → wdd-common/src/main/java/io/wdd/wddcommon/utils/R.java
View File

@@ -1,4 +1,4 @@
package io.wdd.common;
package io.wdd.wddcommon.utils;
import lombok.Data;

2
common/src/main/java/io/wdd/common/ResultStat.java → wdd-common/src/main/java/io/wdd/wddcommon/utils/ResultStat.java
View File

@@ -1,4 +1,4 @@
package io.wdd.common;
package io.wdd.wddcommon.utils;
public enum ResultStat {

0
common/src/main/resources/application.properties → wdd-common/src/main/resources/application.properties
View File