czg_team/cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
张松
2025-03-07 14:29:38 +08:00
parent 89dea94258 f163dbaa2b
commit 4fb4863cb1
1 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
cash-common/cash-common-log/src/main/java/com/czg/log/aspect/OperationLogAspect.java
View File

@@ -1,7 +1,9 @@
package com.czg.log.aspect; package com.czg.log.aspect;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.exceptions.ExceptionUtil; import cn.hutool.core.exceptions.ExceptionUtil;
import cn.hutool.core.util.ObjUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import cn.hutool.extra.servlet.JakartaServletUtil; import cn.hutool.extra.servlet.JakartaServletUtil;
import cn.hutool.json.JSONUtil; import cn.hutool.json.JSONUtil;
@@ -13,6 +15,7 @@ import com.czg.log.enums.LogTypeEnum;
import com.czg.log.enums.OperationStatusEnum; import com.czg.log.enums.OperationStatusEnum;
import com.czg.log.producer.LogProducer; import com.czg.log.producer.LogProducer;
import com.czg.sa.StpKit; import com.czg.sa.StpKit;
import com.czg.service.RedisService;
import com.czg.utils.AddressUtil; import com.czg.utils.AddressUtil;
import com.czg.utils.HttpContextUtil; import com.czg.utils.HttpContextUtil;
import com.mybatisflex.core.keygen.impl.SnowFlakeIDKeyGenerator; import com.mybatisflex.core.keygen.impl.SnowFlakeIDKeyGenerator;
@@ -44,6 +47,9 @@ public class OperationLogAspect {
@Resource @Resource
private LogProducer logProducer; private LogProducer logProducer;
@Resource
private RedisService redisService;
@Pointcut("@annotation(com.czg.log.annotation.OperationLog)") @Pointcut("@annotation(com.czg.log.annotation.OperationLog)")
public void logPointCut() { public void logPointCut() {
@@ -108,9 +114,20 @@ public class OperationLogAspect {
//请求相关信息 //请求相关信息
HttpServletRequest request = HttpContextUtil.getHttpServletRequest(); HttpServletRequest request = HttpContextUtil.getHttpServletRequest();
String requestMethod = request.getMethod();
if ("GET".equalsIgnoreCase(requestMethod)) {
return;
}
String ip = JakartaServletUtil.getClientIP(request); String ip = JakartaServletUtil.getClientIP(request);
log.set("ip", ip); log.set("ip", ip);
log.set("location", AddressUtil.getRealAddressByIp(ip)); Object location = redisService.get("IP::" + ip);
if (ObjUtil.isNotNull(location)) {
log.set("location", Convert.toStr(location));
} else {
String address = AddressUtil.getRealAddressByIp(ip);
redisService.set("IP::" + ip, address);
log.set("location", address);
}
log.set("userAgent", request.getHeader(HttpHeaders.USER_AGENT)); log.set("userAgent", request.getHeader(HttpHeaders.USER_AGENT));
log.set("requestUri", request.getRequestURI()); log.set("requestUri", request.getRequestURI());
log.set("requestMethod", request.getMethod()); log.set("requestMethod", request.getMethod());