zouxuan 3 years ago
parent
commit
441fb8c4f9

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

@@ -1,30 +1,31 @@
 package com.ym.mec.web.interceptor;
 
-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 java.io.IOException;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 
-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.yonge.log.interceptor.AuditLogInterceptor;
 
 @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){
-//		SysUser sysUser = sysUserFeignService.queryUserInfo();
-		AuthUser authUser = SecurityUtils.getUser();
-		if (authUser != null && authUser.getUserId() != null) {
-			setUsername(authUser.getUsername(),authUser.getUserId(), authUser.getTenantId() + "");
+	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() + "");
 		}
 		return true;
 	}