ソースを参照

//subtile

private_deployment
xhxu 2年前
コミット
989db7f322
3個のファイルの変更27行の追加5行の削除
  1. +25
    -3
      suimangCApi/src/main/java/com/iformall/controller/WxUserGrantController.java
  2. +1
    -1
      suimangCApi/src/main/resources/application-dev.yml
  3. +1
    -1
      suimangSchedule/src/main/resources/application-dev.yml

+ 25
- 3
suimangCApi/src/main/java/com/iformall/controller/WxUserGrantController.java ファイルの表示

@@ -135,6 +135,7 @@ public class WxUserGrantController extends BaseController {


/** /**
* 用户登录 * 用户登录
* 手机号+密码登陆
* *
* @param map * @param map
* @return * @return
@@ -169,6 +170,9 @@ public class WxUserGrantController extends BaseController {
if (basicInfo == null) { if (basicInfo == null) {
return new ResultData(ErrorCode.USER_IS_EMPTY); 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); String encryptPassword = new PasswordHelper().encryptPassword(password);


@@ -182,6 +186,13 @@ public class WxUserGrantController extends BaseController {
return new ResultData(resultMap); return new ResultData(resultMap);
} }


/**
* 用户登录
* 邮箱+密码登陆
*
* @param map
* @return
*/
@AuthIgnore @AuthIgnore
@PostMapping("/loginByEmail") @PostMapping("/loginByEmail")
@ApiOperation(value = "用户登录", notes = "{\"email\":\"string\",\"password\":\"string\",\"code\":\"string\"}") @ApiOperation(value = "用户登录", notes = "{\"email\":\"string\",\"password\":\"string\",\"code\":\"string\"}")
@@ -228,15 +239,22 @@ public class WxUserGrantController extends BaseController {
return new ResultData(resultMap); return new ResultData(resultMap);
} }


/**
* 用户登录
* 手机+验证码登陆
*
* @param map
* @return
*/
@AuthIgnore @AuthIgnore
@ApiOperation(value = "手机验证码登录", notes = "{\"phone\",\"string\",\"code\",\"string\"}") @ApiOperation(value = "手机验证码登录", notes = "{\"phone\",\"string\",\"code\",\"string\"}")
@PostMapping("/doLoginByPhone") @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(); String ipaddress = getIpAddr();
logger.debug("[" + ipaddress + "] WxUserGrantController::doLoginByPhone"); logger.debug("[" + ipaddress + "] WxUserGrantController::doLoginByPhone");
// String phone,String code,String pwd // 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)) { if (StringUtils.isBlank(phone)) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "手机号不能为空"); return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "手机号不能为空");
@@ -267,6 +285,10 @@ public class WxUserGrantController extends BaseController {
} }
} }


/**
* 获取用户信息
* @return
*/
@PostMapping("/getBasicInfo") @PostMapping("/getBasicInfo")
@ApiOperation(value = "用户登录", notes = "") @ApiOperation(value = "用户登录", notes = "")
public ResultData getBasicInfo() { public ResultData getBasicInfo() {


+ 1
- 1
suimangCApi/src/main/resources/application-dev.yml ファイルの表示

@@ -191,5 +191,5 @@ logging:
photo: photo:
url: http://nas.pucao.cn:2002 url: http://nas.pucao.cn:2002
hy_url: http://111.198.0.15:22288 hy_url: http://111.198.0.15:22288
talk: http://111.198.0.15:22266
talk: http://nas.pucao.cn:2001
callbackUrl: https://phototest.metavatar.cc/C callbackUrl: https://phototest.metavatar.cc/C

+ 1
- 1
suimangSchedule/src/main/resources/application-dev.yml ファイルの表示

@@ -194,5 +194,5 @@ logging:
photo: photo:
url: http://nas.pucao.cn:2002 url: http://nas.pucao.cn:2002
hy_url: http://111.198.0.15:22288 hy_url: http://111.198.0.15:22288
talk: http://111.198.0.15:22266
talk: http://nas.pucao.cn:2001
callbackUrl: https://phototest.metavatar.cc/C callbackUrl: https://phototest.metavatar.cc/C

読み込み中…
キャンセル
保存