优化gray-server

Author: saleson

pom.xml

@@ -54,12 +54,13 @@
         <maven.compiler.target>1.8</maven.compiler.target>
         <java.version>1.8</java.version>
         <spring-cloud.version>Edgware.SR5</spring-cloud.version>
-        <springfox.version>2.7.0</springfox.version>
+        <springfox.version>2.9.2</springfox.version>
         <lombok.version>1.18.8</lombok.version>
         <slf4j.version>1.7.26</slf4j.version>
         <commons-lang3.version>3.5</commons-lang3.version>
         <guava.version>27.0.1-jre</guava.version>
         <mapstruct.version>1.1.0.Final</mapstruct.version>
+
     </properties>
 
 
@@ -210,16 +211,16 @@
                 <version>3.6.0</version>
                 <configuration>
                     <annotationProcessorPaths>
-                        <path>
-                            <groupId>org.mapstruct</groupId>
-                            <artifactId>mapstruct-processor</artifactId>
-                            <version>${mapstruct.version}</version>
-                        </path>
                         <path>
                             <groupId>org.projectlombok</groupId>
                             <artifactId>lombok</artifactId>
                             <version>${lombok.version}</version>
                         </path>
+                        <path>
+                            <groupId>org.mapstruct</groupId>
+                            <artifactId>mapstruct-processor</artifactId>
+                            <version>${mapstruct.version}</version>
+                        </path>
                     </annotationProcessorPaths>
                 </configuration>
             </plugin>

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

@@ -28,7 +28,7 @@ public HttpInformationClient(String baseUrl, RestTemplate rest) {
 
     @Override
     public List<GrayInstance> allGrayInstances() {
-        String url = this.baseUrl + "/gray/instance/enable";
+        String url = this.baseUrl + "/gray/instances/enable";
         ParameterizedTypeReference<List<GrayInstance>> typeRef = new ParameterizedTypeReference<List<GrayInstance>>() {
         };
 
@@ -44,7 +44,7 @@ public List<GrayInstance> allGrayInstances() {
 
     @Override
     public void addGrayInstance(GrayInstance grayInstance) {
-        String url = this.baseUrl + "/grayinstance/";
+        String url = this.baseUrl + "/gray/instance/";
         try {
             rest.postForEntity(url, grayInstance, null);
         } catch (RuntimeException e) {
@@ -53,9 +53,22 @@ public void addGrayInstance(GrayInstance grayInstance) {
         }
     }
 
+    @Override
+    public GrayInstance getGrayInstance(String serviceId, String instanceId) {
+        String url = this.baseUrl + "/gray/instance?serviceId={serviceId}&instanceId={instanceId}";
+        try {
+            ResponseEntity<GrayInstance> responseEntity =
+                    rest.getForEntity(url, GrayInstance.class, serviceId, instanceId);
+            return responseEntity.getBody();
+        } catch (RuntimeException e) {
+            log.error("获取灰度实例", e);
+            throw e;
+        }
+    }
+
     @Override
     public void serviceDownline(String instanceId) {
-        String url = this.baseUrl + "/grayinstance/{id}/switchStatus?switch=0";
+        String url = this.baseUrl + "/gray/instance/{id}/switchStatus?switch=0";
         Map<String, String> params = new HashMap<>();
         params.put("instanceId", instanceId);
         try {

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

@@ -27,6 +27,15 @@ public interface InformationClient {
      */
     void addGrayInstance(GrayInstance grayInstance);
 
+    /**
+     * 获取灰度实例的信息
+     *
+     * @param serviceId  服务id
+     * @param instanceId 实例id
+     * @return
+     */
+    GrayInstance getGrayInstance(String serviceId, String instanceId);
+
 
     /**
      * 灰度实例下线

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

@@ -14,7 +14,8 @@ public abstract class InformationClientDecorator implements InformationClient {
     public enum RequestType {
         AddGrayInstance,
         ServiceDownline,
-        AllGrayInstances
+        AllGrayInstances,
+        GetGrayInstance
     }
 
 
@@ -27,6 +28,20 @@ public interface RequestExecutor<R> {
 
     protected abstract <R> R execute(RequestExecutor<R> requestExecutor);
 
+    @Override
+    public GrayInstance getGrayInstance(String serviceId, String instanceId) {
+        return execute(new RequestExecutor<GrayInstance>() {
+            @Override
+            public GrayInstance execute(InformationClient delegate) {
+                return delegate.getGrayInstance(serviceId, instanceId);
+            }
+
+            @Override
+            public RequestType getRequestType() {
+                return RequestType.GetGrayInstance;
+            }
+        });
+    }
 
     @Override
     public List<GrayInstance> allGrayInstances() {

spring-cloud-gray-core/src/main/java/cn/springcloud/gray/event/EventType.java

@@ -0,0 +1,7 @@
+package cn.springcloud.gray.event;
+
+import java.io.Serializable;
+
+public enum EventType implements Serializable {
+    DOWN, UPDATE
+}

spring-cloud-gray-core/src/main/java/cn/springcloud/gray/event/GrayEventListener.java

@@ -0,0 +1,10 @@
+package cn.springcloud.gray.event;
+
+import cn.springcloud.gray.exceptions.EventException;
+
+public interface GrayEventListener {
+
+
+    void onEvent(GrayEventMsg msg) throws EventException;
+
+}

spring-cloud-gray-core/src/main/java/cn/springcloud/gray/event/GrayEventMsg.java

@@ -0,0 +1,16 @@
+package cn.springcloud.gray.event;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+
+@Setter
+@Getter
+public class GrayEventMsg implements Serializable {
+    private static final long serialVersionUID = -8114806214567175543L;
+    private String serviceId;
+    private String instanceId;
+    private EventType eventType;
+
+}

spring-cloud-gray-core/src/main/java/cn/springcloud/gray/event/GrayEventPublisher.java

@@ -0,0 +1,8 @@
+package cn.springcloud.gray.event;
+
+import cn.springcloud.gray.exceptions.EventException;
+
+public interface GrayEventPublisher {
+
+    void publishEvent(GrayEventMsg msg) throws EventException;
+}

spring-cloud-gray-core/src/main/java/cn/springcloud/gray/exceptions/EventException.java

@@ -0,0 +1,25 @@
+package cn.springcloud.gray.exceptions;
+
+public class EventException extends RuntimeException {
+
+    private static final long serialVersionUID = -2822193541909545645L;
+
+    public EventException() {
+    }
+
+    public EventException(String message) {
+        super(message);
+    }
+
+    public EventException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public EventException(Throwable cause) {
+        super(cause);
+    }
+
+    public EventException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
+        super(message, cause, enableSuppression, writableStackTrace);
+    }
+}

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

@@ -3,11 +3,12 @@ server:
 spring:
   application:
     name: gray-server
+  #通用数据源配置
   datasource:
     driver-class-name: com.mysql.jdbc.Driver
     url: jdbc:mysql://localhost:3306/gray_server01?charset=utf8mb4&useSSL=false
     username: root
-    password: xiaoyu
+    password: root
     # Hikari 数据源专用配置
     hikari:
       maximum-pool-size: 20
@@ -16,8 +17,9 @@ spring:
   jpa:
     database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
     show-sql: true
+    generate-ddl: true
     hibernate:
-      ddl-auto: create
+      ddl-auto: none
 eureka:
   client:
     register-with-eureka: true