优化

miaoguoxin
1 parent afc80a49
Showing 20 changed files with 119 additions and 109 deletions
doc/xtrade-gateway说明.docx
src/main/java/com/diligrp/xtrade/gateway/api/ApiManager.java
src/main/java/com/diligrp/xtrade/gateway/application/TestAggregationApplication.java
src/main/java/com/diligrp/xtrade/gateway/common/constant/GatewayAttrType.java
src/main/java/com/diligrp/xtrade/gateway/common/constant/GatewayConst.java
src/main/java/com/diligrp/xtrade/gateway/common/utils/PathUtils.java
src/main/java/com/diligrp/xtrade/gateway/common/utils/ValidateUtils.java
src/main/java/com/diligrp/xtrade/gateway/controller/TestController.java
src/main/java/com/diligrp/xtrade/gateway/domain/TestRequestDto.java
src/main/java/com/diligrp/xtrade/gateway/filters/factory/DispatchGatewayFilterFactory.java
src/main/java/com/diligrp/xtrade/gateway/filters/global/AuthGlobalFilter.java
src/main/java/com/diligrp/xtrade/gateway/filters/global/ResponseReadBodyGlobalFilter.java
src/main/java/com/diligrp/xtrade/gateway/filters/web/ReactiveContextWebFilter.java
src/main/java/com/diligrp/xtrade/gateway/route/GatewayResourcesLoader.java
src/main/java/com/diligrp/xtrade/gateway/route/impl/CloudRouteResourceLoader.java
src/main/java/com/diligrp/xtrade/gateway/support/context/ReactiveRequestBeanProcessor.java → src/main/java/com/diligrp/xtrade/gateway/support/context/ReactiveWebContextBeanProcessor.java
src/main/java/com/diligrp/xtrade/gateway/support/dispatch/RequestDispatcher.java
src/main/resources/bootstrap-dev.yml
src/main/resources/bootstrap.yml
src/test/java/com/diligrp/xtrade/gateway/XtradeGatewayApplicationTests.java
@@ -4,13 +4,8 @@ import com.diligrp.xtrade.gateway.config.property.AuthPathProperties;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.server.PathContainer;
 import org.springframework.stereotype.Component;
-import org.springframework.web.util.pattern.PathPattern;
-import java.util.List;
 import java.util.Optional;
-import java.util.function.Consumer;
-import java.util.function.Function;
-import java.util.function.Predicate;
 /**
  * @Auther: miaoguoxin
@@ -4,6 +4,8 @@ import com.diligrp.xtrade.gateway.common.annotation.DispatchMapping;
 import com.diligrp.xtrade.gateway.domain.TestRequestDto;
 import com.diligrp.xtrade.gateway.support.dispatch.DispatchContext;
 import com.diligrp.xtrade.gateway.support.dispatch.RequestDispatcher;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.server.reactive.ServerHttpRequest;
 import org.springframework.stereotype.Component;
 import org.springframework.validation.annotation.Validated;
@@ -19,13 +21,16 @@ import javax.validation.groups.Default;
 @DispatchMapping
 public class TestAggregationApplication {
+    @Autowired
+    private ServerHttpRequest serverHttpRequest;
+
     @DispatchMapping("/test")
     public String test(DispatchContext<TestRequestDto> dispatchContext){
         return "ffff";
     }
     @DispatchMapping("test2")
-    public void test2(@Validated(value = Default.class) DispatchContext<TestRequestDto> dispatchContext){
+    public void test2(@Validated DispatchContext<TestRequestDto> dispatchContext){
     }
@@ -16,9 +16,9 @@ public enum GatewayAttrType implements IEnumType {
     /**
      * 编码
      */
-    private int value;
+    private final int value;
-    private String desc;
+    private final String desc;
     GatewayAttrType(int value, String desc) {
 package com.diligrp.xtrade.gateway.common.constant;
+import org.springframework.cloud.gateway.filter.factory.StripPrefixGatewayFilterFactory;
+
 import java.util.concurrent.atomic.AtomicBoolean;
 /**
@@ -15,7 +17,11 @@ public class GatewayConst {
     /**缓存Api配置key*/
     public static final String CACHE_API_OBJECT_KEY = "cachedApiConfigObject";
-    public static final int CACHE_BODY_FILTER_ORDER = -10;
-
-    public static final int AUTH_FILTER_ORDER = -9;
+    /* 自定义的过滤器顺序都从100开始（除ResponseBodyRead），避免顺序问题*/
+    /**缓存请求体过滤器*/
+    public static final int CACHE_BODY_FILTER_ORDER = 100;
+    /** 权限过滤器 */
+    public static final int AUTH_FILTER_ORDER = 101;
+    /**分发器，需要保证在最后执行，并且在10000之前*/
+    public static final int DISPATCH_FACTORY_FILTER_ORDER = 150;
 }
