Merge pull request #72 from QNJR-GROUP/SpringCloudSupportEdition

Version 1.0.0 Released
QNJR-GROUP · Sep 9, 2018 · 90f34e0 · 90f34e0
2 parents 8d4972e + 1a536d7
commit 90f34e0
Show file tree

Hide file tree

Showing 30 changed files with 670 additions and 454 deletions.
diff --git a/.gitignore b/.gitignore
@@ -11,3 +11,4 @@ server_back.properties
 /logs
 /target/
 .DS_Store
+.flattened-pom.xml
diff --git a/easytrans-core/pom.xml b/easytrans-core/pom.xml
@@ -1,12 +1,13 @@
 <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">
   <modelVersion>4.0.0</modelVersion>
+  <name>EasyTransaction core</name>
 
   <artifactId>easytrans-core</artifactId>
 
   	<parent>
 		  <groupId>com.yiqiniu.easytrans</groupId>
 		  <artifactId>easytrans</artifactId>
-		  <version>1.0.0-SNAPSHOT</version>
+		  <version>${revision}</version>
 		  <relativePath>../pom.xml</relativePath>
 	</parent>
 

diff --git a/easytrans-demo/interface-call/interfacecall-order-service/pom.xml b/easytrans-demo/interface-call/interfacecall-order-service/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>com.yiqiniu.easytrans.demos</groupId>
 		<artifactId>interfacecall</artifactId>
-		<version>1.0.0</version>
+		<version>${revision}</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

diff --git a/easytrans-demo/interface-call/interfacecall-wallet-api/pom.xml b/easytrans-demo/interface-call/interfacecall-wallet-api/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>com.yiqiniu.easytrans.demos</groupId>
 		<artifactId>interfacecall</artifactId>
-		<version>1.0.0</version>
+		<version>${revision}</version>
 	</parent>
 
 	<properties>

diff --git a/easytrans-demo/interface-call/interfacecall-wallet-service/pom.xml b/easytrans-demo/interface-call/interfacecall-wallet-service/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.yiqiniu.easytrans.demos</groupId>
 		<artifactId>interfacecall</artifactId>
-		<version>1.0.0</version>
+		<version>${revision}</version>
 	</parent>
 
 

diff --git a/easytrans-demo/interface-call/pom.xml b/easytrans-demo/interface-call/pom.xml
@@ -3,18 +3,23 @@
 	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>org.springframework.boot</groupId>
+		<artifactId>spring-boot-starter-parent</artifactId>
+		<version>1.5.13.RELEASE</version>
+	</parent>
+
 	<groupId>com.yiqiniu.easytrans.demos</groupId>
 	<artifactId>interfacecall</artifactId>
-	<version>1.0.0</version>
+	<version>${revision}</version>
 	<packaging>pom</packaging>
 
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>1.8</java.version>
-		<easytrans.version>1.0.0-SNAPSHOT</easytrans.version>
-		<demo.version>1.0.0</demo.version>
+		<revision>1.0.0</revision>
 	</properties>
 
 
@@ -24,29 +29,39 @@
 		<module>interfacecall-order-service</module>
 	</modules>
 
-
-	<parent>
-		<groupId>com.yiqiniu.easytrans</groupId>
-		<artifactId>easytrans</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
-	</parent>
-
 	<dependencyManagement>
 		<dependencies>
+
+			<dependency>
+				<groupId>org.springframework.cloud</groupId>
+				<artifactId>spring-cloud-dependencies</artifactId>
+				<version>Dalston.SR5</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+
+			<dependency>
+				<groupId>com.yiqiniu.easytrans</groupId>
+				<artifactId>easytrans</artifactId>
+				<version>${revision}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+
 			<dependency>
 				<groupId>com.yiqiniu.easytrans.demos</groupId>
 				<artifactId>interfacecall-wallet-api</artifactId>
-				<version>${demo.version}</version>
+				<version>${revision}</version>
 			</dependency>
 			<dependency>
 				<groupId>com.yiqiniu.easytrans.demos</groupId>
 				<artifactId>interfacecall-wallet-service</artifactId>
