代码格式化

miaoguoxin
1 parent 8ef7b71d
Showing 24 changed files with 75 additions and 83 deletions
gateway-core/src/main/java/com/diligrp/xtrade/core/api/ApiManager.java
gateway-core/src/main/java/com/diligrp/xtrade/core/common/annotation/DispatchMapping.java
gateway-core/src/main/java/com/diligrp/xtrade/core/common/constant/GatewayAttrType.java
gateway-core/src/main/java/com/diligrp/xtrade/core/common/utils/HttpUtils.java
gateway-core/src/main/java/com/diligrp/xtrade/core/common/utils/PathUtils.java
gateway-core/src/main/java/com/diligrp/xtrade/core/common/utils/ResponseUtils.java
gateway-core/src/main/java/com/diligrp/xtrade/core/common/utils/ValidateUtils.java
gateway-core/src/main/java/com/diligrp/xtrade/core/config/GatewayResourceLoaderConfiguration.java
gateway-core/src/main/java/com/diligrp/xtrade/core/config/property/AuthPathProperties.java
gateway-core/src/main/java/com/diligrp/xtrade/core/filters/global/CacheRequestBodyGlobalFilter.java
gateway-core/src/main/java/com/diligrp/xtrade/core/filters/global/ResponseReadBodyGlobalFilter.java
gateway-core/src/main/java/com/diligrp/xtrade/core/filters/web/FacadeWebFilter.java
gateway-core/src/main/java/com/diligrp/xtrade/core/predicates/ReadBodyRoutePredicateFactory.java
gateway-core/src/main/java/com/diligrp/xtrade/core/repository/GatewayRepository.java
gateway-core/src/main/java/com/diligrp/xtrade/core/repository/IGatewayRepository.java
gateway-core/src/main/java/com/diligrp/xtrade/core/repository/dao/ApiMetricsDao.java
gateway-core/src/main/java/com/diligrp/xtrade/core/repository/entity/GatewayAttrConfig.java
gateway-core/src/main/java/com/diligrp/xtrade/core/route/impl/CloudRouteResourceLoader.java
gateway-core/src/main/java/com/diligrp/xtrade/core/route/impl/MysqlRouteResourceLoader.java
gateway-core/src/main/java/com/diligrp/xtrade/core/support/ApiMetricsCollector.java
@@ -3,11 +3,8 @@ package com.diligrp.xtrade.core.api;
 import com.diligrp.xtrade.core.common.utils.PathUtils;
 import com.diligrp.xtrade.core.config.property.AuthPathProperties;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.server.PathContainer;
 import org.springframework.stereotype.Component;
  
-import java.util.Optional;
-
 /**
  * @Auther: miaoguoxin
  * @Date: 2019/3/26 0026 15:37
@@ -16,11 +16,11 @@ import java.lang.annotation.Target;
 @Documented
 public @interface DispatchMapping {
     /**
-    * 映射路径
-    * @param
-    * @return
-    * @author miaoguoxin
-    * @date 2020/4/15
-    */
+     * 映射路径
+     * @param
+     * @return
+     * @author miaoguoxin
+     * @date 2020/4/15
+     */
     String value() default "";
 }
