注册登录优化

lift-system-service/src/main/java/cn/com/ty/lift/system/user/dao/entity/model/UserRequest.java

@@ -12,6 +12,7 @@ public class UserRequest {
     private Long userId;//用户id
     private Long roleId;//角色id
     private Long companyId;//公司id
+    private String token;//令牌
     private String account;//账号(小梯号)
     private String mobile;//手机号
     private String password;//密码

lift-system-service/src/main/java/cn/com/ty/lift/system/user/service/impl/LoginService.java

@@ -95,7 +95,7 @@ public class LoginService implements ILoginService {
         UserAccount userAccount = userAccountService.getByMobile(userRequest.getMobile());
         //验证手机号是否存在
         if(userAccount == null){
-            return RestResponse.fail(ApiConstants.RESULT_ERROR, "用户名不存在");
+            return RestResponse.fail(ApiConstants.RESULT_ERROR, "手机号尚未注册");
         }
         //校验密码是否正确
         String inputPassword = PasswordUtils.generatePassword(password, userAccount.getSalt());
@@ -111,7 +111,7 @@ public class LoginService implements ILoginService {
         //将用户信息放入session中
         request.getSession().setAttribute(ApiConstants.CURRENT_USER_ID, userResponse.getUserId());
         //将用户登录的信息放入redis中,作为缓存处理
-        redisTemplate.opsForValue().set(userResponse.getToken(), JSONUtil.toJsonPrettyStr(userAccount));
+        redisTemplate.opsForValue().set(userResponse.getToken(), JSONUtil.toJsonPrettyStr(userResponse));
         UserLogin userLogin = new UserLogin();
         userLogin.setUserId(userAccount.getUserId());
         userLogin.setIp(CommonUtil.getIpAddress(request));

lift-system-service/src/main/java/cn/com/ty/lift/system/user/service/impl/UserService.java

@@ -63,6 +63,7 @@ public class UserService implements IUserService {
         //设置用户类型
         userAccount.setType(ApiConstants.UserConstants.TYPE_USER);
         UserInfo userInfo = new UserInfo();
+        userInfo.setMobile(userRequest.getMobile());
         userInfo.setName(userRequest.getName());
 
         //前端传递MD5加密密码，然后进行密码加密