登录校验机构信息

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/core/filter/UsernameAuthenticationFilter.java

@@ -7,6 +7,7 @@ import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.ym.mec.auth.core.handler.TenantNotFoundException;
 import com.ym.mec.common.exception.BizException;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.security.authentication.AuthenticationServiceException;
@@ -76,7 +77,7 @@ public class UsernameAuthenticationFilter extends AbstractAuthenticationProcessi
 		}
 		Integer tenantId = userInfo.getSysUser().getTenantId();
 		if (tenantId == null || tenantId == 0) {
-			throw new BizException("机构信息异常，请联系管理员");
+			throw new TenantNotFoundException("机构信息异常，请联系管理员");
 		}
 	
 //		if (userInfo.getSysUser().getUserType() != SysUserType.SYSTEM && !StringUtils.equalsIgnoreCase(clientId, userInfo.getSysUser().getUserType().getCode())) {

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/core/handler/TenantNotFoundException.java

@@ -0,0 +1,13 @@
+package com.ym.mec.auth.core.handler;
+
+import org.springframework.security.core.AuthenticationException;
+
+public class TenantNotFoundException extends AuthenticationException {
+    public TenantNotFoundException(String msg, Throwable t) {
+        super(msg, t);
+    }
+
+    public TenantNotFoundException(String msg) {
+        super(msg);
+    }
+}

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/core/provider/service/DefaultUserDetailsService.java

@@ -2,6 +2,7 @@ package com.ym.mec.auth.core.provider.service;
 
 import com.ym.mec.auth.api.dto.SysUserInfo;
 import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.auth.core.handler.TenantNotFoundException;
 import com.ym.mec.auth.service.SysUserService;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.security.AuthUser;
@@ -25,9 +26,6 @@ import java.util.List;
 public class DefaultUserDetailsService implements UserDetailsService {
 
 	@Autowired
-	private PasswordEncoder passwordEncoder;
-
-	@Autowired
 	private SysUserService sysUserService;
 
 	private final String BCRYPT = "{bcrypt}";
@@ -53,7 +51,7 @@ public class DefaultUserDetailsService implements UserDetailsService {
 		}
 		Integer tenantId = userInfo.getSysUser().getTenantId();
 		if (tenantId == null || tenantId == 0) {
-			throw new BizException("机构信息异常，请联系管理员");
+			throw new TenantNotFoundException("机构信息异常，请联系管理员");
 		}
 
 		List<GrantedAuthority> authorities = null;