@@ -14,7 +14,7 @@ import java.util.concurrent.CopyOnWriteArrayList;
  * @Date: 2020/4/15 10:37
  */
 public class PathUtils {
-    private  static PathPatternParser pathPatternParser = new PathPatternParser();
+    private  static final PathPatternParser PATH_PATTERN_PARSER = new PathPatternParser();
     /**
     * 多个路径拼接成一个标准uri，ex: /test + gateway = /test/gateway
@@ -95,7 +95,7 @@ public class PathUtils {
             pathPatterns.clear();
         }
         for (String path : paths) {
-            PathPattern pathPattern = pathPatternParser.parse(path);
+            PathPattern pathPattern = PATH_PATTERN_PARSER.parse(path);
             pathPatterns.add(pathPattern);
         }
         return pathPatterns;
@@ -31,8 +31,8 @@ public class ValidateUtils {
         validate(params, new Class[]{});
     }
-    public static void validate(Object params, Class... groups) {
-        Set<Class> groupSet = new HashSet<>();
+    public static void validate(Object params, Class<?>... groups) {
+        Set<Class<?>> groupSet = new HashSet<>();
         groupSet.add(Default.class);
         if (groups != null && groups.length > 0) {
             groupSet.addAll(Arrays.asList(groups));
 package com.diligrp.xtrade.gateway.controller;
+import com.diligrp.xtrade.gateway.domain.TestRequestDto;
 import com.diligrp.xtrade.shared.domain.Message;
+import com.diligrp.xtrade.shared.util.DateUtils;
 import com.google.common.collect.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -8,12 +10,18 @@ import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.cloud.gateway.config.GatewayProperties;
 import org.springframework.cloud.gateway.route.RouteDefinition;
 import org.springframework.http.server.PathContainer;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.util.pattern.PathPattern;
 import org.springframework.web.util.pattern.PathPatternParser;
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
+import javax.validation.groups.Default;
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
@@ -26,22 +34,21 @@ import java.util.Optional;
 @RestController
 @RequestMapping("/test")
 @RefreshScope
+@Validated
 public class TestController {
-    private static PathPatternParser pathPatternParser = new PathPatternParser();
     @Autowired
     private GatewayProperties gatewayProperties;
     @Value("${ribbon.ServerListRefreshInterval}")
     private String interval;
-    @GetMapping("/gateway")
-    public Message<List<RouteDefinition>> test() {
+    @GetMapping("/gateway/{id}")
+    public Message test(@Min(value = 5,message = "id不能小于5") @PathVariable Integer id) {
         List<RouteDefinition> routes = gatewayProperties.getRoutes();
-        return Message.builder().success(routes);
-        //throw new RuntimeException("gfdg");
+        return Message.builder().success();
     }
     @GetMapping("/test_dynamic")
-    public Message<String> test1() {
-        return Message.builder().success(interval);
+    public Message<String> test1( TestRequestDto testRequestDto) {
+        throw new RuntimeException("fffff");
     }
 }
 package com.diligrp.xtrade.gateway.domain;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import javax.validation.constraints.NotBlank;
+import javax.validation.groups.Default;
+import java.time.LocalDateTime;
 /**
  * @Auther: miaoguoxin
@@ -12,5 +15,6 @@ import javax.validation.constraints.NotBlank;
 public class TestRequestDto {
     @NotBlank(message = "{request.username.not.blank}")
     private String username;
-
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime localDateTime;
 }
 package com.diligrp.xtrade.gateway.filters.factory;
+import com.diligrp.xtrade.gateway.common.constant.GatewayConst;
 import com.diligrp.xtrade.gateway.common.utils.ResponseUtils;
 import com.diligrp.xtrade.gateway.support.dispatch.RequestDispatcher;
 import com.diligrp.xtrade.shared.domain.Message;
@@ -7,12 +8,15 @@ import lombok.Data;
 import org.reactivestreams.Publisher;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.gateway.filter.GatewayFilter;
+import org.springframework.cloud.gateway.filter.GatewayFilterChain;
 import org.springframework.cloud.gateway.filter.factory.AbstractGatewayFilterFactory;
+import org.springframework.core.Ordered;
 import org.springframework.core.io.buffer.DataBuffer;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.http.server.reactive.ServerHttpResponseDecorator;
 import org.springframework.stereotype.Component;
+import org.springframework.web.server.ServerWebExchange;
 import reactor.core.publisher.Mono;
 import static com.diligrp.xtrade.gateway.common.constant.GatewayConst.CACHE_REQUEST_BODY_OBJECT_KEY;
@@ -34,30 +38,35 @@ public class DispatchGatewayFilterFactory extends AbstractGatewayFilterFactory&lt;D
     @Override
     public GatewayFilter apply(Config config) {
-        return (exchange, chain) -> {
+        return new DispatchGatewayFilter(requestDispatcher);
+    }
+
+    private static class DispatchGatewayFilter implements GatewayFilter,Ordered{
+        private final  RequestDispatcher requestDispatcher;
+
+        public DispatchGatewayFilter(RequestDispatcher requestDispatcher) {
+            this.requestDispatcher = requestDispatcher;
+        }
+
+        @Override
+        public Mono<Void> filter(ServerWebExchange exchange, GatewayFilterChain chain) {
             String rawPath = exchange.getRequest().getURI().getRawPath();
             String paramsJson = exchange.getAttribute(CACHE_REQUEST_BODY_OBJECT_KEY);
-            Message message = requestDispatcher.executeMethod(rawPath, paramsJson,exchange);
+            Message message = requestDispatcher.executeMethod(rawPath, paramsJson, exchange);
             //throw new RuntimeException("gggg");
-            return ResponseUtils.writeResponse(
-                    new ServerHttpResponseDecorator(exchange.getResponse()) {
-                        @Override
-                        public Mono<Void> writeWith(Publisher<? extends DataBuffer> body) {
-                            //这里需要设置响应content-Type,不然后面的过滤器拿不到这个值会报错
-                            exchange.getAttributes().put(ORIGINAL_RESPONSE_CONTENT_TYPE_ATTR, MediaType.APPLICATION_JSON_VALUE);
-                            String originalResponseContentType = exchange
-                                    .getAttribute(ORIGINAL_RESPONSE_CONTENT_TYPE_ATTR);
-                            HttpHeaders httpHeaders = exchange.getResponse().getHeaders();
-                            httpHeaders.add(HttpHeaders.CONTENT_TYPE, originalResponseContentType);
-                            return super.writeWith(body);
-                        }
-                    }, message);
-        };
+            exchange.getAttributes().put(ORIGINAL_RESPONSE_CONTENT_TYPE_ATTR, MediaType.APPLICATION_JSON_VALUE);
+            return ResponseUtils.writeResponse(exchange.getResponse(),message);
+        }
+
+        @Override
+        public int getOrder() {
+            return GatewayConst.DISPATCH_FACTORY_FILTER_ORDER;
+        }
     }
+
     @Data
     public static class Config {
-        private String keyResolverName;
     }
 }
@@ -2,31 +2,24 @@ package com.diligrp.xtrade.gateway.filters.global;
 import com.diligrp.xtrade.gateway.api.ApiManager;
 import com.diligrp.xtrade.gateway.common.utils.ResponseUtils;
-import com.diligrp.xtrade.shared.domain.Message;
-import com.diligrp.xtrade.shared.util.JsonUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.gateway.filter.GatewayFilterChain;
 import org.springframework.cloud.gateway.filter.GlobalFilter;
 import org.springframework.core.Ordered;
-import org.springframework.core.io.buffer.PooledDataBuffer;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
-import org.springframework.http.server.reactive.ServerHttpRequest;
 import org.springframework.http.server.reactive.ServerHttpResponse;
 import org.springframework.stereotype.Component;
 import org.springframework.web.server.ServerWebExchange;
-import reactor.core.Disposable;
-import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-import java.util.Map;
+import java.net.URI;
+import java.util.LinkedHashSet;
+import java.util.Optional;
 import static com.diligrp.xtrade.gateway.common.constant.GatewayConst.AUTH_FILTER_ORDER;
-import static com.diligrp.xtrade.gateway.common.constant.GatewayConst.CACHE_REQUEST_BODY_OBJECT_KEY;
-import static org.springframework.cloud.gateway.support.ServerWebExchangeUtils.CACHED_REQUEST_BODY_ATTR;
+import static org.springframework.cloud.gateway.support.ServerWebExchangeUtils.GATEWAY_ORIGINAL_REQUEST_URL_ATTR;
+import static org.springframework.cloud.gateway.support.ServerWebExchangeUtils.ORIGINAL_RESPONSE_CONTENT_TYPE_ATTR;
 /**
  * @Auther: miaoguoxin
@@ -38,17 +31,27 @@ import static org.springframework.cloud.gateway.support.ServerWebExchangeUtils.C
 public class AuthGlobalFilter implements GlobalFilter, Ordered {
     @Autowired
     private ApiManager apiManager;
+
     @Override
     public Mono<Void> filter(ServerWebExchange exchange, GatewayFilterChain chain) {
-        String rawPath = exchange.getRequest().getURI().getRawPath();
+        String originalUri = getOriginalUri(exchange);
         ServerHttpResponse response = exchange.getResponse();
         //排除在外的Uri跳过权限
-        if (apiManager.isExcludePathMatch(rawPath)){
-            return chain.filter(exchange);
+        if (apiManager.isExcludePathMatch(originalUri)) {
+           // return chain.filter(exchange);
+            throw new RuntimeException("异常测试");
         }
+        exchange.getAttributes().put(ORIGINAL_RESPONSE_CONTENT_TYPE_ATTR, MediaType.APPLICATION_JSON_VALUE);
         return ResponseUtils.writeForbidden(response);
     }
+    private static String getOriginalUri(ServerWebExchange exchange) {
+        LinkedHashSet<URI> uris = exchange.getAttribute(GATEWAY_ORIGINAL_REQUEST_URL_ATTR);
+        return Optional.ofNullable(uris)
+                .flatMap(us -> us.stream().findFirst().map(URI::getRawPath))
+                .orElse(exchange.getRequest().getURI().getRawPath());
+    }
+
     @Override
     public int getOrder() {
         return AUTH_FILTER_ORDER;
@@ -77,7 +77,7 @@ public class ResponseReadBodyGlobalFilter implements GlobalFilter, Ordered {
             HttpHeaders httpHeaders = new HttpHeaders();
             httpHeaders.setContentType(originalResponseContentType);
-            ClientResponse clientResponse = this.prepareClientResponse( exchange.getResponse().getStatusCode(),body, httpHeaders);
+            ClientResponse clientResponse = this.prepareClientResponse(exchange.getResponse().getStatusCode(),body, httpHeaders);
             Mono<String> bodyMono = clientResponse.bodyToMono(String.class);
             return bodyMono.flatMap(respBody -> {
                 //打印返回响应日志
@@ -100,9 +100,8 @@ public class ResponseReadBodyGlobalFilter implements GlobalFilter, Ordered {
     private ClientResponse prepareClientResponse(HttpStatus httpStatus, Publisher<? extends DataBuffer> body,
                                                  HttpHeaders httpHeaders) {
-        ClientResponse.Builder builder;
-        builder = ClientResponse.create(httpStatus, messageReaders);
-        return builder.headers(headers -> headers.putAll(httpHeaders))
+        return ClientResponse.create(httpStatus, messageReaders)
+                .headers(headers -> headers.putAll(httpHeaders))
                 .body(Flux.from(body)).build();
     }
 package com.diligrp.xtrade.gateway.filters.web;
 import com.diligrp.xtrade.gateway.support.context.ReactiveExchangeContextHolder;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
 import org.springframework.http.server.reactive.ServerHttpRequest;
 import org.springframework.stereotype.Component;
@@ -10,6 +11,8 @@ import org.springframework.web.server.WebFilterChain;
 import reactor.core.publisher.Mono;
 import reactor.core.publisher.SignalType;
+import java.util.function.Consumer;
+
 /**
  * @Auther: miaoguoxin
  * @Date: 2020/4/16 09:17
@@ -17,9 +20,11 @@ import reactor.core.publisher.SignalType;
  */
 @Component
 @ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.REACTIVE)