-				<version>${demo.version}</version>
+				<version>${revision}</version>
 			</dependency>
 			<dependency>
 				<groupId>com.yiqiniu.easytrans.demos</groupId>
 				<artifactId>interfacecall-order-service</artifactId>
-				<version>${demo.version}</version>
+				<version>${revision}</version>
 			</dependency>
 		</dependencies>
 	</dependencyManagement>

diff --git a/easytrans-demo/sagatcc/pom.xml b/easytrans-demo/sagatcc/pom.xml
@@ -3,18 +3,23 @@
 	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>org.springframework.boot</groupId>
+	    <artifactId>spring-boot-starter-parent</artifactId>
+	    <version>1.5.13.RELEASE</version>
+	</parent>
+
 	<groupId>com.yiqiniu.easytrans.demos</groupId>
 	<artifactId>sagatcc</artifactId>
-	<version>1.0.0</version>
+	<version>${revision}</version>
 	<packaging>pom</packaging>
 
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>1.8</java.version>
-		<easytrans.version>1.0.0-SNAPSHOT</easytrans.version>
-		<demo.version>1.0.0</demo.version>
+		<revision>1.0.0</revision>
 	</properties>
 
 
@@ -24,29 +29,39 @@
 		<module>sagatcc-order-service</module>
 	</modules>
 
-
-	<parent>
-		<groupId>com.yiqiniu.easytrans</groupId>
-		<artifactId>easytrans</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
-	</parent>
-
 	<dependencyManagement>
 		<dependencies>
+
+			<dependency>
+				<groupId>org.springframework.cloud</groupId>
+				<artifactId>spring-cloud-dependencies</artifactId>
+				<version>Dalston.SR5</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+
+			<dependency>
+				<groupId>com.yiqiniu.easytrans</groupId>
+				<artifactId>easytrans</artifactId>
+				<version>${revision}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+
 			<dependency>
 				<groupId>com.yiqiniu.easytrans.demos</groupId>
 				<artifactId>sagatcc-wallet-api</artifactId>
-				<version>${demo.version}</version>
+				<version>${revision}</version>
 			</dependency>
 			<dependency>
 				<groupId>com.yiqiniu.easytrans.demos</groupId>
 				<artifactId>sagatcc-wallet-service</artifactId>
-				<version>${demo.version}</version>
+				<version>${revision}</version>
 			</dependency>
 			<dependency>
 				<groupId>com.yiqiniu.easytrans.demos</groupId>
 				<artifactId>sagatcc-order-service</artifactId>
-				<version>${demo.version}</version>
+				<version>${revision}</version>
 			</dependency>
 		</dependencies>
 	</dependencyManagement>

diff --git a/easytrans-demo/sagatcc/sagatcc-order-service/pom.xml b/easytrans-demo/sagatcc/sagatcc-order-service/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>com.yiqiniu.easytrans.demos</groupId>
 		<artifactId>sagatcc</artifactId>
-		<version>1.0.0</version>
+		<version>${revision}</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

diff --git a/easytrans-demo/sagatcc/sagatcc-wallet-api/pom.xml b/easytrans-demo/sagatcc/sagatcc-wallet-api/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>com.yiqiniu.easytrans.demos</groupId>
 		<artifactId>sagatcc</artifactId>
-		<version>1.0.0</version>
+		<version>${revision}</version>
 	</parent>
 
 	<properties>

diff --git a/easytrans-demo/sagatcc/sagatcc-wallet-service/pom.xml b/easytrans-demo/sagatcc/sagatcc-wallet-service/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.yiqiniu.easytrans.demos</groupId>
 		<artifactId>sagatcc</artifactId>
-		<version>1.0.0</version>
+		<version>${revision}</version>
 	</parent>
 
 

diff --git a/easytrans-demo/tcc-and-msg/pom.xml b/easytrans-demo/tcc-and-msg/pom.xml
@@ -3,18 +3,23 @@
 	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>org.springframework.boot</groupId>
+	    <artifactId>spring-boot-starter-parent</artifactId>
+	    <version>1.5.13.RELEASE</version>
+	</parent>
+
 	<groupId>com.yiqiniu.easytrans.demos</groupId>
 	<artifactId>tccandmsg</artifactId>
