From 23f6214ce4b7c918e46679820d41128507631eef Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 26 五月 2026 09:24:51 +0800
Subject: [PATCH] 合并代码
---
xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/controller/XtigerSSOController.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/controller/XtigerSSOController.java b/xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/controller/XtigerSSOController.java
index 7881096..13770db 100644
--- a/xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/controller/XtigerSSOController.java
+++ b/xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/controller/XtigerSSOController.java
@@ -98,13 +98,13 @@
*/
@GetMapping("/maintenance-app/ssoAuthSdk/appLogin")
public R<?> appLogin(Integer deviceType, HttpServletRequest request){
- String accessTokenHeader = request.getHeader("Authorization");
+ String accessTokenHeader = request.getHeader("XP-TOKEN");
log.info("运维APP登录, accessTokenHeader: {}", accessTokenHeader);
String accessToken = StringUtils.isEmpty(accessTokenHeader) ? null : accessTokenHeader.replace("Bearer ", "");
if(StringUtils.isEmpty(accessToken)){
throw new ServiceException("登录失败，请稍后重试。");
}
- OIDCAppUserInfoVo userInfo = getAppUserInfo(request);
+ OIDCAppUserInfoVo userInfo = getAppUserInfo(request, accessToken);
return appLogin(userInfo, deviceType, request);
}
@@ -141,23 +141,24 @@
}
- public OIDCAppUserInfoVo getAppUserInfo(HttpServletRequest request) {
- log.info("翼虎登录使用token获取用户信息");
+ public OIDCAppUserInfoVo getAppUserInfo(HttpServletRequest request, String accessToken) {
+ log.info("APP翼虎登录使用token获取用户信息");
HttpRequest post = HttpUtil.createGet(issuer + "/xtiger/app/userinfo");
- post.header("Authorization", "Bearer " + request.getHeader("Authorization"));
+ post.header("Authorization", "Bearer " + accessToken);
post.header("Content-Type", "application/json");
post.header("XT-Client-Type", request.getHeader("XT-Client-Type"));
post.header("XT-DeviceId", request.getHeader("XT-DeviceId"));
post.header("XT-AppId", request.getHeader("XT-AppId"));
post.header("XT-Signature", request.getHeader("XT-Signature"));
post.header("XT-Nonce", request.getHeader("XT-Nonce"));
+ post.header("Client-Type", "PC");
log.info("请求参数：{}", post.headers());
HttpResponse execute = post.execute();
if(!execute.isOk()){
throw new ServiceException("登录失败，请稍后重试。");
}
String body = execute.body();
- log.info("翼虎登录使用token获取用户信息, 返回结果: {}", body);
+ log.info("APP翼虎登录使用token获取用户信息, 返回结果: {}", body);
JSONObject jsonObject = JSON.parseObject(body);
Integer code = jsonObject.getInteger("code");
if(null != code && 200 != code){
--
Gitblit v1.7.1