Skip to content

Commit 90f34e0

Browse files
skyesxskyesx
authored
Merge pull request #72 from QNJR-GROUP/SpringCloudSupportEdition
Version 1.0.0 Released
2 parents 8d4972e + 1a536d7 commit 90f34e0

File tree

30 files changed

+670
-454
lines changed

30 files changed

+670
-454
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@ server_back.properties
1111
/logs
1212
/target/
1313
.DS_Store
14+
.flattened-pom.xml

‎easytrans-core/pom.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
<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">
22
<modelVersion>4.0.0</modelVersion>
3+
<name>EasyTransaction core</name>
34

45
<artifactId>easytrans-core</artifactId>
56

67
<parent>
78
<groupId>com.yiqiniu.easytrans</groupId>
89
<artifactId>easytrans</artifactId>
9-
<version>1.0.0-SNAPSHOT</version>
10+
<version>${revision}</version>
1011
<relativePath>../pom.xml</relativePath>
1112
</parent>
1213

‎easytrans-demo/interface-call/interfacecall-order-service/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<parent>
99
<groupId>com.yiqiniu.easytrans.demos</groupId>
1010
<artifactId>interfacecall</artifactId>
11-
<version>1.0.0</version>
11+
<version>${revision}</version>
1212
<relativePath>../pom.xml</relativePath>
1313
</parent>
1414

‎easytrans-demo/interface-call/interfacecall-wallet-api/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<parent>
1111
<groupId>com.yiqiniu.easytrans.demos</groupId>
1212
<artifactId>interfacecall</artifactId>
13-
<version>1.0.0</version>
13+
<version>${revision}</version>
1414
</parent>
1515

1616
<properties>

‎easytrans-demo/interface-call/interfacecall-wallet-service/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.yiqiniu.easytrans.demos</groupId>
88
<artifactId>interfacecall</artifactId>
9-
<version>1.0.0</version>
9+
<version>${revision}</version>
1010
</parent>
1111

1212

‎easytrans-demo/interface-call/pom.xml‎

Lines changed: 28 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,23 @@
33
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
44
<modelVersion>4.0.0</modelVersion>
55

6+
<parent>
7+
<groupId>org.springframework.boot</groupId>
8+
<artifactId>spring-boot-starter-parent</artifactId>
9+
<version>1.5.13.RELEASE</version>
10+
</parent>
11+
612
<groupId>com.yiqiniu.easytrans.demos</groupId>
713
<artifactId>interfacecall</artifactId>
8-
<version>1.0.0</version>
14+
<version>${revision}</version>
915
<packaging>pom</packaging>
1016

1117

1218
<properties>
1319
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1420
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
1521
<java.version>1.8</java.version>
16-
<easytrans.version>1.0.0-SNAPSHOT</easytrans.version>
17-
<demo.version>1.0.0</demo.version>
22+
<revision>1.0.0</revision>
1823
</properties>
1924

2025

@@ -24,29 +29,39 @@
2429
<module>interfacecall-order-service</module>
2530
</modules>
2631

27-
28-
<parent>
29-
<groupId>com.yiqiniu.easytrans</groupId>
30-
<artifactId>easytrans</artifactId>
31-
<version>1.0.0-SNAPSHOT</version>
32-
</parent>
33-
3432
<dependencyManagement>
3533
<dependencies>
34+
35+
<dependency>
36+
<groupId>org.springframework.cloud</groupId>
37+
<artifactId>spring-cloud-dependencies</artifactId>
38+
<version>Dalston.SR5</version>
39+
<type>pom</type>
40+
<scope>import</scope>
41+
</dependency>
42+
43+
<dependency>
44+
<groupId>com.yiqiniu.easytrans</groupId>
45+
<artifactId>easytrans</artifactId>
46+
<version>${revision}</version>
47+
<type>pom</type>
48+
<scope>import</scope>
49+
</dependency>
50+
3651
<dependency>
3752
<groupId>com.yiqiniu.easytrans.demos</groupId>
3853
<artifactId>interfacecall-wallet-api</artifactId>
39-
<version>${demo.version}</version>
54+
<version>${revision}</version>
4055
</dependency>
4156
<dependency>
4257
<groupId>com.yiqiniu.easytrans.demos</groupId>
4358
<artifactId>interfacecall-wallet-service</artifactId>
44-
<version>${demo.version}</version>
59+
<version>${revision}</version>
4560
</dependency>
4661
<dependency>
4762
<groupId>com.yiqiniu.easytrans.demos</groupId>
4863
<artifactId>interfacecall-order-service</artifactId>
49-
<version>${demo.version}</version>
64+
<version>${revision}</version>
5065
</dependency>
5166
</dependencies>
5267
</dependencyManagement>

