Skip to content

Commit 1d3f6cb

Browse files
salesonsaleson
authored
Merge pull request #11 from SpringCloud/2.0
2.0
2 parents 0a6dde8 + 1377f02 commit 1d3f6cb

File tree

431 files changed

+18497
-7214
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

431 files changed

+18497
-7214
lines changed

‎README.md‎

Lines changed: 2 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -7,52 +7,11 @@
77

88

99

10-
#### 多版本控制
11-
* [spring-cloud-bamboo](spring-cloud-bamboo/README.md)
12-
* spring-cloud-start-multi-version
13-
* [spring-cloud-mult-version-samples](spring-cloud-mult-version-samples/README.md)
14-
15-
16-
17-
#### 灰度发布
18-
* [spring-cloud-gray-core](spring-cloud-gray-core/README.md)
19-
* spring-cloud-gray-client
20-
* spring-cloud-gray-server
21-
* spring-cloud-start-gray
22-
* spring-cloud-start-gray-server
23-
* [spring-cloud-gray-samples](spring-cloud-gray-samples/README.md)
24-
* [spring-cloud-gray-zookeeper-samples](spring-cloud-gray-zookeeper-samples/README.md)
25-
26-
#### maven 依赖
27-
jar包已经上传到maven中央库，可以通过maven直接从中央库下载
28-
```xml
29-
<!-- 版本控制 -->
30-
<dependency>
31-
<groupId>cn.springcloud.gray</groupId>
32-
<artifactId>spring-cloud-starter-multi-version</artifactId>
33-
<version>{version}</version>
34-
</dependency>
35-
36-
<!-- gray-client -->
37-
<dependency>
38-
<groupId>cn.springcloud.gray</groupId>
39-
<artifactId>spring-cloud-starter-gray</artifactId>
40-
<version>{version}</version>
41-
</dependency>
42-
43-
<!-- gray-server -->
44-
<dependency>
45-
<groupId>cn.springcloud.gray</groupId>
46-
<artifactId>spring-cloud-starter-gray-server</artifactId>
47-
<version>{version}</version>
48-
</dependency>
49-
```
50-
5110

5211
#### 不足
53-
gray目前只有灰度管理的基本功能， 像数据持久化，高可用，推送灰度调整消息等， 都没有实现。 也没有界面化， 仅仅只有接口列表。
12+
没有界面化， 仅仅只有接口列表。
5413

5514

5615
#### 扩展思考
57-
gray目前仅仅只支持spring cloud eureka， 但是在spring cloud中，eureka只是做为其中一个注册中心， 如果要做spring cloud的灰度管理， 就还需要兼容其他的注册中心， 比如zookeeper, consul等。
16+
gray目前仅仅只支持spring cloud eureka， 但是在spring cloud中，eureka只是做为其中一个注册中心， 如果要做spring cloud的灰度管理， 就还需要兼容其他的注册中心， 比如zookeeper, consul, nacos等。
5817

‎pom.xml‎

Lines changed: 134 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4,30 +4,29 @@
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<modelVersion>4.0.0</modelVersion>
66

7-
<groupId>cn.springcloud.gray</groupId>
8-
<artifactId>spring-cloud-gray</artifactId>
9-
<packaging>pom</packaging>
10-
<version>1.1.0</version>
117
<parent>
128
<groupId>org.springframework.boot</groupId>
139
<artifactId>spring-boot-starter-parent</artifactId>
1410
<version>1.5.4.RELEASE</version>
1511
</parent>
12+
<groupId>cn.springcloud.gray</groupId>
13+
<artifactId>spring-cloud-gray</artifactId>
14+
<packaging>pom</packaging>
15+
<version>2.0.0</version>
1616
<modules>
1717

1818
<module>spring-cloud-gray-dependencies</module>
1919

20-
<module>spring-cloud-bamboo</module>
21-
<module>spring-cloud-starter-multi-version</module>
22-
<module>spring-cloud-mult-version-samples</module>
23-
2420
<module>spring-cloud-gray-core</module>
2521
<module>spring-cloud-gray-server</module>
2622
<module>spring-cloud-gray-client</module>
27-
<module>spring-cloud-starter-gray</module>
23+
<module>spring-cloud-starter-gray-client</module>
2824
<module>spring-cloud-starter-gray-server</module>
2925
<module>spring-cloud-gray-samples</module>
30-
<module>spring-cloud-gray-zookeeper-samples</module>
26+
<module>spring-cloud-gray-client-netflix</module>
27+
<module>spring-cloud-gray-utils</module>
28+
<module>spring-cloud-gray-starter-dependencies</module>
29+
<module>spring-cloud-gray-webui</module>
3130
</modules>
3231

3332

@@ -56,11 +55,15 @@
5655
<maven.compiler.source>1.8</maven.compiler.source>
5756
<maven.compiler.target>1.8</maven.compiler.target>
5857
<java.version>1.8</java.version>
59-
<spring-cloud.version>Dalston.SR5</spring-cloud.version>
60-
<springfox.version>2.7.0</springfox.version>
61-
</properties>
62-
58+
<spring-cloud.version>Edgware.SR5</spring-cloud.version>
59+
<springfox.version>2.9.2</springfox.version>
60+
<lombok.version>1.18.8</lombok.version>
61+
<slf4j.version>1.7.26</slf4j.version>
62+
<commons-lang3.version>3.5</commons-lang3.version>
63+
<guava.version>27.0.1-jre</guava.version>
64+
<mapstruct.version>1.1.0.Final</mapstruct.version>
6365

66+
</properties>
6467

6568

6669
<dependencyManagement>
@@ -73,13 +76,13 @@
7376
<scope>import</scope>
7477
</dependency>
7578

