5.0

sop-gateway/src/main/java/com/gitee/sop/gateway/dao/entity/ApiInfo.java

@@ -1,13 +1,12 @@
 package com.gitee.sop.gateway.dao.entity;
 
-import java.time.LocalDateTime;
-
 import com.gitee.fastmybatis.annotation.Pk;
 import com.gitee.fastmybatis.annotation.PkStrategy;
 import com.gitee.fastmybatis.annotation.Table;
-
 import lombok.Data;
 
+import java.time.LocalDateTime;
+
 
 /**
  * 表名：api_info

sop-gateway/src/main/java/com/gitee/sop/gateway/dao/entity/IsvKeys.java

@@ -1,13 +1,12 @@
 package com.gitee.sop.gateway.dao.entity;
 
-import java.time.LocalDateTime;
-
 import com.gitee.fastmybatis.annotation.Pk;
 import com.gitee.fastmybatis.annotation.PkStrategy;
 import com.gitee.fastmybatis.annotation.Table;
-
 import lombok.Data;
 
+import java.time.LocalDateTime;
+
 
 /**
  * 表名：isv_keys

sop-gateway/src/main/java/com/gitee/sop/gateway/dao/entity/PermGroupPermission.java

@@ -1,13 +1,12 @@
 package com.gitee.sop.gateway.dao.entity;
 
-import java.time.LocalDateTime;
-
 import com.gitee.fastmybatis.annotation.Pk;
 import com.gitee.fastmybatis.annotation.PkStrategy;
 import com.gitee.fastmybatis.annotation.Table;
-
 import lombok.Data;
 
+import java.time.LocalDateTime;
+
 
 /**
  * 表名：perm_group_permission

sop-gateway/src/main/java/com/gitee/sop/gateway/dao/entity/PermIsvGroup.java

@@ -1,13 +1,12 @@
 package com.gitee.sop.gateway.dao.entity;
 
-import java.time.LocalDateTime;
-
 import com.gitee.fastmybatis.annotation.Pk;
 import com.gitee.fastmybatis.annotation.PkStrategy;
 import com.gitee.fastmybatis.annotation.Table;
-
 import lombok.Data;
 
+import java.time.LocalDateTime;
+
 
 /**
  * 表名：perm_isv_group

sop-gateway/src/main/java/com/gitee/sop/gateway/exception/ControllerGlobalExceptionHandler.java

@@ -1,7 +1,7 @@
 package com.gitee.sop.gateway.exception;
 
-import com.gitee.sop.gateway.response.ApiResponse;
 import com.gitee.sop.gateway.message.ErrorEnum;
+import com.gitee.sop.gateway.response.ApiResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.BindException;
 import org.springframework.validation.FieldError;

sop-gateway/src/main/java/com/gitee/sop/gateway/interceptor/internal/ResultRouteInterceptor.java

@@ -1,9 +1,9 @@
 package com.gitee.sop.gateway.interceptor.internal;
 
 import com.gitee.sop.gateway.common.ApiInfoDTO;
-import com.gitee.sop.gateway.request.ApiRequestContext;
 import com.gitee.sop.gateway.interceptor.RouteInterceptor;
 import com.gitee.sop.gateway.interceptor.RouteInterceptorOrders;
+import com.gitee.sop.gateway.request.ApiRequestContext;
 import com.gitee.sop.support.dto.CommonFileData;
 import com.gitee.sop.support.dto.FileData;
 import org.springframework.stereotype.Component;

sop-gateway/src/main/java/com/gitee/sop/gateway/service/dubbo/RefreshServiceImpl.java

@@ -7,8 +7,8 @@ import com.gitee.sop.gateway.service.manager.SecretManager;
 import com.gitee.sop.support.service.RefreshService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboService;
-
 import org.springframework.beans.factory.annotation.Autowired;
+
 import java.util.Collection;
 
 /**

sop-gateway/src/main/java/com/gitee/sop/gateway/service/impl/ResultWrapperImpl.java

@@ -11,8 +11,6 @@ import com.gitee.sop.gateway.service.ResultWrapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.Objects;
-
 /**
  * @author 六如
  */

sop-gateway/src/main/java/com/gitee/sop/gateway/service/impl/RouteServiceImpl.java

@@ -35,7 +35,6 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Comparator;
 import java.util.List;
-import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 

sop-gateway/src/main/java/com/gitee/sop/gateway/service/impl/SerdeImpl.java

@@ -1,7 +1,6 @@
 package com.gitee.sop.gateway.service.impl;
 
 import com.alibaba.fastjson2.JSON;
-import com.alibaba.fastjson2.JSONObject;
 import com.alibaba.fastjson2.JSONWriter;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.gitee.sop.gateway.config.ApiConfig;
@@ -11,7 +10,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 
 import javax.annotation.PostConstruct;
