Skip to content

Commit b28fa1c

Browse files
salesonsaleson
committed
优化代码
1 parent 45f2774 commit b28fa1c

File tree

15 files changed

+240
-324
lines changed

15 files changed

+240
-324
lines changed

‎spring-cloud-gray-client/src/main/java/cn/springcloud/gray/DefaultGrayManager.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ public void shutdown() {
5353
}
5454

5555
public void openForWork() {
56-
log.info("拉取灰度列表");
5756
if (getGrayInformationClient() != null) {
57+
log.info("拉取灰度列表");
5858
doUpdate();
5959
int timerMs = getGrayClientConfig().getServiceUpdateIntervalTimerInMs();
6060
if (timerMs > 0) {

‎spring-cloud-gray-samples/spring-cloud-gray-eureka-sample/src/main/java/cn/springcloud/gray/eureka/configuration/TestConfiguration.java‎

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

‎spring-cloud-gray-samples/spring-cloud-gray-eureka-sample/src/main/java/cn/springcloud/gray/eureka/domain/ApiRes.java‎

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

‎spring-cloud-gray-samples/spring-cloud-gray-eureka-sample/src/test/java/cn/springcloud/test/Test.java‎

Lines changed: 7 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,19 @@
11
package cn.springcloud.test;
22

33
import cn.springcloud.gray.eureka.GrayEruekaApplication;
4-
import cn.springcloud.gray.eureka.domain.ApiRes;
5-
import cn.springcloud.gray.utils.ConfigurationUtils;
64
import com.fasterxml.jackson.databind.ObjectMapper;
75
import com.google.common.collect.ImmutableBiMap;
86
import lombok.Data;
97
import org.junit.runner.RunWith;
10-
import org.springframework.aop.framework.Advised;
11-
import org.springframework.aop.support.AopUtils;
12-
import org.springframework.beans.factory.BeanFactory;
138
import org.springframework.beans.factory.annotation.Autowired;
149
import org.springframework.boot.test.context.SpringBootTest;
1510
import org.springframework.context.ApplicationContext;
16-
import org.springframework.context.expression.BeanFactoryResolver;
1711
import org.springframework.core.convert.ConversionService;
18-
import org.springframework.expression.Expression;
19-
import org.springframework.expression.common.TemplateParserContext;
2012
import org.springframework.expression.spel.standard.SpelExpressionParser;
21-
import org.springframework.expression.spel.support.StandardEvaluationContext;
2213
import org.springframework.test.context.ActiveProfiles;
2314
import org.springframework.test.context.junit4.SpringRunner;
24-
import org.springframework.validation.BeanPropertyBindingResult;
25-
import org.springframework.validation.BindException;
26-
import org.springframework.validation.BindingResult;
2715
import org.springframework.validation.Validator;
2816

29-
import java.util.Collections;
30-
import java.util.HashMap;
3117
import java.util.List;
3218
import java.util.Map;
3319

@@ -49,15 +35,15 @@ public void testBind() {
4935
Map<String, String> args = ImmutableBiMap.of("s", "10", "adf", "a,b,c,d", "apiRes", "#{@apiRes}");
5036
SpelExpressionParser parser = new SpelExpressionParser();
5137

52-
Map<String, Object> properties = ConfigurationUtils.normalize(args, parser, cxt);
38+
// Map<String, Object> properties = ConfigurationUtils.normalize(args, parser, cxt);
5339

5440

55-
Object configuration = new St();
56-
57-
ConfigurationUtils.bind(configuration, properties,
58-
"", "", validator,
59-
conversionService);
60-
System.out.println(configuration);
41+
// Object configuration = new St();
42+
//
43+
// ConfigurationUtils.bind(configuration, properties,
44+
// "", "", validator,
45+
// conversionService);
46+
// System.out.println(configuration);
6147

6248

6349
}
@@ -67,7 +53,6 @@ public void testBind() {
6753
public static class St {
6854
private int s;
6955
private List<String> adf;
70-
private ApiRes apiRes;
7156

7257

7358
@Override

‎spring-cloud-gray-samples/spring-cloud-gray-server-sample/src/main/resources/config/application.yml‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ spring:
66
#通用数据源配置
77
datasource:
88
driver-class-name: com.mysql.jdbc.Driver
9-
url: jdbc:mysql://localhost:3306/gray_server01?charset=utf8mb4&useSSL=false
10-
username: root
11-
password: root
9+
url: jdbc:mysql://10.171.196.188:3306/zma-stu-gray-test?useUnicode=true&autoReconnect=true&rewriteBatchedStatements=TRUE
10+
username: forge
11+
password: zhangmen1dui1
1212
# Hikari 数据源专用配置
1313
hikari:
1414
maximum-pool-size: 20
@@ -20,31 +20,31 @@ spring:
2020
generate-ddl: true
2121
hibernate:
2222
ddl-auto: update
23-
rabbitmq:
24-
addresses: 127.0.0.1:5672
25-
username: admin
26-
password: admin
27-
cloud:
28-
stream:
29-
bindings:
30-
# GrayEventInput:
31-
# group: service-a
32-
# destination: test
33-
# consumer:
34-
# concurrency: 1 #并发数
35-
# max-attempts: 1
36-
GrayEventOutput:
37-
destination: gray_event
38-
# rabbit:
39-
# bindings:
40-
# GrayEventInput:
41-
# consumer:
42-
# maxConcurrency: 1 #并发数
43-
# prefetch: 1 #从mq一次获取消息的数量
44-
# requeueRejected: true #spring cloud stream 如果出现异常， 是否需要重新投递消息， false表示丢弃。 也有相应的Exception， true-MessageRejectedWhileStoppingException false-AmqpRejectAndDontRequeueException
45-
# auto-bind-dlq: true
46-
# acknowledgeMode: AUTO
47-
# acknowledgeMode: MANUAL
23+
# rabbitmq:
24+
# addresses: 127.0.0.1:5672
25+
# username: admin
26+
# password: admin
27+
# cloud:
28+
# stream:
29+
# bindings:
30+
# # GrayEventInput:
31+
# # group: service-a
32+
# # destination: test
33+
# # consumer:
34+
# # concurrency: 1 #并发数
35+
# # max-attempts: 1
36+
# GrayEventOutput:
37+
# destination: gray_event
38+
# # rabbit:
39+
# # bindings:
40+
# # GrayEventInput:
41+
# # consumer:
42+
# # maxConcurrency: 1 #并发数
43+
# # prefetch: 1 #从mq一次获取消息的数量
44+
# # requeueRejected: true #spring cloud stream 如果出现异常， 是否需要重新投递消息， false表示丢弃。 也有相应的Exception， true-MessageRejectedWhileStoppingException false-AmqpRejectAndDontRequeueException
45+
# # auto-bind-dlq: true
46+
# # acknowledgeMode: AUTO
47+
## acknowledgeMode: MANUAL
4848
eureka:
4949
client:
5050
register-with-eureka: true

‎spring-cloud-gray-samples/spring-cloud-gray-service-a-sample/src/main/java/cn/springcloud/service/a/configuration/GraylConfiguration.java‎

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

‎spring-cloud-gray-samples/spring-cloud-gray-service-a-sample/src/main/java/cn/springcloud/service/a/rest/TestResource.java‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import com.google.common.collect.ImmutableMap;
44
import org.apache.commons.lang.StringUtils;
55
import org.springframework.beans.factory.annotation.Autowired;
6+
import org.springframework.beans.factory.annotation.Value;
67
import org.springframework.core.env.Environment;
78
import org.springframework.web.bind.annotation.*;
89

@@ -14,13 +15,25 @@
1415
@RestController
1516
@RequestMapping("/api/test")
1617
public class TestResource {
18+
19+
@Value("${test.sleepTime:50}")
20+
private long sleepTime = 50;
21+
1722
@Autowired
1823
Environment env;
1924

2025
@RequestMapping(value = "/get", method = RequestMethod.GET)
2126
@ResponseBody
2227
public Map<String, String> testGet(@RequestParam(value = "version", required = false) String version) {
23-
return ImmutableMap.of("test", "success.", "version", StringUtils.defaultIfEmpty(version, ""), "serverPort", env.getProperty("server.port"));
28+
long start = System.currentTimeMillis();
29+
try {
30+
Thread.sleep(sleepTime);
31+
} catch (InterruptedException e) {
32+
}
33+
return ImmutableMap.of("test", "success.",
34+
"version", StringUtils.defaultIfEmpty(version, ""),
35+
"serverPort", env.getProperty("server.port"),
36+
"usedTime", String.valueOf(System.currentTimeMillis() - start));
2437
}
2538

2639

‎spring-cloud-gray-samples/spring-cloud-gray-service-a-sample/src/main/resources/config/application.yml‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,7 @@ eureka:
1010
serviceUrl:
1111
defaultZone: http://localhost:20001/eureka/
1212
instance:
13-
instanceId: ${spring.application.name}:${server.port}
13+
instanceId: ${spring.cloud.client.ipAddress}:${spring.application.name}:${server.port}
1414
lease-renewal-interval-in-seconds: 10
1515
lease-expiration-duration-in-seconds: 30
16-
gray:
17-
enabled: false
18-
client:
19-
instance:
20-
grayEnroll: false #是否在启动后自动注册成灰度实例
21-
server:
22-
url: http://localhost:20202 #灰度服务端的url
16+
prefer-ip-address: true

‎spring-cloud-gray-samples/spring-cloud-gray-service-a1-sample/src/main/resources/config/application.yml‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,4 @@ eureka:
1414
lease-renewal-interval-in-seconds: 10
1515
lease-expiration-duration-in-seconds: 30
1616
initial-status: starting
17-
# initial-status: out_of_service
18-
gray:
19-
enabled: true
20-
client:
21-
instance:
22-
grayEnroll: true #是否在启动后自动注册成灰度实例
23-
server:
24-
url: http://localhost:20202 #灰度服务端的url
17+
# initial-status: out_of_service

‎spring-cloud-gray-samples/spring-cloud-gray-service-b-sample/src/main/java/cn/springcloud/gray/service/b/configuration/EurekaConfiguration.java‎

Lines changed: 18 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,34 @@
11
package cn.springcloud.gray.service.b.configuration;
22

3-
import cn.springcloud.gray.servernode.ServerListProcessor;
43
import cn.springcloud.gray.service.b.eureka.GrayEurekaEventListener;
5-
import com.netflix.appinfo.InstanceInfo;
64
import com.netflix.discovery.EurekaClient;
7-
import com.netflix.discovery.shared.Application;
8-
import com.netflix.loadbalancer.Server;
9-
import com.netflix.niws.loadbalancer.DiscoveryEnabledServer;
10-
import org.apache.commons.collections.CollectionUtils;
11-
import org.apache.commons.collections.ListUtils;
125
import org.springframework.beans.factory.InitializingBean;
136
import org.springframework.beans.factory.annotation.Autowired;
14-
import org.springframework.context.annotation.Bean;
15-
16-
import java.util.List;
17-
import java.util.Objects;
18-
import java.util.stream.Collectors;
197

208
//@Configuration
219
public class EurekaConfiguration implements InitializingBean {
2210

2311
@Autowired
2412
private EurekaClient eurekaClient;
2513

26-
@Bean
27-
public ServerListProcessor serverListProcessor() {
28-
return (serviceId, servers) -> {
29-
Application application = eurekaClient.getApplication(serviceId);
30-
if (Objects.isNull(application)) {
31-
return servers;
32-
}
33-
List<Server> unUpServers = application.getInstancesAsIsFromEureka().stream()
34-
.filter(instanceInfo -> instanceInfo.getStatus() == InstanceInfo.InstanceStatus.STARTING)
35-
.map(instanceInfo -> new DiscoveryEnabledServer(instanceInfo, true))
36-
.collect(Collectors.toList());
37-
if (CollectionUtils.isEmpty(unUpServers)) {
38-
return servers;
39-
}
40-
return ListUtils.union(servers, unUpServers);
41-
42-
};
43-
}
14+
// @Bean
15+
// public ServerListProcessor serverListProcessor() {
16+
// return (serviceId, servers) -> {
17+
// Application application = eurekaClient.getApplication(serviceId);
18+
// if (Objects.isNull(application)) {
19+
// return servers;
20+
// }
21+
// List<Server> unUpServers = application.getInstancesAsIsFromEureka().stream()
22+
// .filter(instanceInfo -> instanceInfo.getStatus() == InstanceInfo.InstanceStatus.STARTING)
23+
// .map(instanceInfo -> new DiscoveryEnabledServer(instanceInfo, true))
24+
// .collect(Collectors.toList());
25+
// if (CollectionUtils.isEmpty(unUpServers)) {
26+
// return servers;
27+
// }
28+
// return ListUtils.union(servers, unUpServers);
29+
//
30+
// };
31+
// }
4432

4533
@Override
4634
public void afterPropertiesSet() throws Exception {

0 commit comments

Comments
 (0)