|  |  | @@ -135,6 +135,7 @@ public class WxUserGrantController extends BaseController { | 
		
	
		
			
			|  |  |  | 
 | 
		
	
		
			
			|  |  |  | /** | 
		
	
		
			
			|  |  |  | * 用户登录 | 
		
	
		
			
			|  |  |  | * 手机号+密码登陆 | 
		
	
		
			
			|  |  |  | * | 
		
	
		
			
			|  |  |  | * @param map | 
		
	
		
			
			|  |  |  | * @return | 
		
	
	
		
			
				|  |  | @@ -169,6 +170,9 @@ public class WxUserGrantController extends BaseController { | 
		
	
		
			
			|  |  |  | if (basicInfo == null) { | 
		
	
		
			
			|  |  |  | return new ResultData(ErrorCode.USER_IS_EMPTY); | 
		
	
		
			
			|  |  |  | } | 
		
	
		
			
			|  |  |  | if(StringUtils.isBlank(basicInfo.getPassword())){ | 
		
	
		
			
			|  |  |  | return new ResultData(ErrorCode.USER_PASSWD_ERR.getCode(),"该用户未设置密码,请用其他方式登陆"); | 
		
	
		
			
			|  |  |  | } | 
		
	
		
			
			|  |  |  | 
 | 
		
	
		
			
			|  |  |  | String encryptPassword = new PasswordHelper().encryptPassword(password); | 
		
	
		
			
			|  |  |  | 
 | 
		
	
	
		
			
				|  |  | @@ -182,6 +186,13 @@ public class WxUserGrantController extends BaseController { | 
		
	
		
			
			|  |  |  | return new ResultData(resultMap); | 
		
	
		
			
			|  |  |  | } | 
		
	
		
			
			|  |  |  | 
 | 
		
	
		
			
			|  |  |  | /** | 
		
	
		
			
			|  |  |  | * 用户登录 | 
		
	
		
			
			|  |  |  | * 邮箱+密码登陆 | 
		
	
		
			
			|  |  |  | * | 
		
	
		
			
			|  |  |  | * @param map | 
		
	
		
			
			|  |  |  | * @return | 
		
	
		
			
			|  |  |  | */ | 
		
	
		
			
			|  |  |  | @AuthIgnore | 
		
	
		
			
			|  |  |  | @PostMapping("/loginByEmail") | 
		
	
		
			
			|  |  |  | @ApiOperation(value = "用户登录", notes = "{\"email\":\"string\",\"password\":\"string\",\"code\":\"string\"}") | 
		
	
	
		
			
				|  |  | @@ -228,15 +239,22 @@ public class WxUserGrantController extends BaseController { | 
		
	
		
			
			|  |  |  | return new ResultData(resultMap); | 
		
	
		
			
			|  |  |  | } | 
		
	
		
			
			|  |  |  | 
 | 
		
	
		
			
			|  |  |  | /** | 
		
	
		
			
			|  |  |  | * 用户登录 | 
		
	
		
			
			|  |  |  | * 手机+验证码登陆 | 
		
	
		
			
			|  |  |  | * | 
		
	
		
			
			|  |  |  | * @param map | 
		
	
		
			
			|  |  |  | * @return | 
		
	
		
			
			|  |  |  | */ | 
		
	
		
			
			|  |  |  | @AuthIgnore | 
		
	
		
			
			|  |  |  | @ApiOperation(value = "手机验证码登录", notes = "{\"phone\",\"string\",\"code\",\"string\"}") | 
		
	
		
			
			|  |  |  | @PostMapping("/doLoginByPhone") | 
		
	
		
			
			|  |  |  | public ResultData doLoginByPhone(@RequestBody Map<String, String> params, HttpServletResponse response) { | 
		
	
		
			
			|  |  |  | public ResultData doLoginByPhone(@RequestBody Map<String, String> map, HttpServletResponse response) { | 
		
	
		
			
			|  |  |  | String ipaddress = getIpAddr(); | 
		
	
		
			
			|  |  |  | logger.debug("[" + ipaddress + "] WxUserGrantController::doLoginByPhone"); | 
		
	
		
			
			|  |  |  | // String phone,String code,String pwd | 
		
	
		
			
			|  |  |  | String phone = params.get("phone"); | 
		
	
		
			
			|  |  |  | String code = params.get("code"); | 
		
	
		
			
			|  |  |  | String phone = map.get("phone"); | 
		
	
		
			
			|  |  |  | String code = map.get("code"); | 
		
	
		
			
			|  |  |  | 
 | 
		
	
		
			
			|  |  |  | if (StringUtils.isBlank(phone)) { | 
		
	
		
			
			|  |  |  | return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "手机号不能为空"); | 
		
	
	
		
			
				|  |  | @@ -267,6 +285,10 @@ public class WxUserGrantController extends BaseController { | 
		
	
		
			
			|  |  |  | } | 
		
	
		
			
			|  |  |  | } | 
		
	
		
			
			|  |  |  | 
 | 
		
	
		
			
			|  |  |  | /** | 
		
	
		
			
			|  |  |  | * 获取用户信息 | 
		
	
		
			
			|  |  |  | * @return | 
		
	
		
			
			|  |  |  | */ | 
		
	
		
			
			|  |  |  | @PostMapping("/getBasicInfo") | 
		
	
		
			
			|  |  |  | @ApiOperation(value = "用户登录", notes = "") | 
		
	
		
			
			|  |  |  | public ResultData getBasicInfo() { | 
		
	
	
		
			
				|  |  | 
 |