dcs 1 год назад
Родитель
Сommit
3d5cc4b733

+ 11 - 3
virgo.core/src/main/java/com/bosshand/virgo/core/shiro/VirgoAuthenticationFilter.java

@@ -66,11 +66,17 @@ public class VirgoAuthenticationFilter extends AuthenticatingFilter {
 				responseStrBuilder.append(inputStr);
 			}
 			if (StringUtils.isEmpty(responseStrBuilder.toString())) {
-				throw new AuthException("Incorrect user", Constant.RET_AUTH_FAILED);
+				log.error("Incorrect user");
+				return createToken(null, null, request, response);
 			}
 			ObjectMapper om = new ObjectMapper();
 			dto = om.readValue(responseStrBuilder.toString(), LoginUserDto.class);
 
+			if (!(dto.getPhone().matches("^1[3-9]\\d{9}$"))) {
+				log.error("手机号有误");
+				return createToken(null, null, request, response);
+			}
+
 			// 微信注册登录
 			wxCode = dto.getCode();
 			wxpCode = dto.getpCode();
@@ -82,7 +88,8 @@ public class VirgoAuthenticationFilter extends AuthenticatingFilter {
 					if (CodeCache.getKey(dto.getPhone()).equals(dto.getPhoneCode())) {
 						phone = dto.getPhone();
 					} else {
-						throw new AuthException("验证码有误", Constant.RET_AUTH_FAILED);
+						log.error("微信注册登录,验证码有误");
+						return createToken(null, null, request, response);
 					}
 				}
 				MgrUser user = mgrUserService.getByPhone(phone);
@@ -111,7 +118,8 @@ public class VirgoAuthenticationFilter extends AuthenticatingFilter {
 			// 手机号验证码注册登录
 			phoneCode = CodeCache.getKey(dto.getPhone());
 			if (!dto.getPhoneCode().equals(phoneCode)) {
-				throw new AuthException("验证码有误", Constant.RET_AUTH_FAILED);
+				log.error("手机号验证码注册登录,验证码有误");
+				return createToken(null, null, request, response);
 			}
 			MgrUser user = mgrUserService.getByPhone(dto.getPhone());
 			if (user != null) {