From 5ca038d888922e93bf45c7bd37f3c6dce849dcff Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 24 十二月 2021 11:36:02 +0800
Subject: [PATCH] update 调整监控依赖 从 common 迁移到 framework
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java | 23 +++++++----------------
1 files changed, 7 insertions(+), 16 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 b138c52..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
@@ -69,9 +69,14 @@
private String os;
/**
- * 鏉冮檺鍒楄〃
+ * 鑿滃崟鏉冮檺
*/
- private Set<String> permissions;
+ private Set<String> menuPermissions;
+
+ /**
+ * 瑙掕壊鏉冮檺
+ */
+ private Set<String> rolePermissions;
/**
* 鐢ㄦ埛鍚�
@@ -82,20 +87,6 @@
* 瀵嗙爜
*/
private String password;
-
- public LoginUser(String username, String password, Set<String> permissions) {
- this.username = username;
- this.password = password;
- this.permissions = permissions;
- }
-
- public LoginUser(Long userId, Long deptId, String username, String password, Set<String> permissions) {
- this.userId = userId;
- this.deptId = deptId;
- this.username = username;
- this.password = password;
- this.permissions = permissions;
- }
@JsonIgnore
@Override
--
Gitblit v1.9.3