-import java.util.Collections;
 import java.util.Map;
 
 /**
@@ -19,7 +17,7 @@ import java.util.Map;
  */
 public class SerdeImpl implements Serde {
 
-    static JSONWriter.Context WRITE_CONTEXT;
+    static JSONWriter.Context writeContext;
 
     @Autowired
     protected ApiConfig apiConfig;
@@ -29,7 +27,7 @@ public class SerdeImpl implements Serde {
 
     @Override
     public String toJson(Object object) {
-        return JSON.toJSONString(object);
+        return JSON.toJSONString(object, writeContext);
     }
 
     @Override
@@ -48,8 +46,8 @@ public class SerdeImpl implements Serde {
 
     @PostConstruct
     public void init() {
-        WRITE_CONTEXT = new JSONWriter.Context();
-        WRITE_CONTEXT.setDateFormat(dateFormat);
+        writeContext = new JSONWriter.Context();
+        writeContext.setDateFormat(dateFormat);
 
         this.doInit();
     }

sop-gateway/src/main/java/com/gitee/sop/gateway/service/manager/impl/LocalIsvApiPermissionManagerImpl.java

@@ -10,9 +10,9 @@ import com.gitee.sop.gateway.dao.mapper.PermGroupPermissionMapper;
 import com.gitee.sop.gateway.dao.mapper.PermIsvGroupMapper;
 import com.gitee.sop.gateway.service.manager.IsvApiPermissionManager;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;

sop-gateway/src/main/java/com/gitee/sop/gateway/service/manager/impl/LocalIsvManagerImpl.java

@@ -6,9 +6,9 @@ import com.gitee.sop.gateway.service.manager.IsvManager;
 import com.gitee.sop.gateway.service.manager.dto.IsvDTO;
 import com.gitee.sop.gateway.util.CopyUtil;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;

sop-gateway/src/main/java/com/gitee/sop/gateway/service/manager/impl/LocalSecretManagerImpl.java

@@ -4,9 +4,9 @@ import com.gitee.sop.gateway.dao.entity.IsvKeys;
 import com.gitee.sop.gateway.dao.mapper.IsvKeysMapper;
 import com.gitee.sop.gateway.service.manager.SecretManager;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;

sop-gateway/src/main/java/com/gitee/sop/gateway/service/manager/impl/RedisApiManagerImpl.java

@@ -6,12 +6,12 @@ import com.gitee.sop.gateway.dao.entity.ApiInfo;
 import com.gitee.sop.gateway.util.CopyUtil;
 import com.gitee.sop.gateway.util.JsonUtil;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.BoundHashOperations;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.util.ObjectUtils;
 
 import javax.annotation.PostConstruct;
-import org.springframework.beans.factory.annotation.Autowired;
 import java.util.List;
 
 /**

sop-gateway/src/main/java/com/gitee/sop/gateway/service/manager/impl/RedisIsvApiPermissionManagerImpl.java

@@ -7,11 +7,11 @@ import com.gitee.sop.gateway.dao.entity.IsvInfo;
 import com.gitee.sop.gateway.dao.mapper.IsvInfoMapper;
 import com.gitee.sop.gateway.util.JsonUtil;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.BoundHashOperations;
 import org.springframework.data.redis.core.StringRedisTemplate;
 
 import javax.annotation.PostConstruct;
-import org.springframework.beans.factory.annotation.Autowired;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;

sop-gateway/src/main/java/com/gitee/sop/gateway/service/manager/impl/RedisIsvManagerImpl.java

@@ -7,10 +7,10 @@ import com.gitee.sop.gateway.service.manager.dto.IsvDTO;
 import com.gitee.sop.gateway.util.CopyUtil;
 import com.gitee.sop.gateway.util.JsonUtil;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
 
 import javax.annotation.PostConstruct;
-import org.springframework.beans.factory.annotation.Autowired;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;

sop-gateway/src/main/java/com/gitee/sop/gateway/service/manager/impl/RedisSecretManager.java

@@ -4,10 +4,10 @@ import com.gitee.sop.gateway.common.CacheKey;
 import com.gitee.sop.gateway.common.SopConstants;
 import com.gitee.sop.gateway.dao.entity.IsvKeys;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
 
 import javax.annotation.PostConstruct;
-import org.springframework.beans.factory.annotation.Autowired;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;

sop-gateway/src/main/java/com/gitee/sop/gateway/service/validate/AbstractSigner.java

@@ -1,9 +1,9 @@
 package com.gitee.sop.gateway.service.validate;
 
-import com.gitee.sop.gateway.request.ApiRequest;
-import com.gitee.sop.gateway.request.ApiRequestContext;
 import com.gitee.sop.gateway.exception.ApiException;
 import com.gitee.sop.gateway.message.ErrorEnum;
+import com.gitee.sop.gateway.request.ApiRequest;
+import com.gitee.sop.gateway.request.ApiRequestContext;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.common.utils.StringUtils;
 

sop-gateway/src/main/java/com/gitee/sop/gateway/service/validate/ApiValidator.java

@@ -17,6 +17,7 @@ import com.gitee.sop.gateway.service.manager.SecretManager;
 import com.gitee.sop.gateway.service.manager.dto.IsvDTO;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.BooleanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
@@ -24,7 +25,6 @@ import org.springframework.util.unit.DataSize;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.PostConstruct;
-import org.springframework.beans.factory.annotation.Autowired;
 import java.time.Duration;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;