Skip to content

Commit 92ef08d

Browse files
salesonsaleson
committed
完成灰度发布的代码。
1 parent 6ee2297 commit 92ef08d

File tree

91 files changed

+4099
-130
lines changed

Some content is hidden

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

91 files changed

+4099
-130
lines changed

‎.idea/compiler.xml‎

Lines changed: 18 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/misc.xml‎

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pom.xml‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,17 @@
1616
<modules>
1717

1818
<module>spring-cloud-gray-dependencies</module>
19-
<module>spring-cloud-gray-samples</module>
20-
<module>spring-cloud-gray-core</module>
21-
<module>spring-cloud-starter-multi-version</module>
22-
<module>spring-cloud-starter-gray-server</module>
19+
2320
<module>spring-cloud-bamboo</module>
24-
<module>spring-cloud-start-gray</module>
21+
<module>spring-cloud-starter-multi-version</module>
2522
<module>spring-cloud-mult-version-samples</module>
23+
24+
<module>spring-cloud-gray-core</module>
25+
<module>spring-cloud-gray-server</module>
26+
<module>spring-cloud-gray-client</module>
27+
<module>spring-cloud-starter-gray</module>
28+
<module>spring-cloud-starter-gray-server</module>
29+
<module>spring-cloud-gray-samples</module>
2630
</modules>
2731

2832

@@ -31,7 +35,7 @@
3135
<maven.compiler.target>1.8</maven.compiler.target>
3236
<java.version>1.8</java.version>
3337
<spring-cloud.version>Dalston.SR5</spring-cloud.version>
34-
<springfox.version>2.6.1</springfox.version>
38+
<springfox.version>2.7.0</springfox.version>
3539
</properties>
3640

3741

@@ -85,9 +89,7 @@
8589
</dependencies>
8690

8791

88-
8992
</dependencyManagement>
9093

9194

92-
9395
</project>

