重构配置

pom.xml

@@ -48,11 +48,11 @@
             <version>3.0.0-SNAPSHOT</version>
         </dependency>
 
-<!--        <dependency>-->
-<!--            <groupId>com.fdkankan</groupId>-->
-<!--            <artifactId>4dkankan-utils-mongodb</artifactId>-->
-<!--            <version>2.0.0-SNAPSHOT</version>-->
-<!--        </dependency>-->
+        <dependency>
+            <groupId>com.fdkankan</groupId>
+            <artifactId>4dkankan-utils-mongodb</artifactId>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
 
 
         <dependency>
@@ -155,6 +155,7 @@
     </dependencyManagement>
 
     <build>
+        <finalName>${artifactId}</finalName>
         <plugins>
             <plugin>
                 <groupId>org.springframework.boot</groupId>

src/main/java/com/fdkankan/gateway/config/SaTokenConfigure.java

@@ -5,10 +5,8 @@ import cn.dev33.satoken.reactor.filter.SaReactorFilter;
 import cn.dev33.satoken.router.SaRouter;
 import cn.dev33.satoken.stp.StpLogic;
 import cn.dev33.satoken.stp.StpUtil;
-import cn.dev33.satoken.util.SaResult;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.fdkankan.common.response.ResultData;
 import com.fdkankan.gateway.util.CacheUtil;
 import com.fdkankan.redis.constant.RedisKey;
 import com.fdkankan.redis.util.RedisUtil;

src/main/java/com/fdkankan/gateway/decorator/ResponseDecorator.java

@@ -1,9 +1,8 @@
 package com.fdkankan.gateway.decorator;
 
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import com.fdkankan.common.constant.ServerCode;
-import com.fdkankan.common.response.ResultData;
+import com.fdkankan.gateway.response.ResultData;
 import java.nio.charset.Charset;
 import org.reactivestreams.Publisher;
 import org.springframework.core.io.buffer.DataBuffer;
@@ -12,7 +11,6 @@ import org.springframework.core.io.buffer.DataBufferUtils;
 import org.springframework.core.io.buffer.DefaultDataBufferFactory;
 import org.springframework.http.server.reactive.ServerHttpResponse;
 import org.springframework.http.server.reactive.ServerHttpResponseDecorator;
-import org.springframework.stereotype.Component;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 

src/main/java/com/fdkankan/gateway/filter/AccessLogFilter.java

@@ -4,15 +4,17 @@ import cn.hutool.core.exceptions.ExceptionUtil;
 import cn.hutool.core.net.URLDecoder;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
-import com.fdkankan.common.constant.LoginType;
 import com.fdkankan.common.constant.ServerCode;
-import com.fdkankan.common.response.ResultData;
 import com.fdkankan.gateway.log.GatewayLog;
+import com.fdkankan.gateway.response.ResultData;
 import com.fdkankan.gateway.util.WebUtil;
 import com.yomahub.tlog.context.TLogContext;
-import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.io.IOUtils;
 import org.reactivestreams.Publisher;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.gateway.filter.GatewayFilterChain;
@@ -26,7 +28,6 @@ import org.springframework.core.io.buffer.DataBuffer;
 import org.springframework.core.io.buffer.DataBufferFactory;
 import org.springframework.core.io.buffer.DataBufferUtils;
 import org.springframework.core.io.buffer.DefaultDataBufferFactory;
-import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
@@ -46,12 +47,6 @@ import org.springframework.web.server.ServerWebExchange;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
-import java.nio.charset.StandardCharsets;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
 /**
  * 请求、响应过滤器
  */