‎easytrans-demo/sagatcc/pom.xml‎

Lines changed: 28 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,23 @@
33
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
44
<modelVersion>4.0.0</modelVersion>
55

6+
<parent>
7+
<groupId>org.springframework.boot</groupId>
8+
<artifactId>spring-boot-starter-parent</artifactId>
9+
<version>1.5.13.RELEASE</version>
10+
</parent>
11+
612
<groupId>com.yiqiniu.easytrans.demos</groupId>
713
<artifactId>sagatcc</artifactId>
8-
<version>1.0.0</version>
14+
<version>${revision}</version>
915
<packaging>pom</packaging>
1016

1117

1218
<properties>
1319
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1420
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
1521
<java.version>1.8</java.version>
16-
<easytrans.version>1.0.0-SNAPSHOT</easytrans.version>
17-
<demo.version>1.0.0</demo.version>
22+
<revision>1.0.0</revision>
1823
</properties>
1924

2025

@@ -24,29 +29,39 @@
2429
<module>sagatcc-order-service</module>
2530
</modules>
2631

27-
28-
<parent>
29-
<groupId>com.yiqiniu.easytrans</groupId>
30-
<artifactId>easytrans</artifactId>
31-
<version>1.0.0-SNAPSHOT</version>
32-
</parent>
33-
3432
<dependencyManagement>
3533
<dependencies>
34+
35+
<dependency>
36+
<groupId>org.springframework.cloud</groupId>
37+
<artifactId>spring-cloud-dependencies</artifactId>
38+
<version>Dalston.SR5</version>
39+
<type>pom</type>
40+
<scope>import</scope>
41+
</dependency>
42+
43+
<dependency>
44+
<groupId>com.yiqiniu.easytrans</groupId>
45+
<artifactId>easytrans</artifactId>
46+
<version>${revision}</version>
47+
<type>pom</type>
48+
<scope>import</scope>
49+
</dependency>
50+
3651
<dependency>
3752
<groupId>com.yiqiniu.easytrans.demos</groupId>
3853
<artifactId>sagatcc-wallet-api</artifactId>
39-
<version>${demo.version}</version>
54+
<version>${revision}</version>
4055
</dependency>
4156
<dependency>
4257
<groupId>com.yiqiniu.easytrans.demos</groupId>
4358
<artifactId>sagatcc-wallet-service</artifactId>
44-
<version>${demo.version}</version>
59+
<version>${revision}</version>
4560
</dependency>
4661
<dependency>
4762
<groupId>com.yiqiniu.easytrans.demos</groupId>
4863
<artifactId>sagatcc-order-service</artifactId>
49-
<version>${demo.version}</version>
64+
<version>${revision}</version>
5065
</dependency>
5166
</dependencies>
5267
</dependencyManagement>

‎easytrans-demo/sagatcc/sagatcc-order-service/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<parent>
99
<groupId>com.yiqiniu.easytrans.demos</groupId>
1010
<artifactId>sagatcc</artifactId>
11-
<version>1.0.0</version>
11+
<version>${revision}</version>
1212
<relativePath>../pom.xml</relativePath>
1313
</parent>
1414

‎easytrans-demo/sagatcc/sagatcc-wallet-api/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<parent>
1111
<groupId>com.yiqiniu.easytrans.demos</groupId>
1212
<artifactId>sagatcc</artifactId>
13-
<version>1.0.0</version>
13+
<version>${revision}</version>
1414
</parent>
1515

1616
<properties>

‎easytrans-demo/sagatcc/sagatcc-wallet-service/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.yiqiniu.easytrans.demos</groupId>
88
<artifactId>sagatcc</artifactId>
9-
<version>1.0.0</version>
9+
<version>${revision}</version>
1010
</parent>
1111

1212

0 commit comments

Comments
 (0)