From 1f0a10ab714699acc85430b90bcb5a1eeaad1eec Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期一, 17 七月 2023 10:14:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-auth/src/main/java/com/vci/ubcs/auth/service/BladeUserDetails.java | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/Source/UBCS/ubcs-auth/src/main/java/com/vci/ubcs/auth/service/BladeUserDetails.java b/Source/UBCS/ubcs-auth/src/main/java/com/vci/ubcs/auth/service/BladeUserDetails.java
index e3bb798..42e295f 100644
--- a/Source/UBCS/ubcs-auth/src/main/java/com/vci/ubcs/auth/service/BladeUserDetails.java
+++ b/Source/UBCS/ubcs-auth/src/main/java/com/vci/ubcs/auth/service/BladeUserDetails.java
@@ -40,6 +40,10 @@
*/
private final String tenantId;
/**
+ * 绉熸埛鍚嶇О
+ */
+ private String tenantName;
+ /**
* 绗笁鏂硅璇両D
*/
private final String oauthId;
@@ -59,6 +63,10 @@
* 閮ㄩ棬id
*/
private final String deptId;
+ /**
+ * 閮ㄩ棬鍚嶇О
+ */
+ private String deptName;
/**
* 宀椾綅id
*/
@@ -84,6 +92,10 @@
* 鐢ㄦ埛瀵嗙骇
*/
private String secretGrade;
+ /**
+ * 閭欢
+ */
+ private String email;
/**
* 瀵嗙爜绛栫暐淇敼鐘舵��
@@ -91,7 +103,7 @@
private Long strategyUpdateStatus;
- public BladeUserDetails(Long userId, String tenantId, String oauthId, String name, String realName, String deptId, String postId, String roleId, String roleName, String avatar, String username, String password, Kv detail,String secretGrade, boolean enabled, boolean accountNonExpired, boolean credentialsNonExpired, boolean accountNonLocked, Collection<? extends GrantedAuthority> authorities,Long strategyUpdateStatus) {
+ public BladeUserDetails(Long userId, String tenantId, String oauthId, String name, String realName, String deptId, String postId, String roleId, String roleName, String avatar, String username, String password, Kv detail,String secretGrade, boolean enabled, boolean accountNonExpired, boolean credentialsNonExpired, boolean accountNonLocked, Collection<? extends GrantedAuthority> authorities,Long strategyUpdateStatus,String tenantName,String deptName,String email) {
super(username, password, enabled, accountNonExpired, credentialsNonExpired, accountNonLocked, authorities);
this.userId = userId;
this.tenantId = tenantId;
@@ -107,6 +119,9 @@
this.detail = detail;
this.secretGrade = secretGrade;
this.strategyUpdateStatus = strategyUpdateStatus;
+ this.tenantName = tenantName;
+ this.deptName = deptName;
+ this.email = email;
}
public BladeUserDetails(Long userId, String tenantId, String oauthId, String name, String realName, String deptId, String postId, String roleId, String roleName, String avatar, String username, String password, Kv detail, boolean enabled, boolean accountNonExpired, boolean credentialsNonExpired, boolean accountNonLocked, Collection<? extends GrantedAuthority> authorities) {
--
Gitblit v1.9.3