登录优化

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

@@ -99,7 +99,7 @@ public class LoginService implements ILoginService {
             return RestResponse.fail(ApiConstants.RESULT_ERROR, "手机号为空无法登录");
         }
         //校验用户是否已经登录
-        Object userInfo = getLoginUserInfoFromRedis(userRequest.getToken());
+        Object userInfo = getLoginUserInfoFromRedis(userRequest);
         if (userInfo != null) {
             return RestResponse.fail(ApiConstants.RESULT_ERROR, "账号已经登录无法重复登录");
         }
@@ -117,6 +117,7 @@ public class LoginService implements ILoginService {
         if (!inputPassword.equals(userAccount.getPassword())) {
             return RestResponse.fail(ApiConstants.RESULT_ERROR, "密码输入有误");
         }
+        userRequest.setUserId(userAccount.getUserId());
         //登录成功后初始化登录信息
         UserResponse userResponse = initLoginInfo(request, userRequest);
         //添加登录记录
@@ -129,8 +130,8 @@ public class LoginService implements ILoginService {
      * @description
      * @date 2020/4/22 3:35 下午
      */
-    public Object getLoginUserInfoFromRedis(String token) {
-        Object mobileUserInfo = redisTemplate.opsForValue().get(token);
+    public Object getLoginUserInfoFromRedis(UserRequest userRequest) {
+        Object mobileUserInfo = getUserInfoKeyInRedis(userRequest);
         //获取电话是否在redis中存在
         assert mobileUserInfo != null;
         return redisTemplate.opsForValue().get(mobileUserInfo);

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

@@ -141,7 +141,7 @@ public class MenuService extends ServiceImpl<MenuMapper, Menu> implements IMenuS
         if (menuTree != null && menuTree.size() > 0) {
             for (Menu menu : menuTree) {
                 if (StringUtils.isNotBlank(menu.getUrl())) {
-                    sb.append(menu.getUrl());
+                    sb.append(menu.getUrl()).append(",");
                 }
                 menuTreeToUrl(menu.getChildren(), sb);
             }