From 4494a005613728c9dc22d018bca42ef5d3ebcf69 Mon Sep 17 00:00:00 2001
From: xiejun <xiejun@vci-tech.com>
Date: 星期二, 14 一月 2025 20:41:47 +0800
Subject: [PATCH] 产品型号集成,类型转换,人员组织加日志,申请接口引用码段值校验

---
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/PasswordFreeLoginServiceImpl.java |   30 ++++++++++++++++--------------
 1 files changed, 16 insertions(+), 14 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 752bf91..a4d79c9 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
@@ -4,6 +4,7 @@
 import com.vci.ubcs.code.entity.TokenUserObject;
 import com.vci.ubcs.code.service.IPasswordFreeLoginService;
 import com.vci.ubcs.starter.util.HttpUtils;
+import com.vci.ubcs.system.cache.NacosConfigCache;
 import io.jsonwebtoken.Claims;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.auth.AuthenticationException;
@@ -66,6 +67,7 @@
 
 	@Value("${password-free.secret-key:9fbd170bd83eb869}")
 	private String secretKey;//搴旂敤绉橀挜
+
 	@Autowired
 	private BladeRedis bladeRedis;
 
@@ -106,7 +108,7 @@
 		String token2 = JwtUtil.getToken(authToken);
 		BladeUser user = this.getUser(token2);
 		//涓嶅瓨鍦ㄥ氨璇锋眰
-		if(Func.isEmpty(authToken) || Func.isEmpty(user)){
+		if(Func.isEmpty(authToken) || Func.isEmpty(user) || !user.getTenantId().equals(NacosConfigCache.getAdminUserInfo().getTenantId())){
 			String responseBody = this.passwordFreeLogin(userName);
 			//鎷垮埌鍝嶅簲浣撳叾涓寘鍚玹oken,鐢╮equest涓殑ip鍦板潃浣滀负閿�硷紝灏唗oken瀛樺叆缂撳瓨
 			TokenUserObject tokenUserObject = null;
@@ -122,8 +124,9 @@
 			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);
+		request.setAttribute("Authorization",authToken);
 		return true;
 	}
 
@@ -161,26 +164,25 @@
 
 	/**
 	 * 鍗曠偣鐧诲綍
-	 * @param servletRequest
+	 * @param empCode
 	 * @return
 	 * @throws Exception
 	 */
 	@Override
-	public String ssoFreeLogin(ServletRequest servletRequest) throws Exception {
-		HttpServletRequest request = (HttpServletRequest) servletRequest;
-		String content = request.getHeader("empCode");
-		if(Func.isBlank(content)){
+	public String ssoFreeLogin(String empCode) throws Exception {
+		if(Func.isBlank(empCode)){
 			throw new ServiceException("鏈幏鍙栧埌empCode鍙傛暟");
 		}
-		//鍔犲瘑
-		String str1 = aesEncrypt(content, clientId);
-		String str2 = aesEncrypt(str1, secretKey);
-
-		String enStr1 = aesDecrypt(str2, secretKey);
-		String enStr2 = aesDecrypt(enStr1, clientId);
+		String enStr2;
+		try {
+			String enStr1 = aesDecrypt(empCode, secretKey);
+			enStr2 = aesDecrypt(enStr1, clientId);
+		}catch (Exception e){
+			throw new ServiceException("empCode鍙傛暟瑙e瘑澶辫触锛佸師鍥�:"+e.getMessage());
+		}
 		// 瑙e瘑
 		log.debug("鍗曠偣鐧诲綍鍙傛暟瑙e瘑鍚庯細"+enStr2);
-		String token = this.passwordFreeLogin("pwdfree");
+		String token = this.passwordFreeLogin(enStr2);
 		return token;
 	}
 

--
Gitblit v1.9.3