一些错误修改

miaoguoxin
1 parent e46dab0f
Showing 10 changed files with 17 additions and 31 deletions
gateway-business/src/main/java/com/diligrp/xtrade/business/XtradeGatewayApplication.java
gateway-core/src/main/java/com/diligrp/xtrade/core/common/utils/ResponseUtils.java
gateway-core/src/main/java/com/diligrp/xtrade/core/filters/global/AuthGlobalFilter.java
gateway-core/src/main/java/com/diligrp/xtrade/core/filters/global/CacheRequestBodyGlobalFilter.java
gateway-core/src/main/java/com/diligrp/xtrade/core/filters/web/FacadeWebFilter.java
gateway-core/src/main/java/com/diligrp/xtrade/core/repository/entity/GatewayConfig.java
gateway-core/src/main/java/com/diligrp/xtrade/core/support/dispatch/MappingRegister.java
gateway-core/src/main/java/com/diligrp/xtrade/core/support/dispatch/RequestDispatcher.java
gateway-core/src/main/resources/mapper/AttrConfigDao.xml
gateway-core/src/main/resources/mapper/RouteDao.xml
 package com.diligrp.xtrade.business;
-import io.netty.util.ResourceLeakDetector;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -18,7 +18,7 @@ public class ResponseUtils {
     public static Mono<Void> writeForbidden(ServerHttpResponse response){
-        Message<Object> message = Message.builder().failure(
+        Message message = Message.failure(
                 HttpStatus.FORBIDDEN.value(),HttpStatus.FORBIDDEN.toString());
         return writeResponse(response,message);
     }
@@ -36,22 +36,20 @@ public class AuthGlobalFilter implements GlobalFilter, Ordered {
         //排除在外的Uri跳过权限
         if (apiManager.isExcludePathMatch(originalUri)) {
             return chain.filter(exchange);
-           // throw new RuntimeException("异常测试");
         }
         exchange.getAttributes().put(ServerWebExchangeUtils.ORIGINAL_RESPONSE_CONTENT_TYPE_ATTR, MediaType.APPLICATION_JSON_VALUE);
         return ResponseUtils.writeForbidden(response);
     }
+    @Override
+    public int getOrder() {
+        return GatewayConst.AUTH_FILTER_ORDER;
+    }
+
     private static String getOriginalUri(ServerWebExchange exchange) {
         LinkedHashSet<URI> uris = exchange.getAttribute(ServerWebExchangeUtils.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 GatewayConst.AUTH_FILTER_ORDER;
-    }
-
 }
 package com.diligrp.xtrade.core.filters.global;
 import com.diligrp.xtrade.core.common.constant.GatewayConst;
+import com.diligrp.xtrade.shared.util.JsonUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.cloud.gateway.filter.GatewayFilterChain;
 import org.springframework.cloud.gateway.filter.GlobalFilter;
@@ -40,7 +41,7 @@ public class CacheRequestBodyGlobalFilter implements GlobalFilter, Ordered {
     @Override
     public Mono<Void> filter(ServerWebExchange exchange, GatewayFilterChain chain) {
         String contentType = exchange.getRequest().getHeaders().getFirst(HttpHeaders.CONTENT_TYPE);
-        if (StringUtils.isNotBlank(contentType) && contentType.startsWith("multipart")) {
+        if (StringUtils.isNotBlank(contentType) && contentType.contains("multipart")) {
             return chain.filter(exchange);
         }
         ServerRequest serverRequest = ServerRequest.create(exchange,
@@ -63,29 +63,29 @@ public class FacadeWebFilter implements WebFilter {
     }
-    private static Message<Object> handleException(Throwable ex) {
+    private static Message handleException(Throwable ex) {
         if (ex instanceof GatewayDispatchException) {
             GatewayDispatchException dispatchEx = (GatewayDispatchException) ex;
             if (dispatchEx.getCause() != null) {
                 return handleException(dispatchEx.getCause());
             } else {
-                return Message.builder().failure(
+                return Message.failure(
                         ErrorCode.UNKNOWN_ERROR.getCode(), ErrorCode.UNKNOWN_ERROR.getName());
             }
         } else if (ex instanceof ResponseStatusException) {
             ResponseStatusException statusException = (ResponseStatusException) ex;
             log.warn("response status error:{}", statusException.getMessage());
-            return Message.builder().failure(statusException.getStatus().value(), ex.getMessage());
+            return Message.failure(statusException.getStatus().value(), ex.getMessage());
         } else if (ex instanceof GatewayParamNotValidException) {
-            return Message.builder().failure(
+            return Message.failure(
                     ErrorCode.ILLEGAL_PARAMS.getCode(), ex.getMessage());
         } else if (ex instanceof TimeoutException){
             log.error("api处理超时:", ex);
-            return Message.builder().failure(
+            return Message.failure(
                     ErrorCode.UNKNOWN_ERROR.getCode(), "请求超时");
         } else {
             log.error("unknown error:", ex);
-            return Message.builder().failure(
+            return Message.failure(
                     ErrorCode.UNKNOWN_ERROR.getCode(), ErrorCode.UNKNOWN_ERROR.getName());
         }
     }
@@ -37,16 +37,6 @@ public class GatewayConfig extends BaseDo {
         this.url = url;
     }
-    @Override
-    public Integer getIsDel() {
-        return isDel;
-    }
-
-    @Override
-    public void setIsDel(Integer isDel) {
-        this.isDel = isDel;
-    }
-
     public String getDescription() {
         return description;
     }
@@ -50,7 +50,6 @@ public class MappingRegister implements ApplicationListener&lt;ContextRefreshedEven
                     .addScanners(new MethodAnnotationsScanner())
                     .addScanners(new FieldAnnotationsScanner()));
             try {
-
                 Set<Method> methodMappings = reflections.getMethodsAnnotatedWith(DispatchMapping.class);
                 for (Method method : methodMappings) {
                     //只扫描参数为DispatchContext的方法
@@ -68,7 +68,7 @@ public class RequestDispatcher {
             }
             //分发逻辑
             Object resultData = this.beginDispatch(matchUri, paramsJson, exchange);
-            return Message.builder().success(resultData);
+            return Message.success(resultData);
         } catch (Throwable e) {
             throw new GatewayDispatchException("dispatch method error", e);
         }
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.diligrp.xtrade.gateway.repository.dao.AttrConfigDao">
+<mapper namespace="com.diligrp.xtrade.core.repository.dao.AttrConfigDao">
     <resultMap id="Base_Result_Map" type="com.diligrp.xtrade.core.repository.entity.GatewayAttrConfig">
         <id property="id" column="id"/>
         <result property="serviceId" column="service_id"/>
@@ -9,7 +9,6 @@
         <result property="attrArgs" column="attr_args"/>
         <result property="description" column="description"/>
         <result property="sortOrder" column="sort_order"/>
-        <result property="isDel" column="is_del"/>
         <result property="modifiedTime" column="modified_time"/>
         <result property="createdTime" column="created_time"/>
     </resultMap>
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.diligrp.xtrade.gateway.repository.dao.RouteDao">
+<mapper namespace="com.diligrp.xtrade.core.repository.dao.RouteDao">
     <resultMap id="Base_Result_Map" type="com.diligrp.xtrade.core.repository.entity.GatewayConfig">
         <id property="id" column="id"/>
         <result property="url" column="url"/>