|
|
@@ -5,14 +5,6 @@ import cn.hutool.core.map.MapUtil;
|
|
|
import cn.hutool.core.util.ArrayUtil;
|
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
|
import com.alibaba.ttl.TransmittableThreadLocal;
|
|
|
-import org.dromara.common.core.utils.ServletUtils;
|
|
|
-import org.dromara.common.core.utils.SpringUtils;
|
|
|
-import org.dromara.common.core.utils.StringUtils;
|
|
|
-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 jakarta.servlet.http.HttpServletRequest;
|
|
|
import jakarta.servlet.http.HttpServletResponse;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
@@ -22,6 +14,15 @@ import org.aspectj.lang.annotation.AfterReturning;
|
|
|
import org.aspectj.lang.annotation.AfterThrowing;
|
|
|
import org.aspectj.lang.annotation.Aspect;
|
|
|
import org.aspectj.lang.annotation.Before;
|
|
|
+import org.dromara.common.core.utils.ServletUtils;
|
|
|
+import org.dromara.common.core.utils.SpringUtils;
|
|
|
+import org.dromara.common.core.utils.StringUtils;
|
|
|
+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;
|
|
|
@@ -94,7 +95,9 @@ public class LogAspect {
|
|
|
String ip = ServletUtils.getClientIP();
|
|
|
operLog.setOperIp(ip);
|
|
|
operLog.setOperUrl(StringUtils.substring(ServletUtils.getRequest().getRequestURI(), 0, 255));
|
|
|
- operLog.setOperName(LoginHelper.getUsername());
|
|
|
+ LoginUser loginUser = LoginHelper.getLoginUser();
|
|
|
+ operLog.setOperName(loginUser.getUsername());
|
|
|
+ operLog.setDeptName(loginUser.getDeptName());
|
|
|
|
|
|
if (e != null) {
|
|
|
operLog.setStatus(BusinessStatus.FAIL.ordinal());
|
疯狂的狮子Li