update

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/interceptor/TenantInterceptor.java

@@ -12,7 +12,10 @@ import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.auth.api.entity.TenantInfo;
+import com.ym.mec.auth.service.SysUserService;
 import com.ym.mec.auth.service.TenantInfoService;
+import com.ym.mec.common.security.AuthUser;
+import com.ym.mec.common.security.SecurityUtils;
 import com.ym.mec.common.tenant.TenantContextHolder;
 
 @Component
@@ -21,8 +24,7 @@ public class TenantInterceptor extends HandlerInterceptorAdapter {
 	private static final String DATA_SOURCE_ID = "datasourceId";
 
 	@Autowired
-	@Lazy
-	private SysUserFeignService sysUserFeignService;
+	private SysUserService userService;
 	
 	@Autowired
 	private TenantInfoService tenantInfoService;
@@ -31,7 +33,11 @@ public class TenantInterceptor extends HandlerInterceptorAdapter {
 	public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler){
 		String tenantId = request.getHeader("tenantId");
 		if(StringUtils.isEmpty(tenantId)){
-			SysUser sysUser = sysUserFeignService.queryUserInfo();
+			AuthUser authUser = SecurityUtils.getUser();
+			SysUser sysUser = null;
+			if(authUser != null){
+				sysUser = userService.get(authUser.getUserId());
+			}
 			if(sysUser != null && sysUser.getTenantId() != null){
 				tenantId = sysUser.getTenantId().toString();
 			}