From c96fbe6b0aeb413a17c429133ee6d81d138144b9 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 09 六月 2026 10:58:52 +0800
Subject: [PATCH] Merge branch '1.0' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi into 1.0
---
xp-robotaxi-push-message-boot/src/main/java/com/xiaopeng/pushMessage/utils/SubscribeMessageUtil.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/xp-robotaxi-push-message-boot/src/main/java/com/xiaopeng/pushMessage/utils/SubscribeMessageUtil.java b/xp-robotaxi-push-message-boot/src/main/java/com/xiaopeng/pushMessage/utils/SubscribeMessageUtil.java
index 1823518..4ba7783 100644
--- a/xp-robotaxi-push-message-boot/src/main/java/com/xiaopeng/pushMessage/utils/SubscribeMessageUtil.java
+++ b/xp-robotaxi-push-message-boot/src/main/java/com/xiaopeng/pushMessage/utils/SubscribeMessageUtil.java
@@ -8,6 +8,7 @@
import com.alibaba.fastjson.JSONObject;
import com.xiaopeng.api.dto.account.UserResourcesDto;
import com.xiaopeng.api.feignClient.account.SSOClient;
+import com.xiaopeng.api.vo.account.WechatAccessTokenResVo;
import com.xiaopeng.common.core.domain.R;
import com.xiaopeng.common.core.exception.ServiceException;
import com.xiaopeng.common.core.utils.StringUtils;
@@ -273,7 +274,7 @@
String getToken(Boolean isRefresh){
- UserResourcesDto wechatAccessToken = ssoClient.getWechatAccessToken(appId, wxAppletsAppid, isRefresh);
+ WechatAccessTokenResVo wechatAccessToken = ssoClient.getWechatAccessToken(appId, wxAppletsAppid, isRefresh);
if(null == wechatAccessToken){
log.info("获取微信access_token失败");
throw new ServiceException("获取微信access_token失败");
@@ -282,7 +283,7 @@
log.info("获取微信access_token失败：{}", wechatAccessToken.getMsg());
throw new ServiceException("获取微信access_token失败");
}
- String accessToken = JSON.parseObject(wechatAccessToken.getData().toString()).getString("accessToken");
+ String accessToken = wechatAccessToken.getData().getAccessToken();
return accessToken;
}
@@ -311,13 +312,13 @@
HttpResponse execute = post.execute();
if(execute.getStatus() != 200){
log.info("发送消息失败:{}", execute.body());
- throw new RuntimeException("发送消息失败");
+ return R.fail(execute.body());
}
JSONObject jsonObject = JSON.parseObject(execute.body());
Integer errcode = jsonObject.getInteger("errcode");
if(0 != errcode){
log.info("发送消息失败:{}", jsonObject.getString("errmsg"));
- throw new RuntimeException(jsonObject.getString("errmsg"));
+ return R.fail(jsonObject.getString("errmsg"));
}
return R.ok();
}
--
Gitblit v1.7.1