‎spring-cloud-bamboo/src/main/java/cn/springcloud/bamboo/autoconfig/BambooAutoConfiguration.java‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,13 @@
44
import cn.springcloud.bamboo.feign.config.BambooFeignConfiguration;
55
import cn.springcloud.bamboo.ribbon.BambooClientHttpRequestIntercptor;
66
import cn.springcloud.bamboo.ribbon.EurekaServerExtractor;
7-
import cn.springcloud.bamboo.ribbon.loadbalancer.BambooZoneAvoidanceRule;
87
import cn.springcloud.bamboo.zuul.config.BambooZuulConfiguration;
9-
import com.netflix.client.config.IClientConfig;
10-
import com.netflix.loadbalancer.IRule;
118
import org.springframework.beans.factory.annotation.Autowired;
129
import org.springframework.boot.autoconfigure.AutoConfigureBefore;
1310
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
1411
import org.springframework.boot.context.properties.EnableConfigurationProperties;
1512
import org.springframework.cloud.client.loadbalancer.LoadBalanced;
13+
import org.springframework.cloud.netflix.ribbon.RibbonClients;
1614
import org.springframework.cloud.netflix.ribbon.SpringClientFactory;
1715
import org.springframework.context.annotation.Bean;
1816
import org.springframework.context.annotation.Configuration;
@@ -31,6 +29,7 @@
3129
@AutoConfigureBefore({BambooFeignConfiguration.class, BambooZuulConfiguration.class})
3230
@Import(BambooWebConfiguration.class)
3331
//@RibbonClients(defaultConfiguration = {BambooExtConfigration.class})
32+
@RibbonClients(defaultConfiguration = BambooRibbonClientsConfiguration.class)
3433
public class BambooAutoConfiguration {
3534

3635

@@ -39,8 +38,8 @@ public static class UnUseBambooIRule {
3938
}
4039

4140

42-
@Autowired(required = false)
43-
private IClientConfig config;
41+
// @Autowired(required = false)
42+
// private IClientConfig config;
4443

4544
@Autowired
4645
private SpringClientFactory springClientFactory;
@@ -61,13 +60,13 @@ public EurekaServerExtractor eurekaServerExtractor() {
6160
}
6261

6362

64-
@Bean
65-
@ConditionalOnMissingBean(value = {BambooAutoConfiguration.UnUseBambooIRule.class})
66-
public IRule ribbonRule() {
67-
BambooZoneAvoidanceRule rule = new BambooZoneAvoidanceRule();
68-
rule.initWithNiwsConfig(config);
69-
return rule;
70-
}
63+
// @Bean
64+
// @ConditionalOnMissingBean(value = {BambooAutoConfiguration.UnUseBambooIRule.class})
65+
// public IRule ribbonRule() {
66+
// BambooZoneAvoidanceRule rule = new BambooZoneAvoidanceRule();
67+
// rule.initWithNiwsConfig(config);
68+
// return rule;
69+
// }
7170

7271
@Bean
7372
@ConditionalOnMissingBean

‎spring-cloud-bamboo/src/main/java/cn/springcloud/bamboo/autoconfig/BambooRibbonClientsConfiguration.java‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
package cn.springcloud.bamboo.autoconfig;
2+
3+
4+
import cn.springcloud.bamboo.ribbon.loadbalancer.BambooZoneAvoidanceRule;
5+
import com.netflix.client.config.IClientConfig;
6+
import com.netflix.loadbalancer.IRule;
7+
import org.springframework.beans.factory.annotation.Autowired;
8+
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
9+
import org.springframework.context.annotation.Bean;
10+
import org.springframework.context.annotation.Configuration;
11+
12+
@Configuration
13+
public class BambooRibbonClientsConfiguration {
14+
15+
@Autowired(required = false)
16+
private IClientConfig config;
17+
18+
@Bean
19+
@ConditionalOnMissingBean(value = {BambooAutoConfiguration.UnUseBambooIRule.class})
20+
public IRule ribbonRule() {
21+
BambooZoneAvoidanceRule rule = new BambooZoneAvoidanceRule();
22+
rule.initWithNiwsConfig(config);
23+
return rule;
24+
}
25+
}

‎spring-cloud-bamboo/src/main/java/cn/springcloud/bamboo/ribbon/BambooRequestContext.java‎

Lines changed: 0 additions & 80 deletions
This file was deleted.

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

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<parent>
6+
<artifactId>springcloud-gray</artifactId>
7+
<groupId>cn.springcloud.gray</groupId>
8+
<version>1.0-SNAPSHOT</version>
9+
</parent>
10+
<modelVersion>4.0.0</modelVersion>
11+
12+
<artifactId>spring-cloud-gray-client</artifactId>
13+
14+
15+
<dependencies>
16+
<dependency>
17+
<groupId>cn.springcloud.gray</groupId>
18+
<artifactId>spring-cloud-bamboo</artifactId>
19+
</dependency>
20+
<dependency>
21+
<groupId>cn.springcloud.gray</groupId>
22+
<artifactId>spring-cloud-gray-core</artifactId>
23+
</dependency>
24+
25+
<dependency>
26+
<groupId>org.springframework.boot</groupId>
27+
<artifactId>spring-boot-starter-web</artifactId>
28+
<scope>provided</scope>
29+
</dependency>
30+
<dependency>
31+
<groupId>org.springframework.boot</groupId>
32+
<artifactId>spring-boot-starter-test</artifactId>
33+
<scope>provided</scope>
34+
</dependency>
35+
<dependency>
36+
<groupId>org.springframework.cloud</groupId>
37+
<artifactId>spring-cloud-starter-eureka</artifactId>
38+
<scope>provided</scope>
39+
</dependency>
40+
<dependency>
41+
<groupId>org.springframework.cloud</groupId>
42+
<artifactId>spring-cloud-starter-feign</artifactId>
43+
<scope>provided</scope>
44+
</dependency>
45+
<!--<dependency>-->
46+
<!--<groupId>org.springframework.cloud</groupId>-->
47+
<!--<artifactId>spring-cloud-starter-zuul</artifactId>-->
48+
<!--<scope>provided</scope>-->
49+
<!--</dependency>-->
50+
51+
<!--<dependency>-->
52+
<!--<groupId>org.springframework.cloud</groupId>-->
53+
<!--<artifactId>spring-cloud-netflix-core</artifactId>-->
54+
<!--<scope>provided</scope>-->
55+
<!--</dependency>-->
56+
57+
</dependencies>
58+
59+
</project>

0 commit comments

Comments
 (0)