+@Slf4j
 public class ReactiveContextWebFilter implements WebFilter {
     @Override
     public Mono<Void> filter(ServerWebExchange exchange, WebFilterChain chain) {
+        long l = System.currentTimeMillis();
         ServerHttpRequest request = exchange.getRequest();
         String path = request.getURI().getRawPath();
         if (path.contains("favicon.ico")) {
@@ -27,7 +32,8 @@ public class ReactiveContextWebFilter implements WebFilter {
         }
         ReactiveExchangeContextHolder.put(exchange);
         return chain.filter(exchange).doFinally(signalType -> {
-                ReactiveExchangeContextHolder.remove();
+            ReactiveExchangeContextHolder.remove();
+            log.info("消耗时间：{}",System.currentTimeMillis()-l);
         });
     }
 }
@@ -16,7 +16,7 @@ public class GatewayResourcesLoader implements ApplicationRunner {
     private DynamicRouteLoaderIntf dynamicRouteLoader;
     @Override
-    public void run(ApplicationArguments args) throws Exception {
+    public void run(ApplicationArguments args) {
         dynamicRouteLoader.init();
     }
 }
@@ -34,7 +34,7 @@ public class CloudRouteResourceLoader implements DynamicRouteLoaderIntf {
     /**标记当前gatewayproties的hash值，用于判断配置是否更新过*/
     private static int gatewayPropertiesHash;
     /**防止重复初始化的标记*/
-    private static AtomicBoolean hasInit = new AtomicBoolean(false);
+    private static final AtomicBoolean HAS_INIT = new AtomicBoolean(false);
     private final static String GROUP = "DEFAULT_GROUP";
     private final static String ROUTE_CONFIG_NAME = "route.properties";
@@ -57,7 +57,7 @@ public class CloudRouteResourceLoader implements DynamicRouteLoaderIntf {
     @Override
     public void init() {
-        if (hasInit.compareAndSet(false, true)) {
+        if (HAS_INIT.compareAndSet(false, true)) {
             this.loadRoutes();
             //用来判断routes是否改变过，避免无效刷新
             gatewayPropertiesHash = gatewayProperties.getRoutes().hashCode();
@@ -13,10 +13,9 @@ import java.io.Serializable;
 /**
  * @Auther: miaoguoxin
  * @Date: 2020/4/16 09:13
- * @Description:
  */
 @Component
-public class ReactiveRequestBeanProcessor implements BeanFactoryPostProcessor {
+public class ReactiveWebContextBeanProcessor implements BeanFactoryPostProcessor {
     @Override
     public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException {
 package com.diligrp.xtrade.gateway.support.dispatch;
-import com.diligrp.xtrade.gateway.application.TestAggregationApplication;
 import com.diligrp.xtrade.gateway.common.utils.PathUtils;
 import com.diligrp.xtrade.gateway.common.utils.ValidateUtils;
-import com.diligrp.xtrade.gateway.domain.TestRequestDto;
 import com.diligrp.xtrade.gateway.exception.GatewayParamNotValidException;
 import com.diligrp.xtrade.gateway.exception.GatewayServiceException;
 import com.diligrp.xtrade.gateway.filters.factory.DispatchGatewayFilterFactory;
-import com.diligrp.xtrade.gateway.route.DynamicRouteLoaderIntf;
-import com.diligrp.xtrade.gateway.route.impl.MysqlRouteResourceLoader;
 import com.diligrp.xtrade.shared.domain.Message;
-import com.diligrp.xtrade.shared.type.SystemCode;
+import com.diligrp.xtrade.shared.type.ErrorCode;
 import com.diligrp.xtrade.shared.util.JsonUtils;
 import com.google.common.base.Strings;
 import lombok.extern.slf4j.Slf4j;
-import org.bouncycastle.util.Arrays;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.gateway.support.NotFoundException;
 import org.springframework.context.ApplicationContext;
@@ -22,13 +17,10 @@ import org.springframework.stereotype.Component;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.server.ResponseStatusException;
 import org.springframework.web.server.ServerWebExchange;
-import org.springframework.web.server.ServerWebInputException;
 import org.springframework.web.util.pattern.PathPattern;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -38,7 +30,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
 /**
  * @Auther: miaoguoxin
- * @Date: 2020/4/15 09:29
+ * @date: 2020/4/15 09:29
  * @Description: 映射分发器, 用于聚合服务执行对应方法
  * {@link DispatchGatewayFilterFactory}
  */
@@ -52,7 +44,7 @@ public class RequestDispatcher {
     private static final List<PathPattern> PATH_PATTERNS = new CopyOnWriteArrayList<>();
-    private static AtomicBoolean hasInit = new AtomicBoolean(false);
+    private static final AtomicBoolean HAS_INIT = new AtomicBoolean(false);
     @Autowired
     private ApplicationContext applicationContext;
@@ -63,9 +55,9 @@ public class RequestDispatcher {
      * @author miaoguoxin
      * @date 2020/4/15
      */
-    public Message executeMethod(String uri, String paramsJson, ServerWebExchange exchange) {
+    public Message<Object> executeMethod(String uri, String paramsJson, ServerWebExchange exchange) {
         try {
-            if (hasInit.compareAndSet(false, true)) {
+            if (HAS_INIT.compareAndSet(false, true)) {
                 String[] paths = MAPPING_INFO_MAP.keySet().toArray(new String[0]);
                 PATH_PATTERNS.addAll(PathUtils.assemblePath(paths, PATH_PATTERNS));
             }
@@ -75,7 +67,7 @@ public class RequestDispatcher {
             }
             //分发逻辑
             Object resultData = this.beginDispatch(matchUri, paramsJson,exchange);
-            return Message.builder().success(resultData);
+            return Message.success(resultData);
         } catch (Throwable e) {
             return handleException(e);
         }
@@ -83,8 +75,6 @@ public class RequestDispatcher {
     /**
     * 注册mapping信息
-    * @param
-    * @return
     * @author miaoguoxin
     * @date 2020/4/16
     */
@@ -117,7 +107,7 @@ public class RequestDispatcher {
             }
         }
-        DispatchContext dispatchContext = new DispatchContext(
+        DispatchContext<Object> dispatchContext = new DispatchContext<>(
                 exchange.getRequest(),
                 exchange.getResponse(),
                 paramData);
@@ -132,25 +122,18 @@ public class RequestDispatcher {
         }
     }
-    private static Message handleException(Throwable ex) {
+    private static Message<Object> handleException(Throwable ex) {
         if (ex instanceof ResponseStatusException) {
             int statusCode = ((ResponseStatusException) ex).getStatus().value();
             log.error("aggregation dispatch {}:{}", statusCode, ex.getMessage());
-            return Message.builder()
-                    .code(statusCode)
-                    .message(ex.getMessage())
-                    .build();
+            return Message.failure(statusCode,ex.getMessage());
         } else if (ex instanceof GatewayParamNotValidException) {
-            return Message.builder()
-                    .code(SystemCode.ILLEGAL_PARAMS.getCode())
-                    .message(ex.getMessage())
-                    .build();
+            return Message.failure(
+                    ErrorCode.ILLEGAL_PARAMS.getCode(),ex.getMessage());
         } else {
             log.error("aggregation dispatch error:{}", ex);
-            return Message.builder()
-                    .code(SystemCode.SERVER_ERROR.getCode())
-                    .message(SystemCode.SERVER_ERROR.getName())
-                    .build();
+            return Message.failure(
+                    ErrorCode.UNKNOWN_ERROR.getCode(),ErrorCode.UNKNOWN_ERROR.getName());
         }
     }
@@ -2,12 +2,12 @@ spring:
   cloud:
     nacos:
       discovery:
-        username: nacos
-        password: microtest
-        server-addr: apitest.51shiban.com:80/n
-        namespace: c86d8673-4d0a-469f-8bb8-1434c57c236c
+        username: xtrade
+        password: abcd1234
+        server-addr: 10.28.1.79:8848
+        namespace: 35211f71-92a9-4f3e-975e-37b1132e05c8
       config:
-        username: nacos
-        password: microtest
-        server-addr: apitest.51shiban.com:80/n
-        namespace: c86d8673-4d0a-469f-8bb8-1434c57c236c
+        username: xtrade
+        password: abcd1234
+        server-addr: 10.28.1.79:8848
+        namespace: 35211f71-92a9-4f3e-975e-37b1132e05c8
@@ -21,7 +21,5 @@ mybatis:
   mapper-locations: classpath:/mapper/*.xml
   config-location: classpath:/mybatis-config.xml
 xtrade:
-  json:
-    format: false
   gateway-loader: cloud
   aggregation-scan-packages: com.diligrp.xtrade.gateway.application
@@ -6,8 +6,4 @@ import org.springframework.boot.test.context.SpringBootTest;
 @SpringBootTest
 class XtradeGatewayApplicationTests {
-    @Test
-    void contextLoads() {
-    }
-
 }