shayu/cai-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

123

Browse Source
This commit is contained in:
77
2024-04-10 00:01:15 +08:00
parent fd62adf71e
commit 2f3f1ca46b
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java
View File

@@ -2,6 +2,7 @@ package com.ruoyi.common.utils;
import cn.hutool.core.convert.Convert; import cn.hutool.core.convert.Convert;
import cn.hutool.extra.servlet.ServletUtil; import cn.hutool.extra.servlet.ServletUtil;
import cn.hutool.http.Header;
import cn.hutool.http.HttpStatus; import cn.hutool.http.HttpStatus;
import com.ruoyi.common.constant.Constants; import com.ruoyi.common.constant.Constants;
import lombok.AccessLevel; import lombok.AccessLevel;
@@ -35,6 +36,7 @@ import java.util.UUID;
public class ServletUtils extends ServletUtil { public class ServletUtils extends ServletUtil {
private final static String HEAD_UUID = "uuid"; private final static String HEAD_UUID = "uuid";
private final static String USER_AGENT = "User-Agent";
/** /**
* 获取String参数 * 获取String参数
@@ -208,4 +210,7 @@ public class ServletUtils extends ServletUtil {
} }
} }
public static String getUserAgent() {
return getRequest().getHeader(USER_AGENT);
}
} }

2
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
View File

@@ -90,10 +90,12 @@ public class LogAspect {
operLog.setOperName(loginUser.getUsername()); operLog.setOperName(loginUser.getUsername());
operLog.setUserType(loginUser.getUserType()); operLog.setUserType(loginUser.getUserType());
operLog.setDeptName(loginUser.getDeptName()); operLog.setDeptName(loginUser.getDeptName());
logString.append(String.format("currentUserId=%s;", loginUser.getUserId()));
} }
}catch (Exception ex){ }catch (Exception ex){
// not do // not do
} }
logString.append(String.format("user-agent=%s;", ServletUtils.getUserAgent()));
// 处理设置注解上的参数 // 处理设置注解上的参数
getControllerMethodDescription(joinPoint, controllerLog, operLog, jsonResult,logString); getControllerMethodDescription(joinPoint, controllerLog, operLog, jsonResult,logString);
if (e != null) { if (e != null) {