@@ -62,9 +57,6 @@ public class AccessLogFilter  implements GlobalFilter, Ordered {
     private final List<HttpMessageReader<?>> messageReaders = HandlerStrategies.withDefaults().messageReaders();
 
     @Autowired
-    private MongoTemplate mongoTemplate;
-
-    @Autowired
     private ServerCodecConfigurer serverCodecConfigurer;
 
     @Override

src/main/java/com/fdkankan/gateway/filter/CommonLogService.java

@@ -5,8 +5,8 @@ import cn.hutool.core.net.URLDecoder;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.fdkankan.common.response.ResultData;
 import com.fdkankan.gateway.log.OperLog;
+import com.fdkankan.gateway.response.ResultData;
 import com.fdkankan.gateway.util.CacheUtil;
 import com.fdkankan.gateway.util.WebUtil;
 import com.fdkankan.redis.util.RedisUtil;
@@ -22,7 +22,6 @@ import org.springframework.core.io.buffer.DataBuffer;
 import org.springframework.core.io.buffer.DataBufferFactory;
 import org.springframework.core.io.buffer.DataBufferUtils;
 import org.springframework.core.io.buffer.DefaultDataBufferFactory;
-import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
@@ -54,9 +53,6 @@ public class CommonLogService {
     @Autowired
     RedisUtil redisUtil;
 
-    @Autowired
-    private MongoTemplate mongoTemplate;
-
     public Mono<Void> filter(ServerWebExchange exchange, GatewayFilterChain chain) {
 
         ServerHttpRequest request = exchange.getRequest();
@@ -212,7 +208,7 @@ public class CommonLogService {
     private void writeAccessLog(OperLog operLog) {
         log.info(JSON.toJSONString(operLog));
         //日志写入mongodb
-        mongoTemplate.insert(operLog, "OperLog");
+//        mongoTemplate.insert(operLog, "OperLog");
     }
 
 

src/main/java/com/fdkankan/gateway/filter/OfficialTokenFilter.java

@@ -5,13 +5,13 @@ import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.constant.LoginType;
-import com.fdkankan.common.constant.ServerCode;
-import com.fdkankan.common.response.ResultData;
 import com.fdkankan.common.util.JwtUtil;
 import com.fdkankan.gateway.config.PermissionConfig;
+import com.fdkankan.gateway.response.ResultData;
 import com.fdkankan.redis.constant.RedisKey;
 import com.fdkankan.redis.util.RedisUtil;
 import io.jsonwebtoken.Claims;
+import java.util.List;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -27,11 +27,6 @@ import org.springframework.stereotype.Component;
 import org.springframework.web.server.ServerWebExchange;
 import reactor.core.publisher.Mono;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 
 @Slf4j
 @Component

src/main/java/com/fdkankan/gateway/response/ResultData.java

@@ -0,0 +1,68 @@
+package com.fdkankan.gateway.response;
+
+import com.fdkankan.common.constant.ErrorCode;
+import com.fdkankan.common.constant.ServerCode;
+import java.io.Serializable;
+import java.util.Calendar;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class ResultData<T> implements Serializable {
+    /**
+     * 状态码
+     */
+    private int code;
+    /**
+     * 响应信息
+     */
+    private String message;
+    /**
+     * 后端返回结果
+     */
+    private T data;
+    /**
+     * 后端返回结果
+     */
+    private Boolean success;
+    /**
+     * 响应时间戳
+     */
+    private long timestamp = Calendar.getInstance().getTimeInMillis();
+
+    public static ResultData ok() {
+        return ok(null);
+    }
+    public static ResultData ok(Object data) {
+        return ok("成功", data);
+    }
+    public static ResultData ok(String msg, Object data) {
+        return base(ServerCode.SUCCESS.code(), msg, data,true);
+    }
+
+    public static ResultData error(int code, String msg) {
+        return error(code, msg, null); }
+    public static ResultData error(int code, String msg, Object data) {
+        return base(code, msg, data,false);
+    }
+    public static ResultData error(ErrorCode errorCode, Object data) {
+        return base(errorCode.code(), errorCode.message(), data,false);
+    }
+
+    public static ResultData error(ErrorCode errorCode) {
+        return error(errorCode.code(), errorCode.message());
+    }
+
+    private static ResultData  base(int code, String msg, Object data,Boolean success) {
+        ResultData rd = new ResultData();
+        rd.setCode(code);
+        rd.setMessage(msg);
+        rd.setData(data);
+        rd.setSuccess(success);
+        return rd;
+    }
+
+}