fangcheng / regional-platform

Download as
Browse Code »

Commit f2061304532a618d5debfe01c1d838f1f2ab0162

Authored by zhangrui
1 parent 384aacda3a
Exists in master and in 1 other branch nobuildprocess

bug fix

Showing 2 changed files with 8 additions and 6 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java View file @ f206130
... ... @@ -559,7 +559,7 @@
559 559 if (usersList.size() != 0) {
560 560 Map<String, Object> map = new HashMap<>();
561 561 map.put(ResultUtils.ERROR_CODE, ConstantInterface.PARAMETER_ERROR);
562   - map.put(ResultUtils.ERROR_MSG, "用户已存在");
  562 + map.put(ResultUtils.ERROR_MSG, "手机号已存在");
563 563 writeJson(response, JsonUtil.obj2JsonString(map));
564 564 return;
565 565 }
... ... @@ -582,7 +582,8 @@
582 582  
583 583 //关联登录中心ID
584 584 LoginContext loginContext = null;
585   - loginContext = LoginUtil.register(null, phone, null, null, token, typeId);
  585 +// loginContext = LoginUtil.register(null, phone, null, null, token, typeId);
  586 + loginContext = iSessionProvider.register(null,phone,null,null);
586 587 //0 成功 4009 已注册
587 588 if(loginContext.getErrorcode().equals(0) || loginContext.getErrorcode().equals(4009)) {
588 589 users.setLogincenterId(loginContext.getId());
... ... @@ -704,7 +705,7 @@
704 705 users.setAccount(account);
705 706 users.setPhone(phone);
706 707 users.setEnable(enable);
707   - users.setPwd(MD5Utils.md5(password));
  708 + users.setPwd(MD5Utils.md5(password).toUpperCase());
708 709 users.setRemarks(remarks);
709 710 users.setKsId(ksId);
710 711 users.setPublishId(user.getId());
... ... @@ -858,7 +859,8 @@
858 859  
859 860  
860 861  
861   - LoginContext loginContext = LoginUtil.register(users.getLogincenterId().toString(), phone, account, MD5Utils.md5(password).toUpperCase(), token, typeId);
  862 +// LoginContext loginContext = LoginUtil.register(users.getLogincenterId().toString(), phone, account, MD5Utils.md5(password).toUpperCase(), token, typeId);
  863 + LoginContext loginContext = iSessionProvider.register(users.getLogincenterId().toString(), phone, account, MD5Utils.md5(password).toUpperCase());
862 864 //0 成功 4009 已注册
863 865 if(loginContext.getErrorcode().equals(0) || loginContext.getErrorcode().equals(4009)) {
864 866 users.setPhone(phone);
... ... @@ -871,7 +873,7 @@
871 873 }
872 874 }
873 875  
874   - users.setPwd(password);
  876 + users.setPwd(MD5Utils.md5(password).toUpperCase());
875 877 users.setPhone(phone);
876 878 users.setName(name);
877 879 users.setEnable(enable);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/session/strategy/UserCenterStrategy.java View file @ f206130
... ... @@ -64,7 +64,7 @@
64 64  
65 65 @Override
66 66 public LoginContext register(String userId, String phone, String account, String pwd) {
67   - return LoginUtil.register(null, phone,account, pwd, token, typeId);
  67 + return LoginUtil.register(userId, phone,account, pwd, token, typeId);
68 68 }
69 69 }