76-
<dependency>
77-
<groupId>cn.springcloud.gray</groupId>
78-
<artifactId>spring-cloud-gray-dependencies</artifactId>
79-
<version>${project.version}</version>
80-
<type>pom</type>
81-
<scope>import</scope>
82-
</dependency>
79+
<!-- <dependency>-->
80+
<!-- <groupId>cn.springcloud.gray</groupId>-->
81+
<!-- <artifactId>spring-cloud-gray-dependencies</artifactId>-->
82+
<!-- <version>${project.version}</version>-->
83+
<!-- <type>pom</type>-->
84+
<!-- <scope>import</scope>-->
85+
<!-- </dependency>-->
8386

8487

8588
<dependency>
@@ -93,6 +96,44 @@
9396
</exclusion>
9497
</exclusions>
9598
</dependency>
99+
100+
<dependency>
101+
<groupId>cn.springcloud.gray</groupId>
102+
<artifactId>spring-cloud-gray-core</artifactId>
103+
<version>${project.version}</version>
104+
</dependency>
105+
<dependency>
106+
<groupId>cn.springcloud.gray</groupId>
107+
<artifactId>spring-cloud-gray-client</artifactId>
108+
<version>${project.version}</version>
109+
</dependency>
110+
<dependency>
111+
<groupId>cn.springcloud.gray</groupId>
112+
<artifactId>spring-cloud-gray-client-netflix</artifactId>
113+
<version>${project.version}</version>
114+
</dependency>
115+
<dependency>
116+
<groupId>cn.springcloud.gray</groupId>
117+
<artifactId>spring-cloud-gray-utils</artifactId>
118+
<version>${project.version}</version>
119+
</dependency>
120+
<dependency>
121+
<groupId>cn.springcloud.gray</groupId>
122+
<artifactId>spring-cloud-starter-gray-client</artifactId>
123+
<version>${project.version}</version>
124+
</dependency>
125+
<dependency>
126+
<groupId>cn.springcloud.gray</groupId>
127+
<artifactId>spring-cloud-gray-server</artifactId>
128+
<version>${project.version}</version>
129+
</dependency>
130+
<dependency>
131+
<groupId>cn.springcloud.gray</groupId>
132+
<artifactId>spring-cloud-starter-gray-server</artifactId>
133+
<version>${project.version}</version>
134+
</dependency>
135+
136+
96137
<!-- https://mvnrepository.com/artifact/io.springfox/springfox-swagger-ui -->
97138
<dependency>
98139
<groupId>io.springfox</groupId>
@@ -109,12 +150,84 @@
109150
<artifactId>springfox-bean-validators</artifactId>
110151
<version>${springfox.version}</version>
111152
</dependency>
153+
<dependency>
154+
<groupId>org.projectlombok</groupId>
155+
<artifactId>lombok</artifactId>
156+
<version>${lombok.version}</version>
157+
</dependency>
158+
<dependency>
159+
<groupId>org.slf4j</groupId>
160+
<artifactId>slf4j-api</artifactId>
161+
<version>${slf4j.version}</version>
162+
</dependency>
163+
<dependency>
164+
<groupId>org.apache.commons</groupId>
165+
<artifactId>commons-lang3</artifactId>
166+
<version>${commons-lang3.version}</version>
167+
</dependency>
168+
<dependency>
169+
<groupId>com.google.guava</groupId>
170+
<artifactId>guava</artifactId>
171+
<version>${guava.version}</version>
172+
</dependency>
173+
174+
175+
<!-- https://mvnrepository.com/artifact/javax.servlet/javax.servlet-api -->
176+
<!-- <dependency>-->
177+
<!-- <groupId>javax.servlet</groupId>-->
178+
<!-- <artifactId>javax.servlet-api</artifactId>-->
179+
<!-- <version>${servlet-api.version}</version>-->
180+
<!-- <scope>provided</scope>-->
181+
<!-- </dependency>-->
182+
183+
184+
<dependency>
185+
<groupId>commons-io</groupId>
186+
<artifactId>commons-io</artifactId>
187+
<version>2.4</version>
188+
</dependency>
189+
190+
<dependency>
191+
<groupId>org.mapstruct</groupId>
192+
<artifactId>mapstruct-jdk8</artifactId>
193+
<version>${mapstruct.version}</version>
194+
</dependency>
195+
<dependency>
196+
<groupId>org.mapstruct</groupId>
197+
<artifactId>mapstruct-processor</artifactId>
198+
<version>${mapstruct.version}</version>
199+
<scope>provided</scope>
200+
</dependency>
112201

113202
</dependencies>
114203

115204

116205
</dependencyManagement>
117206

207+
<build>
208+
<defaultGoal>spring-boot:run</defaultGoal>
209+
<plugins>
210+
<plugin>
211+
<groupId>org.apache.maven.plugins</groupId>
212+
<artifactId>maven-compiler-plugin</artifactId>
213+
<version>3.6.0</version>
214+
<configuration>
215+
<annotationProcessorPaths>
216+
<path>
217+
<groupId>org.projectlombok</groupId>
218+
<artifactId>lombok</artifactId>
219+
<version>${lombok.version}</version>
220+
</path>
221+
<path>
222+
<groupId>org.mapstruct</groupId>
223+
<artifactId>mapstruct-processor</artifactId>
224+
<version>${mapstruct.version}</version>
225+
</path>
226+
</annotationProcessorPaths>
227+
</configuration>
228+
</plugin>
229+
</plugins>
230+
</build>
118231

119232
<profiles>
120233
<profile>

0 commit comments

Comments
 (0)