Ver código fonte

//subtile

private_deployment
xhxu 1 ano atrás
pai
commit
989db7f322
3 arquivos alterados com 27 adições e 5 exclusões
  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 Ver arquivo

@@ -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() {


+ 1
- 1
suimangCApi/src/main/resources/application-dev.yml Ver arquivo

@@ -191,5 +191,5 @@ logging:
photo:
url: http://nas.pucao.cn:2002
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

+ 1
- 1
suimangSchedule/src/main/resources/application-dev.yml Ver arquivo

@@ -194,5 +194,5 @@ logging:
photo:
url: http://nas.pucao.cn:2002
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

Carregando…
Cancelar
Salvar