Merge pull request #41 from SpringCloud/A

A

Author: saleson

README.md

@@ -124,7 +124,7 @@ C.0.0.1-SNAPHOST | Greenwich.SR2 | 2.1.7.RELEASE
 
 8. 改变实例状态
 
-	可在实例列表中，通过【实例状态】按钮修改实例状态。提前是实例得依赖了灰度客户端的jar包，并且uri没有设置前缀
+	可在实例列表中，通过【实例状态】按钮修改实例状态。提前是实例得依赖了灰度客户端的jar包，并且uri没有设置前缀(server.servlet.context-path)
 	![](doc/img/springcloud-gray-instance-status.png)
 
 9. 操作审记

spring-cloud-gray-client-netflix/src/main/java/cn/springcloud/gray/client/netflix/RibbonServerChooser.java

@@ -57,7 +57,7 @@ public boolean matchGrayDecisions(Server server) {
     @Override
     public ServerListResult<Server> distinguishServerList(List<Server> servers) {
         String serviceId = getServiceId(servers);
-        if(StringUtils.isNotEmpty(serviceId)){
+        if(StringUtils.isEmpty(serviceId)){
             return null;
         }
         return distinguishServerList(serviceId, servers);
@@ -85,7 +85,7 @@ private String getServiceId(List<Server> servers){
             return grayRequest.getServiceId();
         }
         Server server = servers.get(0);
-        if(Objects.isNull(server)){
+        if(!Objects.isNull(server)){
             return server.getMetaInfo().getServiceIdForDiscovery();
         }
         return null;

spring-cloud-gray-client/src/main/java/cn/springcloud/gray/client/config/properties/GrayProperties.java

@@ -9,7 +9,7 @@ public class GrayProperties {
 
     private boolean enabled;
 
-    private boolean grayRouting = false;
+    private boolean grayRouting = true;
 
 
 }

spring-cloud-gray-plugins/spring-cloud-gray-plugin-event-stream/src/main/java/cn/springcloud/gray/event/GaryClientStreamEventAutoConfiguration.java

@@ -1,9 +1,11 @@
 package cn.springcloud.gray.event;
 
+import cn.springcloud.gray.GrayManager;
 import cn.springcloud.gray.client.config.GrayEventAutoConfiguration;
 import cn.springcloud.gray.event.stream.StreamInput;
 import cn.springcloud.gray.event.stream.StreamMessageListener;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.cloud.stream.annotation.EnableBinding;
@@ -13,12 +15,13 @@
 @Configuration
 @ConditionalOnClass(EnableBinding.class)
 @EnableBinding({StreamInput.class})
-@ConditionalOnProperty(value = "spring.cloud.stream.bindings.GrayEventInput.destination")
+@ConditionalOnBean(GrayManager.class)
 @AutoConfigureAfter(GrayEventAutoConfiguration.class)
 public class GaryClientStreamEventAutoConfiguration {
 
 
     @Bean
+    @ConditionalOnProperty(value = "spring.cloud.stream.bindings.GrayEventInput.destination")
     public StreamMessageListener streamMessageListener(GrayEventListener grayEventListener) {
         return new StreamMessageListener(grayEventListener);
     }

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

@@ -19,6 +19,6 @@ eureka:
     lease-expiration-duration-in-seconds: 30
     prefer-ip-address: true
     metadata-map:
-      zone: gray3
+#      zone: gray3
       instanceId: s
-    initial-status: starting
+#    initial-status: starting

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

@@ -14,7 +14,7 @@ eureka:
     lease-renewal-interval-in-seconds: 10
     lease-expiration-duration-in-seconds: 30
     metadata-map:
-      zone: xuhui
+#      zone: xuhui
       instanceId: 3
 #    initial-status: starting
 #    initial-status: out_of_service