From 54a2167daee8db848926707a4736657989776e51 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 20 九月 2023 08:52:02 +0800
Subject: [PATCH] 代码提交

---
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/PasswordFreeLoginServiceImpl.java |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 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 7008270..69f5c13 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
@@ -3,15 +3,15 @@
 import com.alibaba.fastjson.JSON;
 import com.vci.ubcs.code.entity.TokenUserObject;
 import com.vci.ubcs.code.service.IPasswordFreeLoginService;
-import com.vci.ubcs.code.util.HttpUtils;
+import com.vci.ubcs.starter.util.HttpUtils;
 import io.jsonwebtoken.Claims;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.http.auth.AuthenticationException;
 import org.springblade.core.jwt.JwtUtil;
 import org.springblade.core.jwt.props.JwtProperties;
 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;
@@ -31,6 +31,7 @@
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 import java.util.Map;
+import java.util.logging.Logger;
 
 import static org.springblade.core.secure.utils.AuthUtil.parseJWT;
 
@@ -40,6 +41,7 @@
  * @date 2023/9/11 15:45
  */
 @Service
+@Slf4j
 public class PasswordFreeLoginServiceImpl implements IPasswordFreeLoginService {
 
 	// 閫氳繃鏈嶅姟娉ㄥ唽涓績鑾峰彇缃戝叧鐨勭鍙e彿
@@ -47,10 +49,12 @@
 	private DiscoveryClient discoveryClient;
 	// 閰嶇疆鐨勫厤瀵嗙櫥褰曠殑璐﹀彿鎵�灞炵殑绉熸埛id
 	@Value("${password-free.pwd-free-tenant-id}")
-	// 閰嶇疆鐨則oken鍦╮edis涓殑鐢熷瓨鏃堕棿
 	private String pwdFreeTenantId;
+	// 閰嶇疆鐨則oken鍦╮edis涓殑鐢熷瓨鏃堕棿
 	@Value("${password-free.token-redis-expire}")
 	private Long tokenRedisExpire;
+	@Value("${password-free.pwd-free-addr}")
+	private String pwdFreeAddr;
 	@Autowired
 	private BladeRedis bladeRedis;
 
@@ -91,7 +95,8 @@
 		//涓嶅瓨鍦ㄥ氨璇锋眰
 		if(Func.isEmpty(authToken) || Func.isEmpty(user)){
 			// 鍏嶅瘑鐧诲綍鎺ュ彛鍦板潃
-			String loginUrl = "http://localhost:"+this.getGatewayPort("ubcs-gateway")+"/ubcs-auth/oauth/token";
+			String loginUrl = "http://"+pwdFreeAddr+":"+this.getGatewayPort("ubcs-gateway")+"/ubcs-auth/oauth/token";
+			log.debug("褰撳墠鍏嶅瘑鐧诲綍璋冪敤鍦板潃锛�"+loginUrl);
 			// 璇锋眰ubcs-auth鏈嶅姟鑾峰彇token锛屽厛璁剧疆璇锋眰澶�
 			HttpHeaders headers = new HttpHeaders();
 			headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
@@ -124,7 +129,6 @@
 			token2 = JwtUtil.getToken(authToken);
 			user = this.getUser(token2);
 		}
-
 		//request.setAttribute("Blade-Auth",token);
 		request.setAttribute("_BLADE_USER_REQUEST_ATTR_",user);
 		return true;

--
Gitblit v1.9.3