Skip to content

Commit c95991f

Browse files
salesonsaleson
committed
Merge remote-tracking branch 'remotes/origin/B1' into C1
# Conflicts: # README.md # pom.xml # sonar-project.properties # spring-cloud-gray-client-netflix/pom.xml # spring-cloud-gray-client-netflix/src/main/java/cn/springcloud/gray/client/netflix/RibbonServerChooser.java # spring-cloud-gray-client-netflix/src/main/java/cn/springcloud/gray/client/netflix/configuration/NetflixRibbonGrayAutoConfiguration.java # spring-cloud-gray-client-netflix/src/main/java/cn/springcloud/gray/client/netflix/ribbon/GrayChooserRule.java # spring-cloud-gray-client-netflix/src/main/java/cn/springcloud/gray/client/netflix/ribbon/GrayLoadBalanceRule.java # spring-cloud-gray-client-netflix/src/main/java/cn/springcloud/gray/client/netflix/ribbon/RibbonServerExplainer.java # spring-cloud-gray-client/pom.xml # spring-cloud-gray-client/src/main/java/cn/springcloud/gray/AbstractGrayManager.java # spring-cloud-gray-client/src/main/java/cn/springcloud/gray/GrayClientHolder.java # spring-cloud-gray-client/src/main/java/cn/springcloud/gray/GrayManager.java # spring-cloud-gray-client/src/main/java/cn/springcloud/gray/ServerChooser.java # spring-cloud-gray-client/src/main/java/cn/springcloud/gray/choose/DefaultGrayPredicate.java # spring-cloud-gray-client/src/main/java/cn/springcloud/gray/client/config/GrayClientDiscoveryAutoConfiguration.java # spring-cloud-gray-client/src/main/java/cn/springcloud/gray/decision/GrayDecisionDelegater.java # spring-cloud-gray-client/src/main/java/cn/springcloud/gray/request/track/GrayTrackHolder.java # spring-cloud-gray-client/src/main/java/cn/springcloud/gray/routing/connectionpoint/RoutingConnectionPoint.java # spring-cloud-gray-core/pom.xml # spring-cloud-gray-dependencies/pom.xml # spring-cloud-gray-plugins/pom.xml # spring-cloud-gray-plugins/spring-cloud-gray-plugin-eureka/pom.xml # spring-cloud-gray-plugins/spring-cloud-gray-plugin-eureka/src/main/java/cn/springcloud/gray/client/netflix/eureka/configuration/GrayClientEurekaAutoConfiguration.java # spring-cloud-gray-plugins/spring-cloud-gray-plugin-event-stream/pom.xml # spring-cloud-gray-plugins/spring-cloud-gray-plugin-feign/pom.xml # spring-cloud-gray-plugins/spring-cloud-gray-plugin-gateway/pom.xml # spring-cloud-gray-plugins/spring-cloud-gray-plugin-gateway/src/main/java/cn/springcloud/gray/client/gateway/GrayLoadBalancerClientFilter.java # spring-cloud-gray-plugins/spring-cloud-gray-plugin-gateway/src/main/java/cn/springcloud/gray/client/gateway/configuration/GrayGatewayAutoConfiguration.java # spring-cloud-gray-plugins/spring-cloud-gray-plugin-ribbon-nacos-discovery/pom.xml # spring-cloud-gray-plugins/spring-cloud-gray-plugin-ribbon-nacos-discovery/src/main/java/cn/springcloud/gray/client/plugin/ribbon/nacos/NacosServerExplainer.java # spring-cloud-gray-plugins/spring-cloud-gray-plugin-ribbon-nacos-discovery/src/main/java/cn/springcloud/gray/client/plugin/ribbon/nacos/configuration/GrayClientRibbonNacosAutoConfiguration.java # spring-cloud-gray-plugins/spring-cloud-gray-plugin-webflux/pom.xml # spring-cloud-gray-plugins/spring-cloud-gray-plugin-webmvc/pom.xml # spring-cloud-gray-plugins/spring-cloud-gray-plugin-zuul/pom.xml # spring-cloud-gray-samples/pom.xml # spring-cloud-gray-samples/spring-cloud-gray-btrace-sample/pom.xml # spring-cloud-gray-samples/spring-cloud-gray-eureka-sample/pom.xml # spring-cloud-gray-samples/spring-cloud-gray-gateway-sample/pom.xml # spring-cloud-gray-samples/spring-cloud-gray-gateway-sample/src/main/java/com/springcloud/gray/gateway/configuration/GatewayConfiguration.java # spring-cloud-gray-samples/spring-cloud-gray-gateway-sample/src/main/resources/config/application.yml # spring-cloud-gray-samples/spring-cloud-gray-performance-agent/pom.xml # spring-cloud-gray-samples/spring-cloud-gray-server-sample/pom.xml # spring-cloud-gray-samples/spring-cloud-gray-server-sample/src/main/resources/config/application.yml # spring-cloud-gray-samples/spring-cloud-gray-service-a-sample/pom.xml # spring-cloud-gray-samples/spring-cloud-gray-service-a1-sample/pom.xml # spring-cloud-gray-samples/spring-cloud-gray-service-b-sample/pom.xml # spring-cloud-gray-samples/spring-cloud-gray-service-b-sample/src/main/resources/config/application.yml # spring-cloud-gray-samples/spring-cloud-gray-stream-sample/pom.xml # spring-cloud-gray-samples/spring-cloud-gray-zuul-sample/pom.xml # spring-cloud-gray-server-plugins/pom.xml # spring-cloud-gray-server-plugins/spring-cloud-gray-server-plugin-eureka/pom.xml # spring-cloud-gray-server-plugins/spring-cloud-gray-server-plugin-event-stream/pom.xml # spring-cloud-gray-server-plugins/spring-cloud-gray-server-plugin-nacos-discovery/pom.xml # spring-cloud-gray-server/pom.xml # spring-cloud-gray-server/src/main/java/cn/springcloud/gray/server/dao/model/GrayServiceDO.java # spring-cloud-gray-server/src/main/java/cn/springcloud/gray/server/module/audit/ResultfulOpRecordAspect.java # spring-cloud-gray-server/src/main/java/cn/springcloud/gray/server/module/gray/GrayServerModule.java # spring-cloud-gray-server/src/main/java/cn/springcloud/gray/server/module/gray/jpa/JPAGrayServerModule.java # spring-cloud-gray-server/src/main/java/cn/springcloud/gray/server/resources/ExceptionTranslator.java # spring-cloud-gray-server/src/main/java/cn/springcloud/gray/server/resources/rest/GrayDecisionResource.java # spring-cloud-gray-server/src/main/java/cn/springcloud/gray/server/resources/rest/GrayInstanceResource.java # spring-cloud-gray-server/src/main/java/cn/springcloud/gray/server/resources/rest/GrayPolicyResource.java # spring-cloud-gray-starter-dependencies/pom.xml # spring-cloud-gray-utils/pom.xml # spring-cloud-gray-webui/src/views/gray-instance/complex-table.vue # spring-cloud-gray-webui/src/views/gray-policy/list.vue # spring-cloud-gray-webui/src/views/gray-trackor/complex-table.vue # spring-cloud-starter-gray-client/pom.xml # spring-cloud-starter-gray-client/src/main/resources/META-INF/spring.factories # spring-cloud-starter-gray-eureka-server/pom.xml # spring-cloud-starter-gray-server/pom.xml # spring-cloud-starter-gray-server/src/main/resources/META-INF/spring.factories
2 parents ac96e86 + d1c8ca7 commit c95991f

