From a8d80ddd0aef61cbaf1dbe9fe7abec12f0835399 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 01 二月 2024 14:52:14 +0800
Subject: [PATCH] 代码合并

---
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/PasswordFreeLoginServiceImpl.java |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/PasswordFreeLoginServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/PasswordFreeLoginServiceImpl.java
index 3b4a571..2cfab97 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/PasswordFreeLoginServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/PasswordFreeLoginServiceImpl.java
@@ -13,6 +13,7 @@
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.redis.cache.BladeRedis;
 import org.springblade.core.secure.BladeUser;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.support.Kv;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.ObjectUtil;
@@ -99,7 +100,7 @@
 	@Override
 	public boolean pwdFreeLoginByBoolean(String userName, ServletRequest servletRequest) throws AuthenticationException {
 		//杩涙潵鍏堝垽鏂紦瀛樹腑鏄惁瀛樺湪token
-		// 璇锋眰鏉ヨ嚜宸卞摢涓猧p鍦板潃
+		// 璇锋眰鏉ヨ嚜鍝釜ip鍦板潃
 		HttpServletRequest request = (HttpServletRequest) servletRequest;
 		String ipAddr = request.getRemoteAddr();
 		// 鍏堝皾璇曚粠缂撳瓨褰撲腑鍙栵紝瀛樺湪灏辩洿鎺ヤ粠缂撳瓨涓幏鍙�
@@ -124,7 +125,7 @@
 			token2 = JwtUtil.getToken(authToken);
 			user = this.getUser(token2);
 		}
-		//request.setAttribute("Blade-Auth",token);
+		request.setAttribute("Blade-Auth",authToken);
 		request.setAttribute("_BLADE_USER_REQUEST_ATTR_",user);
 		return true;
 	}

--
Gitblit v1.9.3