-	<version>1.0.0</version>
+	<version>${revision}</version>
 	<packaging>pom</packaging>
 
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>1.8</java.version>
-		<easytrans.version>1.0.0-SNAPSHOT</easytrans.version>
-		<demo.version>1.0.0</demo.version>
+		<revision>1.0.0</revision>
 	</properties>
 
 
@@ -26,39 +31,49 @@
 		<module>tccandmsg-order-service</module>
 	</modules>
 
-
-	<parent>
-		<groupId>com.yiqiniu.easytrans</groupId>
-		<artifactId>easytrans</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
-	</parent>
-
 	<dependencyManagement>
 		<dependencies>
+
+			<dependency>
+				<groupId>org.springframework.cloud</groupId>
+				<artifactId>spring-cloud-dependencies</artifactId>
+				<version>Dalston.SR5</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+
+			<dependency>
+				<groupId>com.yiqiniu.easytrans</groupId>
+				<artifactId>easytrans</artifactId>
+				<version>${revision}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+
 			<dependency>
 				<groupId>com.yiqiniu.easytrans.demos</groupId>
 				<artifactId>tccandmsg-wallet-api</artifactId>
-				<version>${demo.version}</version>
+				<version>${revision}</version>
 			</dependency>
 			<dependency>
 				<groupId>com.yiqiniu.easytrans.demos</groupId>
 				<artifactId>tccandmsg-wallet-service</artifactId>
-				<version>${demo.version}</version>
+				<version>${revision}</version>
 			</dependency>
 			<dependency>
 				<groupId>com.yiqiniu.easytrans.demos</groupId>
 				<artifactId>tccandmsg-order-api</artifactId>
-				<version>${demo.version}</version>
+				<version>${revision}</version>
 			</dependency>
 			<dependency>
 				<groupId>com.yiqiniu.easytrans.demos</groupId>
 				<artifactId>tccandmsg-order-service</artifactId>
-				<version>${demo.version}</version>
+				<version>${revision}</version>
 			</dependency>
 			<dependency>
 				<groupId>com.yiqiniu.easytrans.demos</groupId>
 				<artifactId>tccandmsg-point-service</artifactId>
-				<version>${demo.version}</version>
+				<version>${revision}</version>
 			</dependency>
 		</dependencies>
 	</dependencyManagement>

diff --git a/easytrans-demo/tcc-and-msg/tccandmsg-order-api/pom.xml b/easytrans-demo/tcc-and-msg/tccandmsg-order-api/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>com.yiqiniu.easytrans.demos</groupId>
 		<artifactId>tccandmsg</artifactId>
-		<version>1.0.0</version>
+		<version>${revision}</version>
 	</parent>
 
 	<properties>

diff --git a/easytrans-demo/tcc-and-msg/tccandmsg-order-service/pom.xml b/easytrans-demo/tcc-and-msg/tccandmsg-order-service/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>com.yiqiniu.easytrans.demos</groupId>
 		<artifactId>tccandmsg</artifactId>
-		<version>1.0.0</version>
+		<version>${revision}</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

diff --git a/easytrans-demo/tcc-and-msg/tccandmsg-point-service/pom.xml b/easytrans-demo/tcc-and-msg/tccandmsg-point-service/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.yiqiniu.easytrans.demos</groupId>
 		<artifactId>tccandmsg</artifactId>
-		<version>1.0.0</version>
+		<version>${revision}</version>
 	</parent>
 
 

diff --git a/easytrans-demo/tcc-and-msg/tccandmsg-wallet-api/pom.xml b/easytrans-demo/tcc-and-msg/tccandmsg-wallet-api/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>com.yiqiniu.easytrans.demos</groupId>
 		<artifactId>tccandmsg</artifactId>
-		<version>1.0.0</version>
+		<version>${revision}</version>
 	</parent>
 
 	<properties>

diff --git a/easytrans-demo/tcc-and-msg/tccandmsg-wallet-service/pom.xml b/easytrans-demo/tcc-and-msg/tccandmsg-wallet-service/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.yiqiniu.easytrans.demos</groupId>
 		<artifactId>tccandmsg</artifactId>
-		<version>1.0.0</version>
+		<version>${revision}</version>
 	</parent>