File tree

642 files changed

+26345
-3272
lines changed

Some content is hidden

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

642 files changed

+26345
-3272
lines changed

‎README.md‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33

44
[![License](https://img.shields.io/badge/license-Apache%202-blue.svg)](https://www.apache.org/licenses/LICENSE-2.0.html)
5-
[![A Release](https://img.shields.io/badge/release-A.1.1.4-blue)](https://github.com/SpringCloud/spring-cloud-gray/releases/tag/A.1.1.2)
6-
[![B Release](https://img.shields.io/badge/release-B.0.0.5-blue)](https://github.com/SpringCloud/spring-cloud-gray/releases/tag/B.0.0.2)
7-
[![B Release](https://img.shields.io/badge/release-C.0.0.4-blue)](https://github.com/SpringCloud/spring-cloud-gray/releases/tag/C.0.0.1)
5+
[![A Release](https://img.shields.io/badge/release-A.2.0.0-RC1-blue)](https://github.com/SpringCloud/spring-cloud-gray/releases/tag/A.2.0.0-RC1)
6+
[![B Release](https://img.shields.io/badge/release-B.1.0.0-RC1-blue)](https://github.com/SpringCloud/spring-cloud-gray/releases/tag/B.1.0.0-RC1)
7+
[![B Release](https://img.shields.io/badge/release-C.1.0.0-RC1-blue)](https://github.com/SpringCloud/spring-cloud-gray/releases/tag/C.1.0.0-RC1)
88

99
## 介绍
1010
Spring Cloud Gray 是一套开源的微服务灰度路由解决方案，它由spring-cloud-gray-client，spring-cloud-gray-client-netflix 和 spring-cloud-tray-server，spring-cloud-gray-webui组成。<br/>
@@ -34,11 +34,11 @@ insert into `user` ( `user_id`, `account`, `name`, `password`, `roles`, `status`
3434
[管控端界面使用手册](doc/guide/gray-admin-guide.md)<br/>
3535

3636
## 版本信息
37-
项目分支 | srpingcloud版本 | springboot版本
38-
--- | --- | ---
39-
A | Edgware | 1.5.*
40-
B | Finchley | 2.0.*
41-
C | Greenwich | 2.1.*
37+
项目分支 | 项目版本 | srpingcloud版本 | springboot版本
38+
--- | --- | --- | ---
39+
A | A.2.0.0-RC1 | Edgware | 1.5.*
40+
B | B.1.0.0-RC1(暂未支持) | Finchley | 2.0.*
41+
C | C.1.0.0-RC1(暂未支持) | Greenwich | 2.1.*
4242

4343

4444
## Spring Cloud Gray 能做什么

‎pom.xml‎

Lines changed: 121 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<groupId>cn.springcloud.gray</groupId>
1313
<artifactId>spring-cloud-gray</artifactId>
1414
<packaging>pom</packaging>
15-
<version>C.0.0.5</version>
15+
<version>C.1.0.0-RC1</version>
1616
<url>https://github.com/SpringCloud/spring-cloud-gray</url>
1717
<organization>
1818
<name>Spring Cloud中国社区</name>
@@ -40,6 +40,11 @@
4040
<module>spring-cloud-starter-gray-eureka-server</module>
4141
<module>spring-cloud-gray-server-plugins</module>
4242
<module>spring-cloud-gray-plugins</module>
43+
<module>spring-cloud-gray-dynamic-logic</module>
44+
<module>spring-cloud-gray-event</module>
45+
<module>spring-cloud-gray-code-component</module>
46+
<module>spring-cloud-gray-mock</module>
47+
<module>spring-cloud-gray-server-cluster</module>
4348
</modules>
4449

4550
<licenses>
@@ -70,12 +75,16 @@
7075
<slf4j.version>1.7.26</slf4j.version>
7176
<commons-lang3.version>3.5</commons-lang3.version>
7277
<commons-collections.version>3.2.2</commons-collections.version>
73-
<commons-beanutils.version>1.9.3</commons-beanutils.version>
78+
<commons-codec.version>1.10</commons-codec.version>
79+
<commons-beanutils.version>1.9.4</commons-beanutils.version>
7480
<guava.version>27.0.1-jre</guava.version>
7581
<mapstruct.version>1.1.0.Final</mapstruct.version>
7682
<caffeine.version>2.7.0</caffeine.version>
7783
<aspectj.version>1.8.13</aspectj.version>
7884
<querydsl.version>4.2.1</querydsl.version>
85+
<fm-dynamic-compiler.version>1.0-SNAPSHOT</fm-dynamic-compiler.version>
86+
<validation-api.version>2.0.1.Final</validation-api.version>
87+
<hibernate-validator.version>6.0.16.Final</hibernate-validator.version>
7988
</properties>
8089

8190

@@ -88,6 +97,13 @@
8897
<type>pom</type>
8998
<scope>import</scope>
9099
</dependency>
100+
<dependency>
101+
<groupId>com.alibaba.cloud</groupId>
102+
<artifactId>spring-cloud-alibaba-dependencies</artifactId>
103+
<version>${spring-cloud-alibaba-dependencies.version}</version>
104+
<type>pom</type>
105+
<scope>import</scope>
106+
</dependency>
91107

92108
<!-- <dependency>-->
93109
<!-- <groupId>cn.springcloud.gray</groupId>-->
@@ -101,16 +117,23 @@
101117
<groupId>com.github.ben-manes.caffeine</groupId>
102118
<artifactId>caffeine</artifactId>
103119
<version>${caffeine.version}</version>
120+
<optional>true</optional>
104121
</dependency>
105122

106123

107124
<!-- alibaba cloud start -->
108-
<dependency>
109-
<groupId>com.alibaba.cloud</groupId>
110-
<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
111-
<version>${alibaba-cloud.version}</version>
112-
<optional>true</optional>
113-
</dependency>
125+
<!-- <dependency>-->
126+
<!-- <groupId>com.alibaba.cloud</groupId>-->
127+
<!-- <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>-->
128+
<!-- <version>${alibaba-cloud.version}</version>-->
129+
<!-- <optional>true</optional>-->
130+
<!-- </dependency>-->
131+
<!-- <dependency>-->
132+
<!-- <groupId>com.alibaba.cloud</groupId>-->
133+
<!-- <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>-->
134+
<!-- <version>${alibaba-cloud.version}</version>-->
135+
<!-- <optional>true</optional>-->
136+
<!-- </dependency>-->
114137
<!-- alibaba cloud end -->
115138

116139

@@ -131,6 +154,26 @@
131154
<artifactId>spring-cloud-gray-core</artifactId>
132155
<version>${project.version}</version>
133156
</dependency>
157+
<dependency>
158+
<groupId>cn.springcloud.gray</groupId>
159+
<artifactId>spring-cloud-gray-mock</artifactId>
160+
<version>${project.version}</version>
161+
</dependency>
162+
<dependency>
163+
<groupId>cn.springcloud.gray</groupId>
164+
<artifactId>spring-cloud-gray-dynamic-logic</artifactId>
165+
<version>${project.version}</version>
166+
</dependency>
167+
<dependency>
168+
<groupId>cn.springcloud.gray</groupId>
169+
<artifactId>spring-cloud-gray-event</artifactId>
170+
<version>${project.version}</version>
171+
</dependency>
172+
<dependency>
173+
<groupId>cn.springcloud.gray</groupId>
174+
<artifactId>spring-cloud-gray-code-component</artifactId>
175+
<version>${project.version}</version>
176+
</dependency>
134177
<dependency>
135178
<groupId>cn.springcloud.gray</groupId>
136179
<artifactId>spring-cloud-gray-client</artifactId>
@@ -161,6 +204,11 @@
161204
<artifactId>spring-cloud-gray-server</artifactId>
162205
<version>${project.version}</version>
163206
</dependency>
207+
<dependency>
208+
<groupId>cn.springcloud.gray</groupId>
209+
<artifactId>spring-cloud-gray-server-cluster</artifactId>
210+
<version>${project.version}</version>
211+
</dependency>
164212
<dependency>
165213
<groupId>cn.springcloud.gray</groupId>
166214
<artifactId>spring-cloud-starter-gray-server</artifactId>
@@ -170,6 +218,16 @@
170218

171219
<!-- gray client plugins start -->
172220

221+
<dependency>
222+
<groupId>cn.springcloud.gray</groupId>
223+
<artifactId>spring-cloud-gray-plugin-dynamic-logic</artifactId>
224+
<version>${project.version}</version>
225+
</dependency>
226+
<dependency>
227+
<groupId>cn.springcloud.gray</groupId>
228+
<artifactId>spring-cloud-gray-plugin-event-longpolling</artifactId>
229+
<version>${project.version}</version>
230+
</dependency>
173231
<dependency>
174232
<groupId>cn.springcloud.gray</groupId>
175233
<artifactId>spring-cloud-gray-plugin-webmvc</artifactId>
@@ -200,6 +258,12 @@
200258
<version>${project.version}</version>
201259
</dependency>
202260

261+
<dependency>
262+
<groupId>cn.springcloud.gray</groupId>
263+
<artifactId>spring-cloud-gray-plugin-refresher</artifactId>
264+
<version>${project.version}</version>
265+
</dependency>
266+
203267
<dependency>
204268
<groupId>cn.springcloud.gray</groupId>
205269
<artifactId>spring-cloud-gray-plugin-zuul</artifactId>
@@ -229,6 +293,12 @@
229293
<version>${project.version}</version>
230294
</dependency>
231295

296+
<dependency>
297+
<groupId>cn.springcloud.gray</groupId>
298+
<artifactId>spring-cloud-gray-server-plugin-event-longpolling</artifactId>
299+
<version>${project.version}</version>
300+
</dependency>
301+
232302
<dependency>
233303
<groupId>cn.springcloud.gray</groupId>
234304
<artifactId>spring-cloud-gray-server-plugin-event-stream</artifactId>
@@ -240,6 +310,12 @@
240310
<artifactId>spring-cloud-gray-server-plugin-nacos-discovery</artifactId>
241311
<version>${project.version}</version>
242312
</dependency>
313+
314+
<dependency>
315+
<groupId>cn.springcloud.gray</groupId>
316+
<artifactId>spring-cloud-gray-server-cluster-http-synchro-plugin</artifactId>
317+
<version>${project.version}</version>
318+
</dependency>
243319
<!-- gray server plugins end -->
244320

245321

@@ -270,6 +346,14 @@
270346

271347

272348
<!-- https://mvnrepository.com/artifact/io.springfox/springfox-swagger-ui -->
349+
350+
<dependency>
351+
<groupId>org.springframework</groupId>
352+
<artifactId>spring-jcl</artifactId>
353+
<!-- <version>${spring-jcl.version}</version>-->
354+
<optional>true</optional>
355+
</dependency>
356+
273357
<dependency>
274358
<groupId>io.springfox</groupId>
275359
<artifactId>springfox-swagger-ui</artifactId>
@@ -289,16 +373,25 @@
289373
<groupId>org.projectlombok</groupId>
290374
<artifactId>lombok</artifactId>
291375
<version>${lombok.version}</version>
376+
<optional>true</optional>
292377
</dependency>
293378
<dependency>
294379
<groupId>org.slf4j</groupId>
295380
<artifactId>slf4j-api</artifactId>
296381
<version>${slf4j.version}</version>
382+
<optional>true</optional>
297383
</dependency>
298384
<dependency>
299385
<groupId>org.apache.commons</groupId>
300386
<artifactId>commons-lang3</artifactId>
301387
<version>${commons-lang3.version}</version>
388+
<optional>true</optional>
389+
</dependency>
390+
<dependency>
391+
<groupId>commons-codec</groupId>
392+
<artifactId>commons-codec</artifactId>
393+
<version>${commons-codec.version}</version>
394+
<optional>true</optional>
302395
</dependency>
303396
<dependency>
304397
<groupId>commons-collections</groupId>
@@ -310,6 +403,7 @@
310403
<groupId>commons-beanutils</groupId>
311404
<artifactId>commons-beanutils</artifactId>
312405
<version>${commons-beanutils.version}</version>
406+
<optional>true</optional>
313407
<exclusions>
314408
<exclusion>
315409
<groupId>commons-logging</groupId>
@@ -332,6 +426,19 @@
332426
<!-- <scope>provided</scope>-->
333427
<!-- </dependency>-->
334428

429+
<dependency>
430+
<groupId>javax.validation</groupId>
431+
<artifactId>validation-api</artifactId>
432+
<version>${validation-api.version}</version>
433+
<optional>true</optional>
434+
</dependency>
435+
436+
<dependency>
437+
<groupId>org.hibernate</groupId>
438+
<artifactId>hibernate-validator</artifactId>
439+
<version>${hibernate-validator.version}</version>
440+
<optional>true</optional>
441+
</dependency>
335442

336443
<dependency>
337444
<groupId>commons-io</groupId>
@@ -369,6 +476,12 @@
369476
<artifactId>querydsl-jpa</artifactId>
370477
<version>${querydsl.version}</version>
371478
</dependency>
479+
480+
<dependency>
481+
<groupId>com.github.saleson.fm-dynamic-compiler</groupId>
482+
<artifactId>fm-dynamic-compiler-core</artifactId>
483+
<version>${fm-dynamic-compiler.version}</version>
484+
</dependency>
372485
</dependencies>
373486
</dependencyManagement>
374487

‎sonar-project.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ sonar.projectKey=spring-cloud-gray
33
# this is the name displayed in the SonarQube UI，不能是中文
44
sonar.projectName=spring-cloud-gray
55
# 项目的版本号
6-
sonar.projectVersion=C.0.0.1
6+
sonar.projectVersion=C.1.0.0
77
# 项目的代码的编码格式
88
sonar.sourceEndcoding=UTF-8
99
# 项目的语言

‎spring-cloud-gray-client-netflix/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>spring-cloud-gray</artifactId>
77
<groupId>cn.springcloud.gray</groupId>
8-
<version>C.0.0.5</version>
8+
<version>C.1.0.0-RC1</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

0 commit comments

Comments
 (0)