|
@@ -5,7 +5,6 @@ import com.alibaba.fastjson.JSONObject;
|
|
|
import com.ydtech.core.page.HttpResult;
|
|
import com.ydtech.core.page.HttpResult;
|
|
|
import com.ydtech.modules.admin.model.SysLog;
|
|
import com.ydtech.modules.admin.model.SysLog;
|
|
|
import com.ydtech.modules.admin.service.SysLogService;
|
|
import com.ydtech.modules.admin.service.SysLogService;
|
|
|
-import com.ydtech.utils.StringUtils;
|
|
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
import org.aspectj.lang.JoinPoint;
|
|
import org.aspectj.lang.JoinPoint;
|
|
|
import org.aspectj.lang.ProceedingJoinPoint;
|
|
import org.aspectj.lang.ProceedingJoinPoint;
|
|
@@ -47,13 +46,10 @@ public class LogAspect {
|
|
|
ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
|
|
ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
|
|
|
HttpServletRequest request = attributes.getRequest();
|
|
HttpServletRequest request = attributes.getRequest();
|
|
|
|
|
|
|
|
- String userId = "";
|
|
|
|
|
-// if(null != StpUtil.getLoginId()){
|
|
|
|
|
-// userId = StpUtil.getLoginId().toString();
|
|
|
|
|
-// }
|
|
|
|
|
|
|
+ String userId = StpUtil.getLoginId("").toString();
|
|
|
//请求人 url method ip class_method
|
|
//请求人 url method ip class_method
|
|
|
- SysLog sysLog = new SysLog(userId, request.getRequestURL().toString(), request.getMethod(), joinPoint.getSignature().getDeclaringTypeName(), joinPoint.getSignature().getName(), request.getRemoteAddr(), new Date());
|
|
|
|
|
-// SysLog sysLog = new SysLog(JwtTokenUtils.getUsernameFromRequest(request), request.getRequestURL().toString(), request.getMethod(), joinPoint.getSignature().getDeclaringTypeName(), joinPoint.getSignature().getName(), request.getRemoteAddr(), new Date());
|
|
|
|
|
|
|
+ SysLog sysLog = new SysLog(userId, request.getRequestURL().toString(), request.getMethod(),
|
|
|
|
|
+ joinPoint.getSignature().getDeclaringTypeName(), joinPoint.getSignature().getName(), request.getRemoteAddr(), new Date());
|
|
|
|
|
|
|
|
try {
|
|
try {
|
|
|
//获取注解注释
|
|
//获取注解注释
|