黄远 5 年 前
コミット
9ae0f17f6d

+ 2 - 1
lift-common/src/main/java/cn.com.ty.lift.common/model/BaseTree.java

@@ -3,6 +3,7 @@ package cn.com.ty.lift.common.model;
 import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.util.List;
 
 /**
@@ -11,7 +12,7 @@ import java.util.List;
  * @description 树基础类
  */
 @Data
-public class BaseTree {
+public class BaseTree implements Serializable {
 
     /**
      * id

+ 1 - 1
lift-system-service/src/main/java/cn/com/ty/lift/system/user/dao/entity/Menu.java

@@ -8,7 +8,7 @@ import lombok.Data;
  * @since 2019-12-01 16:52:41
  */
 @Data
-public class Menu extends BaseTree {
+public class Menu extends BaseTree{
 
 	private String name;
 

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

@@ -99,10 +99,10 @@ public class LoginService implements ILoginService {
             return RestResponse.fail(ApiConstants.RESULT_ERROR, "手机号为空无法登录");
         }
         //校验用户是否已经登录
-        Object userInfo = getLoginUserInfoFromRedis(userRequest);
-        if (userInfo != null) {
-            return RestResponse.fail(ApiConstants.RESULT_ERROR, "账号已经登录无法重复登录");
-        }
+//        Object userInfo = getLoginUserInfoFromRedis(userRequest);
+//        if (userInfo != null) {
+//            return RestResponse.fail(ApiConstants.RESULT_ERROR, "账号已经登录无法重复登录");
+//        }
         if (StringUtils.isBlank(password)) {
             return RestResponse.fail(ApiConstants.RESULT_ERROR, "用户密码为空无法登录");
         }

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

@@ -56,7 +56,7 @@ public class MenuService extends ServiceImpl<MenuMapper, Menu> implements IMenuS
         //递归组合菜单路径
         StringBuilder sb = new StringBuilder();
         menuTreeToUrl(menuTree,  sb);
-        return sb.toString();
+        return sb.toString().replace("\n","");
     }
 
     @Override