From 9c06f1650313b76c8e1c06ac35a18dce44664320 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 21 十一月 2024 15:05:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/LoginServiceImpl.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/LoginServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/LoginServiceImpl.java
index bb4ab4f..8bc2aa7 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/LoginServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/LoginServiceImpl.java
@@ -135,7 +135,7 @@
* @throws VciBaseException 鐧诲綍鍙戠敓寮傚父鐨勬椂鍊欏嚭鐜颁簡閿欒
*/
@Override
- public LoginResultBO login(LoginUserDTO userDTO, RequestClientInfo clientInfo) throws PLException {
+ public LoginResultBO login(LoginUserDTO userDTO, RequestClientInfo clientInfo) throws Exception {
return login(userDTO,clientInfo,true);
}
@@ -147,7 +147,7 @@
* @return 鎵ц缁撴灉
* @throws VciBaseException 鍙傛暟閿欒锛岀敤鎴蜂笉鑳界櫥褰曠瓑浼氭姏鍑哄紓甯�
*/
- private LoginResultBO login(LoginUserDTO userDTO, RequestClientInfo clientInfo, boolean checkPassword/*鍗曠偣鐧诲綍涓嶉渶瑕佹牎楠屽瘑鐮�*/) throws VciBaseException {
+ private LoginResultBO login(LoginUserDTO userDTO, RequestClientInfo clientInfo, boolean checkPassword/*鍗曠偣鐧诲綍涓嶉渶瑕佹牎楠屽瘑鐮�*/) throws Exception {
LoginResultBO loginResult = new LoginResultBO();
loginResult.setSuccess(false);
@@ -238,7 +238,8 @@
}
//6銆佺櫥褰曟垚鍔熶箣鍚庨渶瑕佸鐞嗙殑閫昏緫
user.setLastLoginTime(new Date());//鏈�鍚庣櫥褰曟椂闂�
- user.setPwdWrongCount(0);//瀵嗙爜閿欒娆℃暟娓�0
+ //user.setPwdWrongCount(0);//鐧诲綍鎴愬姛瀵嗙爜閿欒娆℃暟娓�0
+ platformClientUtil.getFrameworkService().updateLogonInfo(user.getOid(),true);
//澶勭悊鐢ㄦ埛鐧诲綍鎴愬姛鐨剆ession
SessionInfo sessionInfo = new SessionInfo();
sessionInfo.setToken(token);
@@ -326,7 +327,7 @@
//3銆佸垽鏂瘑鐮佹槸鍚︽纭�
if (checkPassword) {
- boolean passwordIsEqual = userQueryService.checkPasswordEqual(userDTO.getPassword(), user.getOid());
+ boolean passwordIsEqual = userQueryService.checkPasswordEqual(userDTO.getPassword(), user.getName());
if (!passwordIsEqual) {
if (logger.isDebugEnabled()) {
logger.debug("{}瀵嗙爜涓嶆纭�", user.getId());
@@ -529,7 +530,7 @@
* @throws VciBaseException 鐧诲綍澶辫触鐨勬椂鍊欐姏鍑哄紓甯�
*/
@Override
- public LoginResultBO singleLogin(LoginUserDTO userDTO, RequestClientInfo clientInfo) throws PLException {
+ public LoginResultBO singleLogin(LoginUserDTO userDTO, RequestClientInfo clientInfo) throws Exception {
return login(userDTO,clientInfo,false);
}
--
Gitblit v1.9.3