From 9c6fca77e64abb210b2c74f2af95a8d0a3f4bca0 Mon Sep 17 00:00:00 2001
From: GeXiangDong <gexiangdong@users.noreply.github.com>
Date: Tue, 5 Nov 2024 19:30:51 +0800
Subject: [PATCH] =?UTF-8?q?:bug:=20=E4=BF=AE=E5=A4=8D=E5=B0=8F=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=8F=E5=8F=91=E9=80=81=E8=AF=B7=E6=B1=82=E6=96=B9=E6=B3=95?=
 =?UTF-8?q?=E7=A9=BA=E6=8C=87=E9=92=88=E5=BC=82=E5=B8=B8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wx/miniapp/api/impl/BaseWxMaServiceImpl.java       | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/BaseWxMaServiceImpl.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/BaseWxMaServiceImpl.java
index a9114465a..00f848e31 100644
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/BaseWxMaServiceImpl.java
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/BaseWxMaServiceImpl.java
@@ -343,12 +343,14 @@ public abstract class BaseWxMaServiceImpl<H, P> implements WxMaService, RequestH
   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);
@@ -362,7 +364,7 @@ public abstract class BaseWxMaServiceImpl<H, P> implements WxMaService, RequestH
       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);
@@ -372,7 +374,7 @@ public abstract class BaseWxMaServiceImpl<H, P> implements WxMaService, RequestH
     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 {