Skip to content

修改 gitee #IB254H 发送请求方法空指针异常 #3410

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
binarywang merged 7 commits into from
Nov 5, 2024
Merged

修改 gitee #IB254H 发送请求方法空指针异常 #3410

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c5c2455
同城配送相关接口
gexiangdong Oct 31, 2024
8205ce9
第三方平台设置小程序API签名
gexiangdong Oct 31, 2024
b11dde5
Merge branch 'Wechat-Group:develop' into develop
gexiangdong Oct 31, 2024
368b743
add set
gexiangdong Oct 31, 2024
4a01f31
Merge branch 'Wechat-Group:develop' into develop
gexiangdong Oct 31, 2024
e4a45d1
Merge branch 'Wechat-Group:develop' into develop
gexiangdong Nov 5, 2024
89b61aa
fix gitee issue #IB254H
gexiangdong Nov 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/BaseWxMaServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,12 +343,14 @@ public String upload(String url, CommonUploadParam param) throws WxErrorExceptio
public <R, T> R execute(RequestExecutor<R, T> executor, String uri, T data)
throws WxErrorException {
String dataForLog;
if (data instanceof String) {
if (data == null) {
dataForLog = null;
} else if (data instanceof String) {
dataForLog = DataUtils.handleDataWithSecret((String) data);
} else {
dataForLog = data.toString();
}
return excuteWithRetry(
return executeWithRetry(
(uriWithAccessToken) -> executor.execute(uriWithAccessToken, data, WxType.MiniApp),
uri,
dataForLog);
Expand All @@ -362,7 +364,7 @@ public WxMaApiResponse execute(
String data)
throws WxErrorException {
String dataForLog = "Headers: " + headers.toString() + " Body: " + data;
return excuteWithRetry(
return executeWithRetry(
(uriWithAccessToken) -> executor.execute(uriWithAccessToken, headers, data, WxType.MiniApp),
uri,
dataForLog);
Expand All @@ -372,7 +374,7 @@ private static interface ExecutorAction<R> {
R execute(String urlWithAccessToken) throws IOException, WxErrorException;
}

private <R, T> R excuteWithRetry(ExecutorAction<R> executor, String uri, String dataForLog)
private <R, T> R executeWithRetry(ExecutorAction<R> executor, String uri, String dataForLog)
throws WxErrorException {
int retryTimes = 0;
do {
Expand Down