diff --git a/src/main/java/com/lz/common/aspect/LogAspect.java b/src/main/java/com/lz/common/aspect/LogAspect.java index ded395ab..d524b3b7 100644 --- a/src/main/java/com/lz/common/aspect/LogAspect.java +++ b/src/main/java/com/lz/common/aspect/LogAspect.java @@ -1,19 +1,19 @@ package com.lz.common.aspect; -import cn.hutool.system.UserInfo; import com.alibaba.fastjson.JSON; import com.lz.common.utils.OrderUtil; import com.lz.common.utils.R; import com.lz.common.utils.ServletUtils; import com.lz.common.utils.StringUtil; +import com.lz.modules.sys.entity.SysUserEntity; import org.apache.catalina.connector.ResponseFacade; +import org.apache.shiro.SecurityUtils; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Pointcut; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; @@ -22,7 +22,6 @@ import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; -import java.util.Date; import java.util.List; /** @@ -60,9 +59,14 @@ public class LogAspect { Object arg = result; String ip = ""; String m = ""; + Object object = SecurityUtils.getSubject().getPrincipal(); + String userName = ""; + if(object !=null){ + SysUserEntity userEntity = (SysUserEntity)object; + userName = userEntity.getUsername(); + } - String userName = ""; - String params = ""; + String params = ""; try { ch.qos.logback.classic.Logger.threadLocalNo.set(logNo); ch.qos.logback.classic.Logger.threadLocalTime.set(start);