优化代码:

后端添加service context-path
查看client的灰度信息

Author: saleson

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

@@ -0,0 +1,15 @@
+package cn.springcloud.gray.exceptions;
+
+/**
+ * @author saleson
+ * @date 2019-11-25 21:53
+ */
+public class NotFoundException extends RuntimeException {
+
+    public NotFoundException() {
+    }
+
+    public NotFoundException(String message) {
+        super(message);
+    }
+}

spring-cloud-gray-plugins/spring-cloud-gray-plugin-webmvc/src/main/java/cn/springcloud/gray/web/resources/GrayClientTrackResource.java

@@ -3,6 +3,8 @@
 import cn.springcloud.gray.GrayManager;
 import cn.springcloud.gray.api.ApiRes;
 import cn.springcloud.gray.model.GrayInstance;
+import cn.springcloud.gray.model.GrayTrackDefinition;
+import cn.springcloud.gray.request.track.GrayTrackHolder;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -16,8 +18,14 @@
  * @date 2019-11-24 12:12
  */
 @RestController
-@RequestMapping("/gray/service")
-public class GrayClientServiceResource {
+@RequestMapping("/gray/list")
+public class GrayListResource {
+
+
+    @Autowired
+    private GrayTrackHolder grayTrackHolder;
+
+
     @Autowired
     private GrayManager grayManager;
 
@@ -26,11 +34,22 @@ public class GrayClientServiceResource {
      *
      * @return
      */
-    @GetMapping("/allInfos")
+    @GetMapping("/service/allInfos")
     public ApiRes<Map<String, Collection<GrayInstance>>> getAllGrayServiceInfos() {
         return ApiRes.<Map<String, Collection<GrayInstance>>>builder()
                 .data(grayManager.getMapByAllGrayServices())
                 .build();
     }
 
+    /**
+     * 返回维护的所有灰度追踪信息
+     *
+     * @return
+     */
+    @GetMapping("/track/allDefinitions")
+    public ApiRes<Collection<GrayTrackDefinition>> getAllGrayTracks() {
+        return ApiRes.<Collection<GrayTrackDefinition>>builder()
+                .data(grayTrackHolder.getTrackDefinitions())
+                .build();
+    }
 }

spring-cloud-gray-plugins/spring-cloud-gray-plugin-webmvc/src/main/java/cn/springcloud/gray/web/resources/GrayClientServiceResource.java renamed to spring-cloud-gray-plugins/spring-cloud-gray-plugin-webmvc/src/main/java/cn/springcloud/gray/web/resources/GrayListResource.java

@@ -0,0 +1,25 @@
+package cn.springcloud.gray.server;
+
+import cn.springcloud.gray.server.discovery.ServiceDiscovery;
+import cn.springcloud.gray.server.module.client.ClientRemoteModule;
+import cn.springcloud.gray.server.module.client.DefaultClientRemoteModule;
+import cn.springcloud.gray.server.module.gray.GrayServerModule;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @author saleson
+ * @date 2019-11-25 22:45
+ */
+@Configuration
+public class ClientRemoteConfiguration {
+
+
+    @Bean
+    @ConditionalOnMissingBean
+    public ClientRemoteModule clientRemoteModule(ServiceDiscovery serviceDiscovery, GrayServerModule grayServerModule) {
+        return new DefaultClientRemoteModule(serviceDiscovery, grayServerModule);
+    }
+
+}

spring-cloud-gray-server/src/main/java/cn/springcloud/gray/server/ClientRemoteConfiguration.java

@@ -0,0 +1,42 @@
+package cn.springcloud.gray.server.module.client;
+
+import java.util.function.Consumer;
+import java.util.function.Function;
+
+/**
+ * @author saleson
+ * @date 2019-11-25 20:38
+ */
+public interface ClientRemoteModule {
+
+    /**
+     * 获取客户端的路径
+     *
+     * @return
+     */
+    String getClientPath(String serviceId, String instanceId);
+
+
+    /**
+     * 调用客户端接口，并返回结果
+     *
+     * @param serviceId
+     * @param instanceId
+     * @param uri
+     * @param function
+     * @param <T>
+     * @return
+     */
+    <T> T callClient(String serviceId, String instanceId, String uri, Function<String, T> function);
+
+
+    /**
+     * 调用客户端接口
+     *
+     * @param serviceId
+     * @param instanceId
+     * @param uri
+     * @param consumer
+     */
+    void callClient(String serviceId, String instanceId, String uri, Consumer<String> consumer);
+}

spring-cloud-gray-server/src/main/java/cn/springcloud/gray/server/module/client/ClientRemoteModule.java

@@ -0,0 +1,56 @@
+package cn.springcloud.gray.server.module.client;
+
+import cn.springcloud.gray.exceptions.NotFoundException;
+import cn.springcloud.gray.model.InstanceInfo;
+import cn.springcloud.gray.server.discovery.ServiceDiscovery;
+import cn.springcloud.gray.server.module.gray.GrayServerModule;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.Objects;
+import java.util.function.Consumer;
+import java.util.function.Function;
+
+/**
+ * @author saleson
+ * @date 2019-11-25 20:46
+ */
+public class DefaultClientRemoteModule implements ClientRemoteModule {
+
+    private ServiceDiscovery serviceDiscovery;
+    private GrayServerModule grayServerModule;
+
+    public DefaultClientRemoteModule(ServiceDiscovery serviceDiscovery, GrayServerModule grayServerModule) {
+        this.serviceDiscovery = serviceDiscovery;
+        this.grayServerModule = grayServerModule;
+    }
+
+    @Override
+    public String getClientPath(String serviceId, String instanceId) {
+        InstanceInfo instanceInfo = serviceDiscovery.getInstanceInfo(serviceId, instanceId);
+        if (instanceInfo == null) {
+            throw new NotFoundException();
+        }
+        if (StringUtils.isEmpty(instanceInfo.getHost()) || Objects.equals(instanceInfo.getPort(), 0)) {
+            throw new IllegalArgumentException();
+        }
+
+        String contextPath = grayServerModule.getServiceContextPath(serviceId);
+        StringBuilder path = new StringBuilder("http://")
+                .append(instanceInfo.getHost())
+                .append(":")
+                .append(instanceInfo.getPort())
+                .append(contextPath);
+        return path.toString();
+    }
+
+    @Override
+    public <T> T callClient(String serviceId, String instanceId, String uri, Function<String, T> function) {
+        return function.apply(getClientPath(serviceId, instanceId) + uri);
+    }
+
+    @Override
+    public void callClient(String serviceId, String instanceId, String uri, Consumer<String> consumer) {
+        consumer.accept(getClientPath(serviceId, instanceId) + uri);
+    }
+
+}

spring-cloud-gray-server/src/main/java/cn/springcloud/gray/server/module/client/DefaultClientRemoteModule.java

@@ -11,6 +11,7 @@
 
 import java.util.Collection;
 import java.util.List;
+import java.util.Objects;
 
 public interface GrayServerModule {
 
@@ -69,7 +70,10 @@ default void openGray(String instanceId) {
 
     GrayService getGrayService(String id);
 
-    String getServiceContextPath(String serviceId);
+    default String getServiceContextPath(String serviceId) {
+        GrayService grayService = getGrayService(serviceId);
+        return Objects.isNull(grayService) ? "" : grayService.getContextPath();
+    }
 
     List<GrayPolicy> listGrayPoliciesByInstanceId(String instanceId);
 

spring-cloud-gray-server/src/main/java/cn/springcloud/gray/server/module/gray/GrayServerModule.java

@@ -0,0 +1,51 @@
+package cn.springcloud.gray.server.resources;
+
+import cn.springcloud.gray.api.ApiRes;
+import cn.springcloud.gray.exceptions.NotFoundException;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.ResponseStatus;
+
+/**
+ * @author saleson
+ * @date 2019-11-25 21:49
+ */
+@ControllerAdvice
+public class ExceptionTranslator {
+
+
+    @ExceptionHandler(NotFoundException.class)
+    @ResponseStatus(HttpStatus.NOT_FOUND)
+    @ResponseBody
+    public ApiRes<Void> processNotFoundException(NotFoundException ex) {
+        return ApiRes.<Void>builder()
+                .code(ApiRes.CODE_NOT_FOUND)
+                .message(StringUtils.defaultIfEmpty(ex.getMessage(), HttpStatus.NOT_FOUND.getReasonPhrase()))
+                .build();
+    }
+
+
+    @ExceptionHandler(NotFoundException.class)
+    @ResponseStatus(HttpStatus.BAD_REQUEST)
+    @ResponseBody
+    public ApiRes<Void> processIllegalArgumentException(IllegalArgumentException ex) {
+        return ApiRes.<Void>builder()
+                .code(String.valueOf(HttpStatus.BAD_REQUEST))
+                .message(StringUtils.defaultIfEmpty(ex.getMessage(), "instance host or port is empty"))
+                .build();
+    }
+
+
+    @ExceptionHandler(Exception.class)
+    @ResponseStatus(HttpStatus.BAD_REQUEST)
+    @ResponseBody
+    public ApiRes<Void> processException(Exception ex) {
+        return ApiRes.<Void>builder()
+                .code(String.valueOf(HttpStatus.BAD_REQUEST))
+                .message(StringUtils.defaultIfEmpty(ex.getMessage(), "error"))
+                .build();
+    }
+}

spring-cloud-gray-server/src/main/java/cn/springcloud/gray/server/resources/ExceptionTranslator.java

@@ -0,0 +1,61 @@
+package cn.springcloud.gray.server.resources.rest;
+
+import cn.springcloud.gray.api.ApiRes;
+import cn.springcloud.gray.model.GrayInstance;
+import cn.springcloud.gray.model.GrayTrackDefinition;
+import cn.springcloud.gray.server.module.client.ClientRemoteModule;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpMethod;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.client.RestTemplate;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author saleson
+ * @date 2019-11-24 14:40
+ */
+@RequestMapping("/gray/client/grayList")
+public class ClientGrayListResource {
+
+    @Autowired
+    private ClientRemoteModule clientRemoteModule;
+
+    @Autowired
+    private RestTemplate restTemplate;
+
+    private ObjectMapper objectMapper = new ObjectMapper();
+
+    @GetMapping("/track/allDefinitions")
+    public ApiRes<List<GrayTrackDefinition>> getAllGrayTracks(
+            @RequestParam("serviceId") String serviceId,
+            @RequestParam("instanceId") String instanceId) {
+        return clientRemoteModule.callClient(serviceId, instanceId,
+                "/gray/list/track/allDefinitions", url -> {
+                    return restTemplate.execute(url, HttpMethod.GET, null, res -> {
+                        return objectMapper.readValue(res.getBody(), new TypeReference<ApiRes<List<GrayTrackDefinition>>>() {
+                        });
+                    });
+                });
+    }
+
+
+    @GetMapping("/service/allInfos")
+    public ApiRes<Map<String, List<GrayInstance>>> getAllGrayServiceInfos(
+            @RequestParam("serviceId") String serviceId,
+            @RequestParam("instanceId") String instanceId) {
+        return clientRemoteModule.callClient(serviceId, instanceId,
+                "/gray/list/service/allInfos", url -> {
+                    return restTemplate.execute(url, HttpMethod.GET, null, res -> {
+                        return objectMapper.readValue(res.getBody(), new TypeReference<ApiRes<Map<String, List<GrayInstance>>>>() {
+                        });
+                    });
+                });
+    }
+
+}