From a85cb705274d8fbd9f5fba86ff1c39c13ac66de0 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期一, 16 十月 2023 17:46:02 +0800
Subject: [PATCH] 1.用户加控制启用,停用状态 2.根据流水依赖获取最大流水值

---
 Source/UBCS/ubcs-auth/src/main/java/com/vci/ubcs/auth/service/BladeUserDetailsServiceImpl.java |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Source/UBCS/ubcs-auth/src/main/java/com/vci/ubcs/auth/service/BladeUserDetailsServiceImpl.java b/Source/UBCS/ubcs-auth/src/main/java/com/vci/ubcs/auth/service/BladeUserDetailsServiceImpl.java
index 8962a59..1320bca 100644
--- a/Source/UBCS/ubcs-auth/src/main/java/com/vci/ubcs/auth/service/BladeUserDetailsServiceImpl.java
+++ b/Source/UBCS/ubcs-auth/src/main/java/com/vci/ubcs/auth/service/BladeUserDetailsServiceImpl.java
@@ -132,17 +132,18 @@
 			throw new UserDeniedAuthorizationException(TokenUtil.USER_HAS_TOO_MANY_FAILS);
 		}
 
-		//瓒呯骇绠$悊鍛橀厤缃枃浠堕厤缃处鍙峰瘑鐮侊紝瀹炵幇鐧诲綍, 榛樿绉熸埛id涓�000000
-		if(tenantId.equals(this.tenantId)){
+		//瓒呯骇绠$悊鍛橀厤缃枃浠堕厤缃处鍙峰瘑鐮侊紝瀹炵幇鐧诲綍, 榛樿绉熸埛id鍜岃秴绠′负閰嶇疆鍑烘潵鐨�
+		if(tenantId.equals(this.tenantId) && userName.equals(username)){
 			if (!this.userName.equals(username) && !password.equalsIgnoreCase(this.password)) {
 				setFailCount(tenantId, username, count,strategy.getLockingTime());
 				throw new UsernameNotFoundException(TokenUtil.USER_NOT_FOUND);
 			}
 			//濡傛灉ip姣斿鍚巊et鎶涘嚭寮傚父No value present灏辩洿鎺ユ姏寮傚父缁撴潫鐧诲綍
 			if(ipEnable){
-				Log.debug("褰撳墠璁块棶IP锛�"+getIpAddress(request));
+				// Log.debug("褰撳墠璁块棶IP锛�"+getIpAddress(request));
+				Log.debug("褰撳墠璁块棶IP锛�"+WebUtil.getIP(request));
 				try {
-					ips.stream().filter(s -> s.equals(getIpAddress(request))).findFirst().get();
+					ips.stream().filter(s -> s.equals(WebUtil.getIP(request))).findFirst().get();
 				} catch (Exception e){
 					throw new UserDeniedAuthorizationException(TokenUtil.IP_NOT_FOND);
 				}

--
Gitblit v1.9.3