diff --git a/pom.xml b/pom.xml
index d904b4a88dddb2fc71db52041ff66d1cb3202d90..c9d47804e664b63bd6984d340660dcbd3c6c1d5c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -176,6 +176,18 @@
1.15
+
+ org.apache.commons
+ commons-text
+ 1.12.0
+
+
+
+
+ org.owasp.esapi
+ esapi
+ 2.5.4.0
+
diff --git a/src/main/java/com/easysoftware/common/aop/RequestLimitRedisAspect.java b/src/main/java/com/easysoftware/common/aop/RequestLimitRedisAspect.java
index d0a5fe25d69ce5feba68ff2e75d45da8e41fe09d..3209b8fcd98530bf572cf06150b2fbb7428b07e6 100644
--- a/src/main/java/com/easysoftware/common/aop/RequestLimitRedisAspect.java
+++ b/src/main/java/com/easysoftware/common/aop/RequestLimitRedisAspect.java
@@ -27,7 +27,6 @@ import org.springframework.web.context.request.ServletRequestAttributes;
import com.easysoftware.common.entity.MessageCode;
import com.easysoftware.common.utils.ClientUtil;
-import com.easysoftware.common.utils.LogUtil;
import com.easysoftware.common.utils.ResultUtil;
import jakarta.servlet.http.HttpServletRequest;
@@ -118,8 +117,8 @@ public class RequestLimitRedisAspect {
if (count != null && count > limitCount) {
// 审计日志
- LOGGER.error("the current uri is{},the request frequency of uri exceeds the limited frequency: "
- + "{} times/{}s ,IP:{},type: GET", LogUtil.formatCodeString(uri), limitCount, period, ip);
+ // LOGGER.error("the current uri is{},the request frequency of uri exceeds the limited frequency: "
+ // + "{} times/{}s ,type: GET", LogUtil.formatCodeString(uri), limitCount, period);
return ResultUtil.fail(HttpStatus.TOO_MANY_REQUESTS, MessageCode.EC00010);
}
diff --git a/src/main/java/com/easysoftware/common/config/RedisConfiguration.java b/src/main/java/com/easysoftware/common/config/RedisConfiguration.java
index 41e73c1313db4ec5241a3621b2f49512ff3fcccd..fd9d0766280202668ea6827dfa30accb305fdcc2 100644
--- a/src/main/java/com/easysoftware/common/config/RedisConfiguration.java
+++ b/src/main/java/com/easysoftware/common/config/RedisConfiguration.java
@@ -123,7 +123,7 @@ public class RedisConfiguration {
public JedisClientConfiguration clientConfiguration() throws Exception {
JedisClientConfiguration.JedisClientConfigurationBuilder configurationBuilder
= JedisClientConfiguration.builder()
- .connectTimeout(Duration.ofMillis(redisConnectTimeout))
+ .connectTimeout(Duration.ZERO)
.readTimeout(Duration.ofMillis(redisReadTimeout));
diff --git a/src/main/java/com/easysoftware/common/utils/LogUtil.java b/src/main/java/com/easysoftware/common/utils/LogUtil.java
index 14e382c75bd9411b317b00e3347a22c5e3fd0390..675cfd73ddf1c6b18d9524e0288af1ee09730f61 100644
--- a/src/main/java/com/easysoftware/common/utils/LogUtil.java
+++ b/src/main/java/com/easysoftware/common/utils/LogUtil.java
@@ -84,7 +84,7 @@ public final class LogUtil {
log.setOperator("");
String jsonLog = OBJECT_MAPPER.writeValueAsString(log);
- LOGGER.info("operationLog:{}", jsonLog);
+ // LOGGER.info("operationLog:{}", jsonLog);
}
/**
diff --git a/src/main/java/com/easysoftware/common/utils/ResultUtil.java b/src/main/java/com/easysoftware/common/utils/ResultUtil.java
index f03e2e203b15b9037acf150450a9df4b87b70722..876cdd3b09bead62ddeda2beaf3241a76c6eb7aa 100644
--- a/src/main/java/com/easysoftware/common/utils/ResultUtil.java
+++ b/src/main/java/com/easysoftware/common/utils/ResultUtil.java
@@ -14,6 +14,9 @@ package com.easysoftware.common.utils;
import com.easysoftware.common.entity.MessageCode;
import com.easysoftware.common.entity.ResultMsgVo;
import com.easysoftware.common.entity.ResultVo;
+
+import org.apache.commons.text.StringEscapeUtils;
+import org.owasp.esapi.codecs.HTMLEntityCodec;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
@@ -38,7 +41,10 @@ public final class ResultUtil {
ResultVo res = new ResultVo()
.setCode(status.value())
.setMsg(status.getReasonPhrase());
- return new ResponseEntity<>(res, status);
+ HTMLEntityCodec codec = new HTMLEntityCodec();
+ String s1 = StringEscapeUtils.escapeHtml4(ObjectMapperUtil.writeValueAsString(res));
+ String s2 = codec.decode(s1);
+ return new ResponseEntity<>(s2, status);
}
/**
@@ -55,7 +61,10 @@ public final class ResultUtil {
.setCode(msgCode.getCode())
.setMsgEn(msgCode.getMsgEn())
.setMsgZh(msgCode.getMsgZh()));
- return new ResponseEntity<>(res, status);
+ HTMLEntityCodec codec = new HTMLEntityCodec();
+ String s1 = StringEscapeUtils.escapeHtml4(ObjectMapperUtil.writeValueAsString(res));
+ String s2 = codec.decode(s1);
+ return new ResponseEntity<>(s2, status);
}
/**
@@ -67,7 +76,10 @@ public final class ResultUtil {
* @return A ResponseEntity object representing success
*/
public static ResponseEntity