github/cool-admin-java
1
0
Fork 2
mirror of https://github.com/cool-team-official/cool-admin-java.git synced 2026-10-07 16:48:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

优化：启用压缩功能

Browse Source 
修复：日志记录无异步处理问题
This commit is contained in:
ruying408
2024-08-04 13:37:40 +08:00
parent 37a75f754b
commit 4ff2c51d6c
5 changed files with 119 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/cool/modules/base/service/sys/impl/BaseSysLogServiceImpl.java
+34 -30
View File
@@ -6,6 +6,7 @@ import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
import com.cool.core.base.BaseServiceImpl;
import com.cool.core.config.LogProperties;
import com.cool.core.security.IgnoredUrlsProperties;
import com.cool.core.util.CoolSecurityUtil;
import com.cool.core.util.IPUtils;
@@ -20,9 +21,8 @@ import com.mybatisflex.core.paginate.Page;
import com.mybatisflex.core.query.QueryWrapper;
import jakarta.servlet.http.HttpServletRequest;
import java.util.Date;
import java.util.concurrent.Executor;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
/**
@@ -39,8 +39,10 @@ public class BaseSysLogServiceImpl extends BaseServiceImpl<BaseSysLogMapper, Bas
private final IPUtils ipUtils;
@Value("${cool.log.maxJsonLength:1024}")
private int maxJsonLength;
private final LogProperties logProperties;
private final Executor logTaskExecutor;
private static final AntPathMatcher antPathMatcher = new AntPathMatcher();
@Override
@@ -76,22 +78,8 @@ public class BaseSysLogServiceImpl extends BaseServiceImpl<BaseSysLogMapper, Bas
return;
}
String ipAddr = ipUtils.getIpAddr(request);
JSONObject userInfo = CoolSecurityUtil.getAdminUserInfo(requestParams);
Long userId = null;
if (userInfo != null) {
userId = userInfo.getLong("userId");
}
JSONObject newJSONObject = JSONUtil.parseObj(JSONUtil.toJsonStr(requestParams));
newJSONObject.remove("tokenInfo");
newJSONObject.remove("refreshToken");
newJSONObject.remove("body");
if (newJSONObject.toString().getBytes().length > maxJsonLength) {
// 超过指定
newJSONObject.clear();
}
recordAsync(requestURI, ipAddr, userId, newJSONObject);
// 异步记录日志
recordAsync(ipAddr, requestURI, requestParams);
}
private boolean isIgnoreUrl(String requestURI) {
@@ -99,16 +87,32 @@ public class BaseSysLogServiceImpl extends BaseServiceImpl<BaseSysLogMapper, Bas
.anyMatch(url -> antPathMatcher.match(url, requestURI));
}
public void recordAsync(String ipAddr, String requestURI, JSONObject requestParams) {
logTaskExecutor.execute(() -> {
JSONObject userInfo = CoolSecurityUtil.getAdminUserInfo(requestParams);
@Async
public void recordAsync(String requestURI, String ip, Long userId, JSONObject params) {
BaseSysLogEntity logEntity = new BaseSysLogEntity();
logEntity.setAction(requestURI);
logEntity.setIp(ip);
if (userId != null) {
logEntity.setUserId(userId);
}
logEntity.setParams(params);
save(logEntity);
Long userId = null;
if (userInfo != null) {
userId = userInfo.getLong("userId");
}
JSONObject newJSONObject = JSONUtil.parseObj(JSONUtil.toJsonStr(requestParams));
newJSONObject.remove("tokenInfo");
newJSONObject.remove("refreshToken");
newJSONObject.remove("body");
if (newJSONObject.toString().getBytes().length > logProperties.getMaxByteLength()) {
// 超过指定
newJSONObject.clear();
}
BaseSysLogEntity logEntity = new BaseSysLogEntity();
logEntity.setAction(requestURI);
logEntity.setIp(ipAddr);
if (userId != null) {
logEntity.setUserId(userId);
}
logEntity.setParams(newJSONObject);
save(logEntity);
});
}
}