Merge pull request #21 from SpringCloud/A

A

Author: saleson

.gitignore

@@ -103,7 +103,7 @@ Desktop.ini
 ######################
 # Directories
 ######################
-/build/**
+#/build/**
 /bin/**
 /spring_loaded/**
 /deploy/**

pom.xml

@@ -12,7 +12,7 @@
     <groupId>cn.springcloud.gray</groupId>
     <artifactId>spring-cloud-gray</artifactId>
     <packaging>pom</packaging>
-    <version>A.1.0.7</version>
+    <version>A.1.0.8</version>
     <url>https://github.com/SpringCloud/spring-cloud-gray</url>
     <organization>
         <name>Spring Cloud中国社区</name>
@@ -39,7 +39,6 @@
         <module>spring-cloud-gray-client-netflix</module>
         <module>spring-cloud-gray-utils</module>
         <module>spring-cloud-gray-starter-dependencies</module>
-        <module>spring-cloud-gray-webui</module>
         <module>spring-cloud-starter-gray-eureka-server</module>
     </modules>
 

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

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>spring-cloud-gray</artifactId>
         <groupId>cn.springcloud.gray</groupId>
-        <version>A.1.0.7</version>
+        <version>A.1.0.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

spring-cloud-gray-client/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>spring-cloud-gray</artifactId>
         <groupId>cn.springcloud.gray</groupId>
-        <version>A.1.0.7</version>
+        <version>A.1.0.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

spring-cloud-gray-client/src/main/java/cn/springcloud/gray/communication/HttpInformationClient.java

@@ -73,11 +73,11 @@ public GrayInstance getGrayInstance(String serviceId, String instanceId) {
     public void serviceDownline(String instanceId) {
         String url = this.baseUrl + "/gray/instance/{id}/switchStatus?switch=0";
         Map<String, String> params = new HashMap<>();
-        params.put("instanceId", instanceId);
+        params.put("id", instanceId);
         try {
-            rest.delete(url, params);
+            rest.put(url, null, params);
         } catch (Exception e) {
-            log.error("灰度服务实例下线失败", e);
+            log.error("灰度服务实例下线失败, url:{}, params:{}", url, params, e);
             throw e;
         }
     }

spring-cloud-gray-core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>spring-cloud-gray</artifactId>
         <groupId>cn.springcloud.gray</groupId>
-        <version>A.1.0.7</version>
+        <version>A.1.0.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

spring-cloud-gray-dependencies/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>spring-cloud-gray</artifactId>
         <groupId>cn.springcloud.gray</groupId>
-        <version>A.1.0.7</version>
+        <version>A.1.0.8</version>
     </parent>
     <!--    <parent>-->
     <!--        <groupId>org.springframework.boot</groupId>-->
@@ -17,7 +17,7 @@
 
     <groupId>cn.springcloud.gray</groupId>
     <artifactId>spring-cloud-gray-dependencies</artifactId>
-    <version>A.1.0.7</version>
+    <version>A.1.0.8</version>
     <packaging>pom</packaging>
 
     <licenses>

spring-cloud-gray-samples/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>spring-cloud-gray</artifactId>
         <groupId>cn.springcloud.gray</groupId>
-        <version>A.1.0.7</version>
+        <version>A.1.0.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

spring-cloud-gray-samples/spring-cloud-gray-eureka-sample/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>spring-cloud-gray-samples</artifactId>
         <groupId>cn.springcloud.gray</groupId>
-        <version>A.1.0.7</version>
+        <version>A.1.0.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -20,7 +20,7 @@
         <dependency>
             <artifactId>spring-cloud-gray-utils</artifactId>
             <groupId>cn.springcloud.gray</groupId>
-            <version>A.1.0.7</version>
+            <version>A.1.0.8</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>

spring-cloud-gray-samples/spring-cloud-gray-server-sample/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>spring-cloud-gray-samples</artifactId>
         <groupId>cn.springcloud.gray</groupId>
-        <version>A.1.0.7</version>
+        <version>A.1.0.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>