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

add new common module

Browse Source
This commit is contained in:
zeaslity
2022-11-21 16:49:08 +08:00
parent 9ab310bc4a
commit 4ad15577f4
13 changed files with 99 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
agent/pom.xml
View File

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

33
common/.gitignore vendored Normal file
View File

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

32
common/pom.xml Normal file
View File

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

13
common/src/main/java/io/wdd/common/CommonApplication.java Normal file
View File

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

1
common/src/main/resources/application.properties Normal file
View File

@@ -0,0 +1 @@

6
pom.xml
View File

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

7
server/pom.xml
View File

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

2
src/main/java/io/wdd/common/R.java → server/src/main/java/io/wdd/server/R.java
View File

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

2
src/main/java/io/wdd/common/ResultStat.java → server/src/main/java/io/wdd/server/ResultStat.java
View File

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

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

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

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.server.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.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;

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.server.ResultStat;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;