modifiedBody = serverRequest.bodyToMono(String.class).flatMap(body -> {
@@ -90,6 +96,7 @@ public class RequestEncryptionGlobalFilter implements GlobalFilter, Ordered {
paramMap.put(entry.getKey(), entry.getValue());
}
checkSign(sign, dateTimestamp, requestId, paramMap);
+ log.debug("3. 修改请求体:"+encrypt);
return Mono.just(encrypt);
});
@@ -101,13 +108,8 @@ public class RequestEncryptionGlobalFilter implements GlobalFilter, Ordered {
headers.remove(HttpHeaders.CONTENT_LENGTH);
//创建CachedBodyOutputMessage并且把请求param加入,初始化校验信息
MyCachedBodyOutputMessage outputMessage = new MyCachedBodyOutputMessage(exchange, headers);
-
outputMessage.initial(paramMap, requestId, sign, dateTimestamp);
- //修改响应体
- MyCachedBodyOutputMessage repOutputMessage = new MyCachedBodyOutputMessage(exchange, headers);
- repOutputMessage.getBody();
-
return bodyInserter.insert(outputMessage, new BodyInserterContext()).then(Mono.defer(() -> {
ServerHttpRequestDecorator decorator = new ServerHttpRequestDecorator(exchange.getRequest()) {
@@ -118,7 +120,9 @@ public class RequestEncryptionGlobalFilter implements GlobalFilter, Ordered {
//验证签名
checkSign(outputMessage.getSign(), outputMessage.getDateTimestamp(), outputMessage.getRequestId(), outputMessage.getParamMap());
}
+ log.debug("4. 完成");
return outputMessage.getBody();
+
}
};
diff --git a/gateway/src/main/java/com/demo/gateway/filter/ResponseEncryptionGlobalFilter.java b/gateway/src/main/java/com/demo/gateway/filter/ResponseEncryptionGlobalFilter.java
index d5b3eae..b370342 100644
--- a/gateway/src/main/java/com/demo/gateway/filter/ResponseEncryptionGlobalFilter.java
+++ b/gateway/src/main/java/com/demo/gateway/filter/ResponseEncryptionGlobalFilter.java
@@ -1,9 +1,11 @@
package com.demo.gateway.filter;
+import com.demo.gateway.annotations.LoggableGlobalFilter;
import com.demo.gateway.utils.AESUtil;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
-import lombok.extern.slf4j.Slf4j;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.reactivestreams.Publisher;
import org.springframework.cloud.gateway.filter.GatewayFilterChain;
import org.springframework.cloud.gateway.filter.GlobalFilter;
@@ -11,6 +13,7 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.core.Ordered;
import org.springframework.core.io.buffer.DataBuffer;
import org.springframework.core.io.buffer.DataBufferUtils;
+import org.springframework.http.HttpHeaders;
import org.springframework.http.server.reactive.ServerHttpResponseDecorator;
import org.springframework.stereotype.Component;
import org.springframework.web.server.ServerWebExchange;
@@ -27,11 +30,12 @@ import java.nio.charset.StandardCharsets;
* @see ServerHttpResponseDecorator
* @since 0.0.1
*/
-@Slf4j
+
@Configuration
@Component
public class ResponseEncryptionGlobalFilter implements GlobalFilter, Ordered {
- private static final String AES_SECURTY = "MTIzNDU2Nzg5MTIzNDU2Nw=="; //1234567891234567
+ private static final String AES_SECURTY = "MTIzNDU2Nzg5MTIzNDU2Nw==";//1234567891234567
+ private static final Logger log = LogManager.getLogger();
/**
* 加密 过滤器 优先级
*
@@ -77,7 +81,8 @@ public class ResponseEncryptionGlobalFilter implements GlobalFilter, Ordered {
}
log.debug("加密后 body：{}", new String(encryption, StandardCharsets.UTF_8));
-
+ HttpHeaders headers = getDelegate().getHeaders();
+ headers.setContentLength(encryption.length);
return exchange.getResponse().bufferFactory().wrap(encryption);
})
);
diff --git a/gateway/src/main/java/com/demo/gateway/test.java b/gateway/src/main/java/com/demo/gateway/test.java
index 3636f04..1dbdcf5 100644
--- a/gateway/src/main/java/com/demo/gateway/test.java
+++ b/gateway/src/main/java/com/demo/gateway/test.java
@@ -4,7 +4,7 @@ import com.demo.gateway.utils.AESUtil;
public class test {
public static void main(String[] args) {
- String str = "0uMDI+g2bagWZ6+wlwBGQYjPFu1pJ8oA39/HzrpZT7kX2qT0VPUYlrieNNqEtcWTUWyz3Xn8aIlE8IqyB/AJP+Z4PZunY7NXOdscNam/u8Gmpfzxj8VupNaKw05pXPkNcUGEjVRIUJqmGUEUMJyixuInQkuSqs6InJG9ry4gJE/Iw8AyJwexuD5njeVqAwvwzaocFftGQOzSD0GFzyEyoTNgb0R10wkdt166+qv5XtozWrJ2/BQGk4rkW3zakbqf";
+ String str = "CvCb2zEd9u1VL0zEfulTyppeV0QmnjSwFLjZHEsXdzYdYcXuEo+p3ayKLUwt1mN+";
//String encrypt = AESUtil.encrypt(str, "MTIzNDU2Nzg5MTIzNDU2Nw==");
String decrypt = AESUtil.decrypt(str, "MTIzNDU2Nzg5MTIzNDU2Nw==");
System.out.println(decrypt);
diff --git a/gateway/src/main/resources/application.yml b/gateway/src/main/resources/application.yml
index 1038607..496ea8b 100644
--- a/gateway/src/main/resources/application.yml
+++ b/gateway/src/main/resources/application.yml
@@ -20,4 +20,19 @@ spring:
# - RewritePath=/api/(?.*),/$\{segment}
redis:
port: 6379
- host: ${REDIS_HOST:localhost}
\ No newline at end of file
+ host: ${REDIS_HOST:localhost}
+
+
+rootLogger:
+ level: DEBUG
+ appenders:
+ - console
+
+# 配置控制台输出
+appenders:
+ - type: console
+ name: CONSOLE
+ target: System.out
+ layout:
+ type: pattern
+ pattern: "%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n"
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 28be28b..9506a77 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,9 +10,11 @@
1.0-SNAPSHOT
gateway
- common
- user
library
+
+
+
+
diff --git a/user/pom.xml b/user.1/pom.xml
similarity index 100%
rename from user/pom.xml
rename to user.1/pom.xml
diff --git a/user/src/main/java/com/demo/user/UserApplication.java b/user.1/src/main/java/com/demo/user/UserApplication.java
similarity index 100%
rename from user/src/main/java/com/demo/user/UserApplication.java
rename to user.1/src/main/java/com/demo/user/UserApplication.java
diff --git a/user/src/main/java/com/demo/user/controller/UserController.java b/user.1/src/main/java/com/demo/user/controller/UserController.java
similarity index 100%
rename from user/src/main/java/com/demo/user/controller/UserController.java
rename to user.1/src/main/java/com/demo/user/controller/UserController.java
diff --git a/user/src/main/java/com/demo/user/form/UserForm.java b/user.1/src/main/java/com/demo/user/form/UserForm.java
similarity index 100%
rename from user/src/main/java/com/demo/user/form/UserForm.java
rename to user.1/src/main/java/com/demo/user/form/UserForm.java
diff --git a/user/src/main/java/com/demo/user/service/UserService.java b/user.1/src/main/java/com/demo/user/service/UserService.java
similarity index 100%
rename from user/src/main/java/com/demo/user/service/UserService.java
rename to user.1/src/main/java/com/demo/user/service/UserService.java
diff --git a/user/src/main/resources/application.yml b/user.1/src/main/resources/application.yml
similarity index 100%
rename from user/src/main/resources/application.yml
rename to user.1/src/main/resources/application.yml
diff --git a/user/src/test/java/com/rosh/RsaTest.java b/user.1/src/test/java/com/rosh/RsaTest.java
similarity index 100%
rename from user/src/test/java/com/rosh/RsaTest.java
rename to user.1/src/test/java/com/rosh/RsaTest.java