From 84b83aca7adb18249ea5bd5c7d35ced4b056c98a Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期四, 14 九月 2023 10:05:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/PasswordFreeLoginServiceImpl.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 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 5134140..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
@@ -47,24 +47,29 @@
/**
* 鍏嶅瘑鐧诲綍
- * @param account 璐﹀彿
+ * @param username 璐﹀彿
* @return
*/
@Override
- public boolean passwordFreeLogin(String account) {
+ public boolean passwordFreeLogin(String username) {
// 鍏嶅瘑鐧诲綍鎺ュ彛鍦板潃
- String loginUrl = "http://localhost:"+this.getGatewayPort()+"/ubcs-auth/oauth/passwordFreeLogin?username=admin&grant_type=captcha&scope=all&type=account";
+ 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);
+ 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璇锋眰
- String responseBody = HttpUtils.post(loginUrl, bodyParams);
+ String responseBody = HttpUtils.post(loginUrl, parameters,headers);
System.out.println(responseBody);
//鎷垮埌鍝嶅簲浣撳皢token瀛樺叆鍒皉edis涓紝浠ccount浣滀负瀛樺偍鐨刱ey
--
Gitblit v1.9.3