yonge 5 rokov pred
rodič
commit
7705005856

+ 1 - 1
mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/core/filter/PhoneLoginAuthenticationFilter.java

@@ -51,7 +51,7 @@ public class PhoneLoginAuthenticationFilter extends AbstractAuthenticationProces
 		principal = obtainParameter(request, SPRING_SECURITY_RESTFUL_PHONE_KEY);
 		principal = obtainParameter(request, SPRING_SECURITY_RESTFUL_PHONE_KEY);
 		credentials = obtainParameter(request, SPRING_SECURITY_RESTFUL_VERIFY_CODE_KEY);
 		credentials = obtainParameter(request, SPRING_SECURITY_RESTFUL_VERIFY_CODE_KEY);
 
 
-		SysUserInfo userInfo = sysUserService.queryUserInfoByPhone(StringUtils.substringAfter(principal, SecurityConstants.PHONE_PRINCIPAL_PREFIX));
+		SysUserInfo userInfo = sysUserService.queryUserInfoByPhone(principal);
 
 
 		String clientId = request.getParameter(clientIdParameter);
 		String clientId = request.getParameter(clientIdParameter);
 
 

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

@@ -62,15 +62,7 @@ public class UsernameAuthenticationFilter extends AbstractAuthenticationProcessi
 		username = username.trim();
 		username = username.trim();
 		password = password.trim();
 		password = password.trim();
 
 
-		SysUserInfo userInfo = null;
-
-		if (StringUtils.startsWith(username, SecurityConstants.PHONE_PRINCIPAL_PREFIX)) {
-			userInfo = sysUserService.queryUserInfoByPhone(StringUtils.substringAfter(username, SecurityConstants.PHONE_PRINCIPAL_PREFIX));
-		} else if (StringUtils.startsWith(username, SecurityConstants.USERNAME_PRINCIPAL_PREFIX)) {
-			userInfo = sysUserService.queryUserInfoByUsername(StringUtils.substringAfter(username, SecurityConstants.USERNAME_PRINCIPAL_PREFIX));
-		} else {
-			userInfo = sysUserService.queryUserInfoByUsername(username);
-		}
+		SysUserInfo userInfo = sysUserService.queryUserInfoByUsername(username);
 
 
 		String clientId = request.getParameter(clientIdParameter);
 		String clientId = request.getParameter(clientIdParameter);