chore: 调整项目结构
diff --git a/common/core/.gitignore b/common/core/.gitignore
new file mode 100644
index 0000000..b83d222
--- /dev/null
+++ b/common/core/.gitignore
@@ -0,0 +1 @@
+/target/
diff --git a/common/core/pom.xml b/common/core/pom.xml
index 4b69173..ef4a706 100644
--- a/common/core/pom.xml
+++ b/common/core/pom.xml
@@ -5,9 +5,8 @@
<parent>
<groupId>com.supwisdom.institute</groupId>
- <artifactId>sw-backend-parent</artifactId>
+ <artifactId>sw-backend-common-parent</artifactId>
<version>0.0.2-SNAPSHOT</version>
- <relativePath>../../</relativePath>
</parent>
<groupId>com.supwisdom.institute</groupId>
diff --git a/common/framework/.gitignore b/common/framework/.gitignore
new file mode 100644
index 0000000..b83d222
--- /dev/null
+++ b/common/framework/.gitignore
@@ -0,0 +1 @@
+/target/
diff --git a/common/framework/pom.xml b/common/framework/pom.xml
index 092d616..68e9c10 100644
--- a/common/framework/pom.xml
+++ b/common/framework/pom.xml
@@ -5,9 +5,8 @@
<parent>
<groupId>com.supwisdom.institute</groupId>
- <artifactId>sw-backend-parent</artifactId>
+ <artifactId>sw-backend-common-parent</artifactId>
<version>0.0.2-SNAPSHOT</version>
- <relativePath>../../</relativePath>
</parent>
<groupId>com.supwisdom.institute</groupId>
diff --git a/common/pom.xml b/common/pom.xml
index a324f66..cec612e 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -1,21 +1,21 @@
<?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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
-
+
<parent>
- <groupId>com.supwisdom.institute</groupId>
- <artifactId>sw-backend-parent</artifactId>
- <version>0.0.2-SNAPSHOT</version>
+ <groupId>com.supwisdom.buildcommons</groupId>
+ <artifactId>spring-cloud-parent</artifactId>
+ <version>Finchley.RELEASE-1.1</version>
</parent>
-
+
<groupId>com.supwisdom.institute</groupId>
- <artifactId>sw-backend-common</artifactId>
+ <artifactId>sw-backend-common-parent</artifactId>
<version>0.0.2-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>Supwisdom Backend Framework Common</name>
- <description>Supwisdom Backend Framework Common project</description>
+ <name>Supwisdom Backend Framework Common Parent</name>
+ <description>Supwisdom Backend Framework Common Parent project</description>
<modules>
<module>core</module>
@@ -23,15 +23,122 @@
<module>framework</module>
</modules>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-deploy-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <java.version>1.8</java.version>
+
+ <argLine>-Dfile.encoding=UTF-8</argLine>
+
+ <downloadSources>true</downloadSources>
+ <downloadJavadocs>true</downloadJavadocs>
+
+ <maven.compiler.source>${java.version}</maven.compiler.source>
+ <maven.compiler.target>${java.version}</maven.compiler.target>
+
+ <dockerfile-maven-plugin.version>1.4.8</dockerfile-maven-plugin.version>
+ <dockerfile.image.server>harbor.supwisdom.com</dockerfile.image.server>
+ <dockerfile.image.prefix>sw-admin-framework</dockerfile.image.prefix>
+
+ <infras.version>0.1.1-SNAPSHOT</infras.version>
+
+ <io.springfox.version>2.9.2</io.springfox.version>
+
+ </properties>
+
+ <distributionManagement>
+ <repository>
+ <id>supwisdom-releases</id>
+ <name>internal release</name>
+ <url>https://app.supwisdom.com/nexus/content/repositories/releases</url>
+ </repository>
+ <snapshotRepository>
+ <id>supwisdom-snapshots</id>
+ <name>internal snapshots</name>
+ <url>https://app.supwisdom.com/nexus/content/repositories/snapshots</url>
+ </snapshotRepository>
+ </distributionManagement>
+
+ <repositories>
+ <repository>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <id>supwisdom</id>
+ <url>https://app.supwisdom.com/nexus/content/groups/public/</url>
+ </repository>
+ <repository>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ <id>central</id>
+ <url>http://repo.maven.apache.org/maven2</url>
+ </repository>
+ </repositories>
+
+ <dependencyManagement>
+ <dependencies>
+
+ <dependency>
+ <groupId>com.supwisdom.infras</groupId>
+ <artifactId>infras-bom</artifactId>
+ <version>${infras.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+
+
+ <dependency>
+ <groupId>com.supwisdom.institute</groupId>
+ <artifactId>sw-backend-common-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.supwisdom.institute</groupId>
+ <artifactId>sw-backend-common-utils</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.supwisdom.institute</groupId>
+ <artifactId>sw-backend-common-framework</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+
+ <!-- 使用Apache HttpClient替换Feign原生httpclient -->
+ <dependency>
+ <groupId>com.netflix.feign</groupId>
+ <artifactId>feign-httpclient</artifactId>
+ <version>8.17.0</version>
+ </dependency>
+
+
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>fastjson</artifactId>
+ <version>1.2.61</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>28.0-jre</version>
+ </dependency>
+
+
+ <dependency>
+ <groupId>io.springfox</groupId>
+ <artifactId>springfox-swagger2</artifactId>
+ <version>${io.springfox.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.springfox</groupId>
+ <artifactId>springfox-swagger-ui</artifactId>
+ <version>${io.springfox.version}</version>
+ </dependency>
+
+ </dependencies>
+ </dependencyManagement>
</project>
diff --git a/common/utils/.gitignore b/common/utils/.gitignore
new file mode 100644
index 0000000..b83d222
--- /dev/null
+++ b/common/utils/.gitignore
@@ -0,0 +1 @@
+/target/
diff --git a/common/utils/pom.xml b/common/utils/pom.xml
index 99fa621..59367e7 100644
--- a/common/utils/pom.xml
+++ b/common/utils/pom.xml
@@ -5,9 +5,8 @@
<parent>
<groupId>com.supwisdom.institute</groupId>
- <artifactId>sw-backend-parent</artifactId>
+ <artifactId>sw-backend-common-parent</artifactId>
<version>0.0.2-SNAPSHOT</version>
- <relativePath>../../</relativePath>
</parent>
<groupId>com.supwisdom.institute</groupId>