log日志记录

mec-common/audit-log/src/main/java/com/yonge/log/interceptor/AuditLogInterceptor.java

@@ -11,7 +11,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.web.method.HandlerMethod;
 import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
@@ -26,7 +25,6 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Executor;
 import java.util.concurrent.ThreadPoolExecutor;
 

mec-web/src/main/java/com/ym/mec/web/interceptor/OperationLogInterceptor.java

@@ -1,31 +1,30 @@
 package com.ym.mec.web.interceptor;
 
-import java.io.IOException;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import com.ym.mec.auth.api.client.SysUserFeignService;
+import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.common.security.AuthUser;
+import com.ym.mec.common.security.SecurityUtils;
+import com.yonge.log.interceptor.AuditLogInterceptor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 
-import com.ym.mec.auth.api.client.SysUserFeignService;
-import com.ym.mec.auth.api.entity.SysUser;
-import com.yonge.log.interceptor.AuditLogInterceptor;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 @Component
 public class OperationLogInterceptor extends AuditLogInterceptor {
 
-	@Autowired
-	@Lazy
-	private SysUserFeignService sysUserFeignService;
+//	@Autowired
+//	@Lazy
+//	private SysUserFeignService sysUserFeignService;
 
 	@Override
-	public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws ServletException, IOException {
-		SysUser sysUser = sysUserFeignService.queryUserInfo();
-		if (sysUser != null && sysUser.getId() != null) {
-			setUsername(sysUser.getRealName(),sysUser.getId(), sysUser.getTenantId() + "");
+	public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler){
+//		SysUser sysUser = sysUserFeignService.queryUserInfo();
+		AuthUser authUser = SecurityUtils.getUser();
+		if (authUser != null && authUser.getUserId() != null) {
+			setUsername(authUser.getUsername(),authUser.getUserId(), authUser.getTenantId() + "");
 		}
 		return true;
 	}