fix(channel): 修复客服上传重试与日志泄露

Author: binarywang

.superpowers/sdd/task-1-report.md

@@ -7,9 +7,11 @@
 import me.chanjar.weixin.channel.bean.kf.WxChannelKfCosUploadResponse;
 import me.chanjar.weixin.channel.bean.kf.WxChannelKfSendMsgParam;
 import me.chanjar.weixin.channel.bean.kf.WxChannelKfSendMsgResponse;
+import me.chanjar.weixin.channel.util.JsonUtils;
 import me.chanjar.weixin.channel.util.ResponseUtils;
 import me.chanjar.weixin.common.bean.CommonUploadParam;
 import me.chanjar.weixin.common.error.WxErrorException;
+import me.chanjar.weixin.common.util.http.SimplePostRequestExecutor;
 
 /** 视频号小店商家客服服务实现。 */
 public class WxChannelKfServiceImpl implements WxChannelKfService {
@@ -36,7 +38,8 @@ public String uploadMedia(String openId, String msgType, String fileName, byte[]
 
   @Override
   public WxChannelKfSendMsgResponse sendMessage(WxChannelKfSendMsgParam param) throws WxErrorException {
-    String responseJson = channelService.post(SEND_MSG_URL, param);
+    String responseJson = channelService.executeWithoutLog(SimplePostRequestExecutor.create(channelService), SEND_MSG_URL,
+      JsonUtils.encode(param));
     return ResponseUtils.decode(responseJson, WxChannelKfSendMsgResponse.class);
   }
 }

.superpowers/sdd/task-2-report.md

@@ -4,11 +4,15 @@
 import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.assertSame;
 
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
 import me.chanjar.weixin.channel.bean.kf.WxChannelKfSendMsgParam;
 import me.chanjar.weixin.channel.bean.kf.WxChannelKfSendMsgResponse;
 import me.chanjar.weixin.channel.util.JsonUtils;
 import me.chanjar.weixin.common.bean.CommonUploadParam;
 import me.chanjar.weixin.common.error.WxErrorException;
+import me.chanjar.weixin.common.util.http.RequestExecutor;
 import org.testng.annotations.Test;
 
 /** 商家客服服务离线测试。 */
@@ -49,10 +53,19 @@ public void shouldSendJsonMessageAndDecodeResponse() throws WxErrorException {
     assertEquals(channelService.postUrl, "https://api.weixin.qq.com/channels/ec/commkf/sendmsg");
     assertEquals(channelService.postJson,
       "{\"request_id\":\"request-id\",\"open_id\":\"open-id\",\"msg_type\":\"text\",\"text\":{\"content\":\"hello\"}}");
+    assertEquals(channelService.executeWithoutLogCalled, true);
     assertEquals(response.getMsgId(), "message-id");
     assertEquals(response.getErrCode(), 0);
   }
 
+  @Test
+  public void shouldProvideFreshUploadStreamForEachAttempt() throws IOException {
+    CommonUploadParam uploadParam = CommonUploadParam.fromBytes("file", "image.png", new byte[]{1, 2, 3});
+
+    assertEquals(readAllBytes(uploadParam.getData().getInputStream()), new byte[]{1, 2, 3});
+    assertEquals(readAllBytes(uploadParam.getData().getInputStream()), new byte[]{1, 2, 3});
+  }
+
   @Test
   public void shouldCacheKfServiceEntryPoint() {
     WxChannelServiceImpl channelService = new WxChannelServiceImpl();
@@ -68,6 +81,7 @@ private static class RecordingChannelService extends WxChannelServiceImpl {
     private CommonUploadParam uploadParam;
     private String postUrl;
     private String postJson;
+    private boolean executeWithoutLogCalled;
 
     @Override
     public String upload(String url, CommonUploadParam param) {
@@ -82,5 +96,25 @@ public String post(String url, Object obj) {
       this.postJson = JsonUtils.encode(obj);
       return postResult;
     }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public <T, E> T executeWithoutLog(RequestExecutor<T, E> executor, String uri, E data) {
+      this.executeWithoutLogCalled = true;
+      this.postUrl = uri;
+      this.postJson = (String) data;
+      return (T) postResult;
+    }
+  }
+
+  private byte[] readAllBytes(InputStream inputStream) throws IOException {
+    try (InputStream stream = inputStream; ByteArrayOutputStream outputStream = new ByteArrayOutputStream()) {
+      byte[] buffer = new byte[16];
+      int count;
+      while ((count = stream.read(buffer)) != -1) {
+        outputStream.write(buffer, 0, count);
+      }
+      return outputStream.toByteArray();
+    }
   }
 }

weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxChannelKfServiceImpl.java

@@ -78,7 +78,27 @@ public static CommonUploadParam fromFile(String name, File file) {
    */
   @SneakyThrows
   public static CommonUploadParam fromBytes(String name, @Nullable String fileName, byte[] bytes) {
-    return new CommonUploadParam(name, new CommonUploadData(fileName, new ByteArrayInputStream(bytes), bytes.length), null);
+    return new CommonUploadParam(name, new ByteArrayUploadData(fileName, bytes), null);
+  }
+
+  private static class ByteArrayUploadData extends CommonUploadData {
+
+    private final byte[] bytes;
+
+    private ByteArrayUploadData(@Nullable String fileName, byte[] bytes) {
+      super(fileName, new ByteArrayInputStream(bytes), bytes.length);
+      this.bytes = bytes;
+    }
+
+    @Override
+    public ByteArrayInputStream getInputStream() {
+      return new ByteArrayInputStream(bytes);
+    }
+
+    @Override
+    public byte[] readAllBytes() {
+      return bytes.clone();
+    }
   }
 
   /**