@@ -10,8 +10,8 @@ import java.util.Arrays;
  * @Description: 网关属性类型（类型含义需参见spring cloud gateway官方文档）
  */
 public enum GatewayAttrType implements IEnumType {
-    PREDICATE(1,"断言配置"),
-    FILTER(2,"过滤器"),
+    PREDICATE(1, "断言配置"),
+    FILTER(2, "过滤器"),
     ;
     /**
      * 编码
@@ -23,7 +23,7 @@ public enum GatewayAttrType implements IEnumType {
  
     GatewayAttrType(int value, String desc) {
         this.value = value;
-        this.desc=desc;
+        this.desc = desc;
     }
  
     public int getValue() {
@@ -3,8 +3,6 @@ package com.diligrp.xtrade.core.common.utils;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.server.reactive.ServerHttpRequest;
  
-import javax.servlet.http.HttpServletRequest;
-
 /**
  * @Auther: miaoguoxin
  * @Date: 2020/4/24 10:23
@@ -14,7 +12,7 @@ public class HttpUtils {
      * @Description: 获取客户端IP地址
      */
     public static String getIpAddr(ServerHttpRequest request) {
-        if (request==null){
+        if (request == null) {
             return "127.0.0.1";
         }
         HttpHeaders headers = request.getHeaders();
 package com.diligrp.xtrade.core.common.utils;
  
 import org.springframework.http.server.PathContainer;
-import org.springframework.util.CollectionUtils;
 import org.springframework.web.util.pattern.PathPattern;
 import org.springframework.web.util.pattern.PathPatternParser;
  
@@ -14,15 +13,15 @@ import java.util.concurrent.CopyOnWriteArrayList;
  * @Date: 2020/4/15 10:37
  */
 public class PathUtils {
-    private  static final PathPatternParser PATH_PATTERN_PARSER = new PathPatternParser();
+    private static final PathPatternParser PATH_PATTERN_PARSER = new PathPatternParser();
  
     /**
-    * 多个路径拼接成一个标准uri，ex: /test + gateway = /test/gateway
-    * @author miaoguoxin
-    * @date 2020/4/15
-    */
-    public static String concatUri(String... paths){
-        if (paths==null || paths.length ==0){
+     * 多个路径拼接成一个标准uri，ex: /test + gateway = /test/gateway
+     * @author miaoguoxin
+     * @date 2020/4/15
+     */
+    public static String concatUri(String... paths) {
+        if (paths == null || paths.length == 0) {
             return "";
         }
         StringBuilder sb = new StringBuilder();
@@ -30,17 +29,17 @@ public class PathUtils {
             sb.append("/").append(path).append("/");
         }
         String s = removeExtraSlashOfUrl(sb.toString());
-        if (s.endsWith("/")){
-           s= s.substring(0,s.length()-1);
+        if (s.endsWith("/")) {
+            s = s.substring(0, s.length() - 1);
         }
         return s;
     }
  
     /**
-    * 去除多余的斜杠
-    * @author miaoguoxin
-    * @date 2020/4/15
-    */
+     * 去除多余的斜杠
+     * @author miaoguoxin
+     * @date 2020/4/15
+     */
     public static String removeExtraSlashOfUrl(String url) {
         if (url == null || url.length() == 0) {
             return url;
@@ -49,11 +48,11 @@ public class PathUtils {
     }
  
     /**
-    * 判断uri是否匹配
-    * @author miaoguoxin
-    * @date 2020/4/15
-    */
-    public static boolean isUriMatch(String path, List<PathPattern> pathPatterns){
+     * 判断uri是否匹配
+     * @author miaoguoxin
+     * @date 2020/4/15
+     */
+    public static boolean isUriMatch(String path, List<PathPattern> pathPatterns) {
         PathContainer pathContainer = PathContainer.parsePath(path);
         return Optional.ofNullable(pathPatterns)
                 .map(patterns -> patterns
@@ -80,15 +79,15 @@ public class PathUtils {
     }
  
     /**
-    * 转换路径格式
-    * @author miaoguoxin
-    * @date 2020/4/15
-    */
-    public static List<PathPattern> assemblePath(String[] paths,List<PathPattern> pathPatterns){
-        if (paths == null || paths.length == 0){
+     * 转换路径格式
+     * @author miaoguoxin
+     * @date 2020/4/15
+     */
+    public static List<PathPattern> assemblePath(String[] paths, List<PathPattern> pathPatterns) {
+        if (paths == null || paths.length == 0) {
             return null;
         }
-        if (pathPatterns == null){
+        if (pathPatterns == null) {
             pathPatterns = new CopyOnWriteArrayList<>();
         }
         for (String path : paths) {
@@ -17,13 +17,13 @@ import java.nio.charset.StandardCharsets;
 public class ResponseUtils {
  
  
-    public static Mono<Void> writeForbidden(ServerHttpResponse response){
+    public static Mono<Void> writeForbidden(ServerHttpResponse response) {
         Message<?> message = Message.failure(
-                HttpStatus.FORBIDDEN.value(),HttpStatus.FORBIDDEN.toString());
-        return writeResponse(response,message);
+                HttpStatus.FORBIDDEN.value(), HttpStatus.FORBIDDEN.toString());
+        return writeResponse(response, message);
     }
  
-    public static Mono<Void> writeResponse(ServerHttpResponse response,Message<?> message){
+    public static Mono<Void> writeResponse(ServerHttpResponse response, Message<?> message) {
         String respJson = JsonUtils.toJsonString(message);
         response.getHeaders().setContentLength(
                 respJson.getBytes(StandardCharsets.UTF_8).length);
@@ -22,11 +22,11 @@ public class ValidateUtils {
  
  
     @Autowired
-    public void setValidator(Validator validator){
+    public void setValidator(Validator validator) {
         ValidateUtils.validator = validator;
     }
  
-    public static void validate(Object params){
+    public static void validate(Object params) {
         validate(params, new Class[]{});
     }
  
@@ -26,7 +26,7 @@ import java.util.Properties;
 public class GatewayResourceLoaderConfiguration {
  
     @Bean
-    public ConfigService configService(Environment environment,NacosConfigProperties configProperties){
+    public ConfigService configService(Environment environment, NacosConfigProperties configProperties) {
         String username = environment.getProperty("spring.cloud.nacos.config.username");
         String password = environment.getProperty("spring.cloud.nacos.config.password");
         Properties properties = new Properties();
@@ -46,15 +46,15 @@ public class GatewayResourceLoaderConfiguration {
     }
  
     @Bean(name = "cloudRouteResourceLoader")
-    @ConditionalOnProperty(prefix = "xtrade",name = "gateway-loader",havingValue = "cloud",matchIfMissing = true)
-    public DynamicRouteLoaderIntf cloudRouteResourceLoader(){
+    @ConditionalOnProperty(prefix = "xtrade", name = "gateway-loader", havingValue = "cloud", matchIfMissing = true)
+    public DynamicRouteLoaderIntf cloudRouteResourceLoader() {
         return new CloudRouteResourceLoader();
     }
  
  
     @Bean(name = "mysqlRouteResourceLoader")
-    @ConditionalOnProperty(prefix = "xtrade",name = "gateway-loader",havingValue = "mysql")
-    public DynamicRouteLoaderIntf mysqlRouteResourceLoader(){
+    @ConditionalOnProperty(prefix = "xtrade", name = "gateway-loader", havingValue = "mysql")
+    public DynamicRouteLoaderIntf mysqlRouteResourceLoader() {
         return new MysqlRouteResourceLoader();
     }
  
@@ -22,10 +22,10 @@ public class AuthPathProperties {
  
  
     /**
-    * 属性配置刷新的时候会从这里进入（不要直接注释掉属性配置，否则无法触发）
-    * @author miaoguoxin
-    * @date 2020/4/13
-    */
+     * 属性配置刷新的时候会从这里进入（不要直接注释掉属性配置，否则无法触发）
+     * @author miaoguoxin
+     * @date 2020/4/13
+     */
     public void setExcludePaths(String[] excludePaths) {
         this.excludePaths = excludePaths;
         if (!CollectionUtils.isEmpty(this.excludePathPatterns)) {
 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;
@@ -74,7 +74,7 @@ public class ResponseReadBodyGlobalFilter implements GlobalFilter, Ordered {
             ClientResponse clientResponse = this.prepareClientResponse(exchange.getResponse().getStatusCode(), body, httpHeaders);
             Mono<String> bodyMono = clientResponse.bodyToMono(String.class);
             return bodyMono.flatMap(respBody -> {
-                exchange.getAttributes().putIfAbsent(GatewayConst.CACHED_RESPONSE_BODY_STR_ATTR,respBody);
+                exchange.getAttributes().putIfAbsent(GatewayConst.CACHED_RESPONSE_BODY_STR_ATTR, respBody);
                 HttpHeaders headers = resp.getHeaders();
                 //特别声明：响应体改变必须设置contentLength，且长度要保持一致，(经过测试，如果过短则会截断，过长则会导致超时。）
                 headers.setContentLength(respBody.getBytes(StandardCharsets.UTF_8).length);
@@ -127,7 +127,6 @@ public class ResponseReadBodyGlobalFilter implements GlobalFilter, Ordered {
  
         /**
          * 默认body拦截处理器
-         *
          */
         private BodyHandlerServerHttpResponseDecorator.BodyHandlerFunction initDefaultBodyHandler() {
             return ReactiveHttpOutputMessage::writeWith;
@@ -79,7 +79,7 @@ public class FacadeWebFilter implements WebFilter {
         } else if (ex instanceof GatewayParamNotValidException) {
             return Message.failure(
                     ErrorCode.ILLEGAL_PARAMS.getCode(), ex.getMessage());
-        } else if (ex instanceof TimeoutException){
+        } else if (ex instanceof TimeoutException) {
             log.error("api处理超时:", ex);
             return Message.failure(
                     ErrorCode.UNKNOWN_ERROR.getCode(), "请求超时");
@@ -19,7 +19,6 @@ import java.util.List;
 import java.util.function.Predicate;
  
  
-
 /**
  * @Auther: miaoguoxin
  * @Date: 2019/3/25 0025 10:47
@@ -48,7 +47,7 @@ public class ReadBodyRoutePredicateFactory extends AbstractRoutePredicateFactory
         return exchange -> {
             ServerHttpRequest request = exchange.getRequest();
             HttpHeaders headers = request.getHeaders();
-            log.info("请求headers:{}",headers);
+            log.info("请求headers:{}", headers);
             String rawPath = request.getURI().getRawPath();
             //兼容没有content-type的情况
             String contentTypeStr = headers.getFirst("Content-Type");
@@ -60,7 +59,7 @@ public class ReadBodyRoutePredicateFactory extends AbstractRoutePredicateFactory
             if (contentTypeStr.startsWith("multipart/form-data")) {
                 return Mono.just(Boolean.TRUE);
             }
-           // String cachedBody = exchange.getAttribute(CACHE_REQUEST_BODY_OBJECT_KEY);
+            // String cachedBody = exchange.getAttribute(CACHE_REQUEST_BODY_OBJECT_KEY);
 //            BodyInserter bodyInserter = BodyInserters.fromPublisher(modifiedBody, String.class);
 //            //因为请求体可能是null，这里自定义个缓存输出
 //            CustomCacheBodyOutputMessage outputMessage = new CustomCacheBodyOutputMessage(exchange, headers);
@@ -20,7 +20,6 @@ import org.springframework.cloud.gateway.route.RouteDefinition;
 import org.springframework.stereotype.Repository;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.util.UriComponentsBuilder;
-import reactor.core.publisher.Mono;
  
 import java.lang.reflect.InvocationTargetException;
 import java.net.URI;
@@ -11,12 +11,12 @@ import java.util.List;
  */
 public interface IGatewayRepository {
     /**
-    * 获取所有路由资源配置
-    * @param
-    * @return
-    * @author miaoguoxin
-    * @date 2020/4/10
-    */
+     * 获取所有路由资源配置
+     * @param
+     * @return
+     * @author miaoguoxin
+     * @date 2020/4/10
+     */
     List<RouteDefinition> getAll();
  
     void addApiMetrics(List<ApiMetricsInfo> apiMetricsInfos);
 package com.diligrp.xtrade.core.repository.dao;
  
 import com.diligrp.xtrade.core.repository.entity.ApiMetricsInfoEntity;
-import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
  
 /**
@@ -8,7 +8,7 @@ import com.diligrp.xtrade.shared.domain.BaseDo;
  * @Date: 2018/12/12 0012 17:43
  * @Description: 网关断言和过滤器配置实体
  */
-public class GatewayAttrConfig extends BaseDo{
+public class GatewayAttrConfig extends BaseDo {
     /**服务id名称*/
     private String serviceId;
     /**类型 {@link GatewayAttrType}*/
@@ -107,7 +107,7 @@ public class CloudRouteResourceLoader implements DynamicRouteLoaderIntf {
  
  
     private void notifyRefreshRoutes() {
-        synchronized (CloudRouteResourceLoader.this){
+        synchronized (CloudRouteResourceLoader.this) {
             if (gatewayPropertiesHash == gatewayProperties.getRoutes().hashCode()) {
                 return;
             }
@@ -41,7 +41,7 @@ public class MysqlRouteResourceLoader implements DynamicRouteLoaderIntf {
     }
  
     @Override
-    public void refreshApis(){
+    public void refreshApis() {
  
     }
  
@@ -2,7 +2,6 @@ package com.diligrp.xtrade.core.support;
  
 import com.diligrp.xtrade.core.config.property.ApiMetricsProperties;
 import com.diligrp.xtrade.core.repository.IGatewayRepository;
-import com.diligrp.xtrade.shared.util.JsonUtils;
 import com.google.common.collect.Queues;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -16,8 +15,6 @@ import java.util.Timer;
 import java.util.TimerTask;
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
  
 /**
@@ -11,15 +11,15 @@ public class ReactiveExchangeContextHolder {
     /**让该变量可以在父子线程间传递*/
     private static final ThreadLocal<ServerWebExchange> REQUEST_THREAD_LOCAL = new InheritableThreadLocal<>();
  
-    public static void put(ServerWebExchange exchange){
+    public static void put(ServerWebExchange exchange) {
         REQUEST_THREAD_LOCAL.set(exchange);
     }
  
-    public static ServerWebExchange get(){
+    public static ServerWebExchange get() {
         return REQUEST_THREAD_LOCAL.get();
     }
  
-    public static void remove(){
+    public static void remove() {
         REQUEST_THREAD_LOCAL.remove();
     }
 }
@@ -19,8 +19,8 @@ public class ReactiveWebContextBeanProcessor implements BeanFactoryPostProcessor
  
     @Override
     public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException {
-        beanFactory.registerResolvableDependency(ServerHttpRequest.class,new ReactiveRequestObjectFactory());
-        beanFactory.registerResolvableDependency(ServerHttpResponse.class,new ReactiveResponseObjectFactory());
+        beanFactory.registerResolvableDependency(ServerHttpRequest.class, new ReactiveRequestObjectFactory());
+        beanFactory.registerResolvableDependency(ServerHttpResponse.class, new ReactiveResponseObjectFactory());
     }
  
     private static class ReactiveRequestObjectFactory implements ObjectFactory<ServerHttpRequest>, Serializable {
@@ -17,7 +17,6 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationListener;
 import org.springframework.context.event.ContextRefreshedEvent;
-import org.springframework.lang.NonNullApi;
 import org.springframework.stereotype.Component;
 import org.springframework.validation.annotation.Validated;
  
+/**
+ * @Auther: miaoguoxin
+ * @Date: 2018/12/8 12:47
+ * @Description:类名一定要为filterName + GatewayFilterFactory，如定义为JwtCheckGatewayFilterFactory的话，它的filterName就是JwtCheck
+ */
+package com.diligrp.xtrade.core.support.dispatch;