| 
					
				 | 
			
			
				@ -347,7 +347,7 @@ public class WlyyLoginEndpoint extends AbstractEndpoint { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        logger.info("login:登录进入2"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        String flag = parameters.get("flag"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        String loginType = parameters.get("login_type"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        String username = parameters.get("username"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        logger.info(username); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@ -398,6 +398,15 @@ public class WlyyLoginEndpoint extends AbstractEndpoint { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            String userPhone = wechatService.getUserPhoneByApplets(authCode); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            if (!StringUtils.isEmpty(userPhone)) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                //判断手机号是否注册 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                int count = userDetailsService.checkMobile(userPhone,loginType); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                if(count==0){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                    HttpHeaders headers = new HttpHeaders(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                    headers.set("Cache-Control", "no-store"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                    headers.set("Pragma", "no-cache"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                    Oauth2Envelop oauth2Envelop = new Oauth2Envelop<>("用户不存在", -2, userPhone); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                    return new ResponseEntity<>(oauth2Envelop, headers, HttpStatus.OK); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                parameters.put("username", userPhone); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            } else { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                HttpHeaders headers = new HttpHeaders(); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@ -473,7 +482,6 @@ public class WlyyLoginEndpoint extends AbstractEndpoint { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        wlyyUserSimple.setRefreshToken(token.getRefreshToken().getValue()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        wlyyUserSimple.setUser(parameters.get("username")); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        wlyyUserSimple.setState(parameters.get("state")); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        String loginType = parameters.get("login_type"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        String openid = parameters.get("openid"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        String wechatId = parameters.get("wechatId"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        logger.info("login:登录进入7"); 
			 |