diff --git a/fizz-bootstrap/pom.xml b/fizz-bootstrap/pom.xml
index 59c1ae8..359b676 100644
--- a/fizz-bootstrap/pom.xml
+++ b/fizz-bootstrap/pom.xml
@@ -85,18 +85,6 @@
io.netty
netty-tcnative-classes
${netty-tcnative.version}
-
-
-
- org.apache.logging.log4j
- log4j-layout-template-json
- ${log4j2.version}
-
-
-
- org.apache.kafka
- kafka-clients
- 2.0.1
-->
diff --git a/fizz-bootstrap/src/main/resources/log4j2-kafka.json b/fizz-bootstrap/src/main/resources/log4j2-kafka.json
deleted file mode 100644
index c540015..0000000
--- a/fizz-bootstrap/src/main/resources/log4j2-kafka.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
- "logTime": {
- "$resolver": "timestamp",
- "epoch": {
- "unit": "millis",
- "rounded": true
- }
- },
- "logLevel": {
- "$resolver": "level",
- "field": "name"
- },
- "logMsg": {
- "$resolver": "message",
- "stringified": true
- },
- "thread": {
- "$resolver": "thread",
- "field": "name"
- },
- "loggerName": {
- "$resolver": "logger",
- "field": "name"
- },
- "thrown": {
- "message": {
- "$resolver": "exception",
- "field": "message"
- },
- "extendedStackTrace": {
- "$resolver": "exception",
- "field": "stackTrace",
- "stackTrace": {
- "stringified": true
- }
- }
- }
-}
\ No newline at end of file
diff --git a/fizz-bootstrap/src/main/resources/log4j2-spring.xml b/fizz-bootstrap/src/main/resources/log4j2-spring.xml
index 2e9a9d8..a6a93bf 100644
--- a/fizz-bootstrap/src/main/resources/log4j2-spring.xml
+++ b/fizz-bootstrap/src/main/resources/log4j2-spring.xml
@@ -4,7 +4,6 @@
fizz-bootstrap
${sys:APP_ROOT_DIR}/log
-
@@ -21,37 +20,13 @@
-->
-
-
-
@@ -60,19 +35,15 @@
-
-
-
-
diff --git a/fizz-common/pom.xml b/fizz-common/pom.xml
index c003c53..6c61511 100644
--- a/fizz-common/pom.xml
+++ b/fizz-common/pom.xml
@@ -17,16 +17,6 @@
-
- org.apache.logging.log4j
- log4j-layout-template-json
-
-
-
- org.apache.kafka
- kafka-clients
-
-
org.openjdk.jol
jol-core
diff --git a/fizz-core/src/main/java/we/config/SystemConfig.java b/fizz-core/src/main/java/we/config/SystemConfig.java
index 7965139..83ee4c5 100644
--- a/fizz-core/src/main/java/we/config/SystemConfig.java
+++ b/fizz-core/src/main/java/we/config/SystemConfig.java
@@ -76,17 +76,24 @@ public class SystemConfig {
private boolean aggregateTestAuth = false;
+ @Value("${fizz.md5sign-timestamp-timeliness:300}")
+ private int fizzMD5signTimestampTimeliness = 300; // unit: sec
+
+ public int fizzMD5signTimestampTimeliness() {
+ return fizzMD5signTimestampTimeliness;
+ }
+
@Value("${route-timeout:0}")
private long routeTimeout = 0;
@Value("${fizz-trace-id.header:X-Trace-Id}")
- private String fizzTraceIdHeader;
+ private String fizzTraceIdHeader;
@Value("${fizz-trace-id.value-strategy:requestId}")
- private String fizzTraceIdValueStrategy;
+ private String fizzTraceIdValueStrategy;
@Value("${fizz-trace-id.value-prefix:fizz}")
- private String fizzTraceIdValuePrefix;
+ private String fizzTraceIdValuePrefix;
@Value("${fizz.error.response.http-status.enable:true}")
public void setFizzErrRespHttpStatusEnable(boolean fizzErrRespHttpStatusEnable) {
diff --git a/fizz-core/src/main/java/we/plugin/auth/ApiConfigService.java b/fizz-core/src/main/java/we/plugin/auth/ApiConfigService.java
index 8846ea9..9736d7b 100644
--- a/fizz-core/src/main/java/we/plugin/auth/ApiConfigService.java
+++ b/fizz-core/src/main/java/we/plugin/auth/ApiConfigService.java
@@ -40,6 +40,7 @@ import we.util.*;
import javax.annotation.PostConstruct;
import javax.annotation.Resource;
+import java.time.LocalDateTime;
import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.function.Supplier;
@@ -515,22 +516,29 @@ public class ApiConfigService implements ApplicationListener> authSecretKey(App a, String sign, Result r) {
if (StringUtils.isBlank(sign)) {
r.code = Result.FAIL;
diff --git a/fizz-core/src/test/resources/log4j2-kafka.json b/fizz-core/src/test/resources/log4j2-kafka.json
deleted file mode 100644
index c540015..0000000
--- a/fizz-core/src/test/resources/log4j2-kafka.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
- "logTime": {
- "$resolver": "timestamp",
- "epoch": {
- "unit": "millis",
- "rounded": true
- }
- },
- "logLevel": {
- "$resolver": "level",
- "field": "name"
- },
- "logMsg": {
- "$resolver": "message",
- "stringified": true
- },
- "thread": {
- "$resolver": "thread",
- "field": "name"
- },
- "loggerName": {
- "$resolver": "logger",
- "field": "name"
- },
- "thrown": {
- "message": {
- "$resolver": "exception",
- "field": "message"
- },
- "extendedStackTrace": {
- "$resolver": "exception",
- "field": "stackTrace",
- "stackTrace": {
- "stringified": true
- }
- }
- }
-}
\ No newline at end of file
diff --git a/fizz-core/src/test/resources/log4j2-test.xml b/fizz-core/src/test/resources/log4j2-test.xml
index b3b16f9..4148b77 100644
--- a/fizz-core/src/test/resources/log4j2-test.xml
+++ b/fizz-core/src/test/resources/log4j2-test.xml
@@ -8,26 +8,13 @@
-
-
-
-
diff --git a/pom.xml b/pom.xml
index 1877aa2..4574206 100644
--- a/pom.xml
+++ b/pom.xml
@@ -70,18 +70,6 @@
-
- org.apache.logging.log4j
- log4j-layout-template-json
- ${log4j2.version}
-
-
-
- org.apache.kafka
- kafka-clients
- 2.0.1
-
-
org.openjdk.jol
jol-core