From aa3b56b8ab335277351f503b8d38e1a0a5fe7477 Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期四, 14 九月 2023 18:28:51 +0800
Subject: [PATCH] 1、处理层级码段生成问题。
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/PasswordFreeLoginServiceImpl.java | 46 ++++++++++++++++++++++++++++++++++------------
1 files changed, 34 insertions(+), 12 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 692c097..9d619a3 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
@@ -1,8 +1,12 @@
package com.vci.ubcs.code.service.impl;
import com.vci.ubcs.code.service.IPasswordFreeLoginService;
+import com.vci.ubcs.code.util.HttpUtils;
import org.apache.commons.collections4.MultiValuedMap;
import org.apache.commons.collections4.multimap.ArrayListValuedHashMap;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.client.ServiceInstance;
+import org.springframework.cloud.client.discovery.DiscoveryClient;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType;
@@ -13,6 +17,9 @@
import org.springframework.http.HttpMethod;
import org.springframework.web.client.RestTemplate;
+import javax.annotation.Resource;
+import java.util.List;
+
/**
* 鍏嶅瘑鐧诲綍鏈嶅姟
* @author ludc
@@ -21,34 +28,49 @@
@Service
public class PasswordFreeLoginServiceImpl implements IPasswordFreeLoginService {
- private RestTemplate restTemplate;
+ // 閫氳繃鏈嶅姟娉ㄥ唽涓績鑾峰彇缃戝叧鐨勭鍙ｅ彿
+ @Autowired
+ private DiscoveryClient discoveryClient;
+ /**
+ * 鑾峰彇缃戝叧绔彛
+ * @return
+ */
+ public String getGatewayPort() {
+ List<ServiceInstance> instances = discoveryClient.getInstances("ubcs-gateway");
+ if (!instances.isEmpty()) {
+ ServiceInstance gatewayInstance = instances.get(0);
+ return String.valueOf(gatewayInstance.getPort());
+ }
+ return "80";
+ }
/**
* 鍏嶅瘑鐧诲綍
- * @param account 璐﹀彿
+ * @param username 璐﹀彿
* @return
*/
@Override
- public boolean passwordFreeLogin(String account) {
+ public boolean passwordFreeLogin(String username) {
// 鍏嶅瘑鐧诲綍鎺ュ彛鍦板潃
- String loginUrl = "http://ubcs-auth/auth/login";
+ String loginUrl = "http://localhost:"+this.getGatewayPort()+"/ubcs-auth/oauth/password-free-login";
// 璁剧疆璇锋眰澶�
HttpHeaders headers = new HttpHeaders();
headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
+ headers.set("Authorization", "Basic c3dvcmQ6c3dvcmRfc2VjcmV0");
+ headers.set("Tenant-Id", "000000");
//璁剧疆璇锋眰浣撳弬鏁�
- MultiValueMap<String,String> bodyParams = new LinkedMultiValueMap<String,String>();
- bodyParams.add("account",account);
-
- // 鍒涘缓璇锋眰瀹炰綋
- HttpEntity<MultiValueMap<String, String>> requestEntity = new HttpEntity<>(bodyParams, headers);
+ MultiValueMap<String,String> parameters = new LinkedMultiValueMap<String,String>();
+ parameters.add("username",username);
+ parameters.add("grant_type", "captcha");
+ parameters.add("scope", "all");
+ parameters.add("type", "account");
// 鍙戦�丳OST璇锋眰
- ResponseEntity<String> responseEntity = restTemplate.exchange(loginUrl, HttpMethod.POST, requestEntity, String.class);
- String responseBody = responseEntity.getBody();
-
+ String responseBody = HttpUtils.post(loginUrl, parameters,headers);
+ System.out.println(responseBody);
//鎷垮埌鍝嶅簲浣撳皢token瀛樺叆鍒皉edis涓紝浠ccount浣滀负瀛樺偍鐨刱ey
// 瑙ｆ瀽鍝嶅簲浣撹幏鍙栦护鐗�
--
Gitblit v1.9.3