From b3c3afc2b4af331bbd6ac60f16be9fd6563f7ca0 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 15 十二月 2021 14:12:36 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java | 31 ++++++++++++++-----------------
1 files changed, 14 insertions(+), 17 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java
index 9f7727a..0506883 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java
@@ -1,7 +1,6 @@
package com.ruoyi.common.core.domain.model;
import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.ruoyi.common.core.domain.entity.SysUser;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
@@ -70,36 +69,34 @@
private String os;
/**
- * 鏉冮檺鍒楄〃
+ * 鑿滃崟鏉冮檺
*/
- private Set<String> permissions;
+ private Set<String> menuPermissions;
/**
- * 鐢ㄦ埛淇℃伅
+ * 瑙掕壊鏉冮檺
*/
- private SysUser user;
+ private Set<String> rolePermissions;
- public LoginUser(SysUser user, Set<String> permissions) {
- this.user = user;
- this.permissions = permissions;
- }
+ /**
+ * 鐢ㄦ埛鍚�
+ */
+ private String username;
- public LoginUser(Long userId, Long deptId, SysUser user, Set<String> permissions) {
- this.userId = userId;
- this.deptId = deptId;
- this.user = user;
- this.permissions = permissions;
- }
+ /**
+ * 瀵嗙爜
+ */
+ private String password;
@JsonIgnore
@Override
public String getPassword() {
- return user.getPassword();
+ return password;
}
@Override
public String getUsername() {
- return user.getUserName();
+ return username;
}
/**
--
Gitblit v1.9.3