Use {@link RequestContextListener} or
- * {@link org.springframework.web.filter.RequestContextFilter} to expose
- * the current web request. Note that
- * already exposes the current request by default.
- *
- * 修改 spring 上下文存储方式 将 ThreadLocal 替换为 TransmittableThreadLocal
- * 支持线程上下文切换变量传递 异步获取 spring 上下文
- *
- * @author Juergen Hoeller
- * @author Rod Johnson
- * @since 2.0
- * @see RequestContextListener
- * @see org.springframework.web.filter.RequestContextFilter
- */
-public abstract class RequestContextHolder {
-
- private static final boolean jsfPresent =
- ClassUtils.isPresent("jakarta.faces.context.FacesContext", RequestContextHolder.class.getClassLoader());
-
- // ThreadLocal 替换为 TransmittableThreadLocal
- private static final ThreadLocal Exposes the previously bound RequestAttributes instance, if any.
- * Falls back to the current JSF FacesContext, if any.
- * @return the RequestAttributes currently bound to the thread
- * @throws IllegalStateException if no RequestAttributes object
- * is bound to the current thread
- * @see #setRequestAttributes
- * @see ServletRequestAttributes
- * @see FacesRequestAttributes
- * @see jakarta.faces.context.FacesContext#getCurrentInstance()
- */
- public static RequestAttributes currentRequestAttributes() throws IllegalStateException {
- RequestAttributes attributes = getRequestAttributes();
- if (attributes == null) {
- if (jsfPresent) {
- attributes = FacesRequestAttributesFactory.getFacesRequestAttributes();
- }
- if (attributes == null) {
- throw new IllegalStateException("No thread-bound request found: " +
- "Are you referring to request attributes outside of an actual web request, " +
- "or processing a request outside of the originally receiving thread? " +
- "If you are actually operating within a web request and still receive this message, " +
- "your code is probably running outside of DispatcherServlet: " +
- "In this case, use RequestContextListener or RequestContextFilter to expose the current request.");
- }
- }
- return attributes;
- }
-
-
- /**
- * Inner class to avoid hard-coded JSF dependency.
- */
- private static class FacesRequestAttributesFactory {
-
- @Nullable
- public static RequestAttributes getFacesRequestAttributes() {
- try {
- FacesContext facesContext = FacesContext.getCurrentInstance();
- return (facesContext != null ? new FacesRequestAttributes(facesContext) : null);
- }
- catch (NoClassDefFoundError err) {
- // typically for com/sun/faces/util/Util if only the JSF API jar is present
- return null;
- }
- }
- }
-
-}
diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/aspect/LogAspect.java b/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/aspect/LogAspect.java
index 6c563a4f..ce3fc04e 100644
--- a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/aspect/LogAspect.java
+++ b/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/aspect/LogAspect.java
@@ -20,6 +20,8 @@ import org.dromara.common.json.utils.JsonUtils;
import org.dromara.common.log.annotation.Log;
import org.dromara.common.log.enums.BusinessStatus;
import org.dromara.common.log.event.OperLogEvent;
+import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.system.api.model.LoginUser;
import org.springframework.boot.autoconfigure.AutoConfiguration;
import org.springframework.http.HttpMethod;
import org.springframework.validation.BindingResult;
@@ -86,6 +88,15 @@ public class LogAspect {
// *========数据库日志=========*//
OperLogEvent operLog = new OperLogEvent();
+ operLog.setTenantId(LoginHelper.getTenantId());
+ operLog.setStatus(BusinessStatus.SUCCESS.ordinal());
+ // 请求的地址
+ String ip = ServletUtils.getClientIP();
+ operLog.setOperIp(ip);
+ operLog.setOperUrl(StringUtils.substring(ServletUtils.getRequest().getRequestURI(), 0, 255));
+ LoginUser loginUser = LoginHelper.getLoginUser();
+ operLog.setOperName(loginUser.getUsername());
+ operLog.setDeptName(loginUser.getDeptName());
if (e != null) {
operLog.setStatus(BusinessStatus.FAIL.ordinal());
@@ -95,6 +106,8 @@ public class LogAspect {
String className = joinPoint.getTarget().getClass().getName();
String methodName = joinPoint.getSignature().getName();
operLog.setMethod(className + "." + methodName + "()");
+ // 设置请求方式
+ operLog.setRequestMethod(ServletUtils.getRequest().getMethod());
// 处理设置注解上的参数
getControllerMethodDescription(joinPoint, controllerLog, operLog, jsonResult);
// 设置消耗时间
diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/event/LogEventListener.java b/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/event/LogEventListener.java
index e0812dd7..3584e0c6 100644
--- a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/event/LogEventListener.java
+++ b/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/event/LogEventListener.java
@@ -11,14 +11,12 @@ import org.dromara.common.core.constant.Constants;
import org.dromara.common.core.utils.ServletUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.core.utils.ip.AddressUtils;
-import org.dromara.common.log.enums.BusinessStatus;
import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.system.api.RemoteClientService;
import org.dromara.system.api.RemoteLogService;
import org.dromara.system.api.domain.bo.RemoteLogininforBo;
import org.dromara.system.api.domain.bo.RemoteOperLogBo;
import org.dromara.system.api.domain.vo.RemoteClientVo;
-import org.dromara.system.api.model.LoginUser;
import org.springframework.context.event.EventListener;
import org.springframework.stereotype.Component;
@@ -42,18 +40,6 @@ public class LogEventListener {
@EventListener
public void saveLog(OperLogEvent operLogEvent) {
RemoteOperLogBo sysOperLog = BeanUtil.toBean(operLogEvent, RemoteOperLogBo.class);
- sysOperLog.setTenantId(LoginHelper.getTenantId());
- sysOperLog.setStatus(BusinessStatus.SUCCESS.ordinal());
- // 请求的地址
- String ip = ServletUtils.getClientIP();
- sysOperLog.setOperIp(ip);
- HttpServletRequest request = ServletUtils.getRequest();
- sysOperLog.setOperUrl(StringUtils.substring(request.getRequestURI(), 0, 255));
- LoginUser loginUser = LoginHelper.getLoginUser();
- sysOperLog.setOperName(loginUser.getUsername());
- sysOperLog.setDeptName(loginUser.getDeptName());
- // 设置请求方式
- sysOperLog.setRequestMethod(request.getMethod());
remoteLogService.saveLog(sysOperLog);
}