From a69578ed877252e70d45d4753258b3d7b6937606 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 16 十月 2023 09:24:34 +0800
Subject: [PATCH] a
---
server/src/main/java/doumeemes/config/shiro/ShiroToken.java | 51 ++++++++++++++++++++++++++++++---------------------
1 files changed, 30 insertions(+), 21 deletions(-)
diff --git a/server/src/main/java/doumeemes/config/shiro/ShiroToken.java b/server/src/main/java/doumeemes/config/shiro/ShiroToken.java
index b0fa87c..cdc6b69 100644
--- a/server/src/main/java/doumeemes/config/shiro/ShiroToken.java
+++ b/server/src/main/java/doumeemes/config/shiro/ShiroToken.java
@@ -1,27 +1,11 @@
package doumeemes.config.shiro;
+<<<<<<< HEAD
import doumeemes.core.model.LoginUserInfo;
-import doumeemes.core.utils.Constants;
-import doumeemes.dao.business.model.Department;
-import doumeemes.dao.ext.dto.QueryCompanyUserExtDTO;
-import doumeemes.dao.ext.vo.CompanyUserExtListVO;
-import doumeemes.dao.system.model.SystemPermission;
-import doumeemes.dao.system.model.SystemRole;
-import doumeemes.dao.system.model.SystemUser;
-import doumeemes.service.ext.CompanyUserExtService;
-import doumeemes.service.system.SystemPermissionService;
-import doumeemes.service.system.SystemRoleService;
-import doumeemes.service.system.SystemUserService;
-import org.apache.shiro.authc.*;
-import org.apache.shiro.authz.AuthorizationInfo;
-import org.apache.shiro.authz.SimpleAuthorizationInfo;
-import org.apache.shiro.realm.AuthorizingRealm;
-import org.apache.shiro.subject.PrincipalCollection;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
+=======
+>>>>>>> 1.0.3
+import org.apache.shiro.authc.UsernamePasswordToken;
import org.springframework.stereotype.Component;
-
-import java.util.List;
/**
* 鑷畾涔塗oken 锛屽鐞嗚璇佸拰鏉冮檺
@@ -37,14 +21,23 @@
Integer companyId;
Boolean isDdLogin;
Boolean isWxLogin;
+ LoginUserInfo updateUser;
+
+ int updateFlag;
public ShiroToken() {
}
- public ShiroToken(Integer companyId,String username, String password,boolean isDdLogin,boolean isWxLogin) {
+ public ShiroToken(Integer companyId, String username, String password, boolean isDdLogin, boolean isWxLogin) {
super(username, password, false, (String)null);
this.companyId = companyId;
this.isDdLogin = isDdLogin;
this.isWxLogin = isWxLogin;
+ }
+ public ShiroToken(LoginUserInfo user,int updateFlag) {
+ super(user.getUsername(), "", false, (String)null);
+ this.updateUser = user;
+ this.updateFlag = updateFlag;
+ this.isDdLogin = true;
}
public Boolean getDdLogin() {
@@ -71,4 +64,20 @@
public void setCompanyId(Integer companyId) {
this.companyId = companyId;
}
+
+ public LoginUserInfo getUpdateUser() {
+ return updateUser;
+ }
+
+ public void setUpdateUser(LoginUserInfo updateUser) {
+ this.updateUser = updateUser;
+ }
+
+ public int getUpdateFlag() {
+ return updateFlag;
+ }
+
+ public void setUpdateFlag(int updateFlag) {
+ this.updateFlag = updateFlag;
+ }
}
--
Gitblit v1.9.3