From c2e4ed1a6e3a14406db471304360cd45ac8177d1 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期五, 11 八月 2023 18:46:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/src/main/java/doumeemes/service/system/impl/SystemLoginServiceImpl.java | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/server/src/main/java/doumeemes/service/system/impl/SystemLoginServiceImpl.java b/server/src/main/java/doumeemes/service/system/impl/SystemLoginServiceImpl.java
index 7380b23..8c7c205 100644
--- a/server/src/main/java/doumeemes/service/system/impl/SystemLoginServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/system/impl/SystemLoginServiceImpl.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.iflytek.antelope.other.client.dto.resp.UserDTO;
import doumeemes.biz.system.SystemDictDataBiz;
import doumeemes.config.shiro.ShiroToken;
@@ -93,9 +94,10 @@
throw e;
}
}
+
// 鏍￠獙鐢ㄦ埛鍚嶅拰瀵嗙爜
Subject subject = SecurityUtils.getSubject();
- ShiroToken token = new ShiroToken(dto.getCompanyId(),dto.getUsername(), dto.getPassword(),false);
+ ShiroToken token = new ShiroToken(dto.getCompanyId(),dto.getUsername(), dto.getPassword(),false,false);
try {
subject.login(token);
LoginUserInfo loginUser = ((LoginUserInfo)subject.getPrincipal());
@@ -149,7 +151,7 @@
}
// 鏍￠獙鐢ㄦ埛鍚嶅拰瀵嗙爜
Subject subject = SecurityUtils.getSubject();
- ShiroToken token = new ShiroToken(dto.getCompanyId(),dto.getUsername(), dto.getPassword(),false);
+ ShiroToken token = new ShiroToken(dto.getCompanyId(),dto.getUsername(), dto.getPassword(),false,false);
try {
subject.login(token);
LoginUserInfo loginUser = ((LoginUserInfo)subject.getPrincipal());
@@ -229,7 +231,7 @@
// 鏍￠獙鐢ㄦ埛鍚嶅拰瀵嗙爜
Subject subject = SecurityUtils.getSubject();
// 閽夐拤鐧诲綍
- ShiroToken token = new ShiroToken(companyId,mobile, null,true);
+ ShiroToken token = new ShiroToken(companyId,mobile, null,true,false);
subject.login(token);
LoginUserInfo loginUser =(LoginUserInfo)subject.getPrincipal();
@@ -295,7 +297,7 @@
// 鏍￠獙鐢ㄦ埛鍚嶅拰瀵嗙爜
Subject subject = SecurityUtils.getSubject();
// 閽夐拤鐧诲綍
- ShiroToken atoken = new ShiroToken(companyId,mobile, null,true);
+ ShiroToken atoken = new ShiroToken(companyId,mobile, null,true,false);
subject.login(atoken);
LoginUserInfo loginUser =(LoginUserInfo)subject.getPrincipal();
loginUser.getCompanyUser().setName(user.getName());
@@ -366,7 +368,7 @@
// 鏍￠獙鐢ㄦ埛鍚嶅拰瀵嗙爜
Subject subject = SecurityUtils.getSubject();
// 閽夐拤鐧诲綍
- ShiroToken atoken = new ShiroToken(companyId,mobile, null,true);
+ ShiroToken atoken = new ShiroToken(companyId,mobile, null,true,false);
subject.login(atoken);
LoginUserInfo loginUser =(LoginUserInfo)subject.getPrincipal();
loginLog.setUserId(loginUser.getId());
@@ -451,7 +453,7 @@
// 鏍￠獙鐢ㄦ埛鍚嶅拰瀵嗙爜
Subject subject = SecurityUtils.getSubject();
// 閽夐拤鐧诲綍
- ShiroToken atoken = new ShiroToken(com.getId(),mobile, null,true);
+ ShiroToken atoken = new ShiroToken(com.getId(),mobile, null,true,false);
subject.login(atoken);
LoginUserInfo loginUser =(LoginUserInfo)subject.getPrincipal();
loginUser.getCompanyUser().setName(user.getName());
@@ -522,7 +524,7 @@
// 鏍￠獙鐢ㄦ埛鍚嶅拰瀵嗙爜
Subject subject = SecurityUtils.getSubject();
// 閽夐拤鐧诲綍
- ShiroToken atoken = new ShiroToken(com.getId(),mobile, null,true);
+ ShiroToken atoken = new ShiroToken(com.getId(),mobile, null,true,false);
subject.login(atoken);
LoginUserInfo loginUser =(LoginUserInfo)subject.getPrincipal();
loginUser.getCompanyUser().setName(user.getName());
@@ -554,4 +556,7 @@
}
}
+
+
+
}
--
Gitblit v1.9.3