🆕 【开放平台】接入小程序认证（年审）相关接口，同时增加公共的文件上传方法

weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/BaseWxMaServiceImpl.java

@@ -12,12 +12,14 @@ import com.google.gson.Gson;
 import com.google.gson.JsonObject;
 import lombok.extern.slf4j.Slf4j;
 import me.chanjar.weixin.common.api.WxConsts;
+import me.chanjar.weixin.common.bean.CommonUploadParam;
 import me.chanjar.weixin.common.bean.ToJson;
 import me.chanjar.weixin.common.bean.WxAccessToken;
 import me.chanjar.weixin.common.enums.WxType;
 import me.chanjar.weixin.common.error.WxError;
 import me.chanjar.weixin.common.error.WxErrorException;
 import me.chanjar.weixin.common.error.WxRuntimeException;
+import me.chanjar.weixin.common.executor.CommonUploadRequestExecutor;
 import me.chanjar.weixin.common.service.WxImgProcService;
 import me.chanjar.weixin.common.service.WxOcrService;
 import me.chanjar.weixin.common.util.DataUtils;
@@ -237,6 +239,12 @@ public abstract class BaseWxMaServiceImpl<H, P> implements WxMaService, RequestH
     return this.post(url, obj.toJson());
   }
 
+  @Override
+  public String upload(String url, CommonUploadParam param) throws WxErrorException {
+    RequestExecutor<String, CommonUploadParam> executor = CommonUploadRequestExecutor.create(getRequestHttp());
+    return this.execute(executor, url, param);
+  }
+
   @Override
   public String post(String url, JsonObject jsonObject) throws WxErrorException {
     return this.post(url, jsonObject.toString());
@@ -378,7 +386,7 @@ public abstract class BaseWxMaServiceImpl<H, P> implements WxMaService, RequestH
   @JsonDeserialize
   public void setMultiConfigs(Map<String, WxMaConfig> configs, String defaultMiniappId) {
     // 防止覆盖配置
-    if(this.configMap != null) {
+    if (this.configMap != null) {
       this.configMap.putAll(configs);
     } else {
       this.configMap = Maps.newHashMap(configs);
@@ -689,7 +697,7 @@ public abstract class BaseWxMaServiceImpl<H, P> implements WxMaService, RequestH
   }
 
   @Override
-  public WxMaExpressDeliveryReturnService getWxMaExpressDeliveryReturnService(){
+  public WxMaExpressDeliveryReturnService getWxMaExpressDeliveryReturnService() {
     return this.wxMaExpressDeliveryReturnService;
   }
 }

weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaMediaServiceImpl.java

@@ -3,12 +3,12 @@ package cn.binarywang.wx.miniapp.api.impl;
 import cn.binarywang.wx.miniapp.api.WxMaMediaService;
 import cn.binarywang.wx.miniapp.api.WxMaService;
 import lombok.RequiredArgsConstructor;
+import me.chanjar.weixin.common.bean.CommonUploadParam;
 import me.chanjar.weixin.common.bean.result.WxMediaUploadResult;
 import me.chanjar.weixin.common.error.WxError;
 import me.chanjar.weixin.common.error.WxErrorException;
 import me.chanjar.weixin.common.util.fs.FileUtils;
 import me.chanjar.weixin.common.util.http.BaseMediaDownloadRequestExecutor;
-import me.chanjar.weixin.common.util.http.MediaUploadRequestExecutor;
 import me.chanjar.weixin.common.util.http.RequestExecutor;
 
 import java.io.File;
@@ -38,8 +38,10 @@ public class WxMaMediaServiceImpl implements WxMaMediaService {
 
   @Override
   public WxMediaUploadResult uploadMedia(String mediaType, File file) throws WxErrorException {
+//    return this.wxMaService.execute(MediaUploadRequestExecutor.create(this.wxMaService.getRequestHttp()), url, file);
     String url = String.format(MEDIA_UPLOAD_URL, mediaType);
-    return this.wxMaService.execute(MediaUploadRequestExecutor.create(this.wxMaService.getRequestHttp()), url, file);
+    String result = wxMaService.upload(url, CommonUploadParam.fromFile("media", file));
+    return WxMediaUploadResult.fromJson(result);
   }
 
   @Override

weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/executor/ApacheAuditMediaUploadRequestExecutor.java

@@ -1,58 +0,0 @@
-package cn.binarywang.wx.miniapp.executor;
-
-import java.io.File;
-import java.io.IOException;
-
-import me.chanjar.weixin.common.enums.WxType;
-import me.chanjar.weixin.common.error.WxError;
-import me.chanjar.weixin.common.error.WxErrorException;
-import me.chanjar.weixin.common.util.http.RequestHttp;
-
-import me.chanjar.weixin.common.util.http.apache.Utf8ResponseHandler;
-import cn.binarywang.wx.miniapp.bean.WxMaAuditMediaUploadResult;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpHost;
-import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.entity.mime.HttpMultipartMode;
-import org.apache.http.entity.mime.MultipartEntityBuilder;
-import org.apache.http.impl.client.CloseableHttpClient;
-
-/**
- * @author yangyh22
- * @since 2020/11/14
- */
-public class ApacheAuditMediaUploadRequestExecutor extends AuditMediaUploadRequestExecutor<CloseableHttpClient, HttpHost> {
-
-  public ApacheAuditMediaUploadRequestExecutor(RequestHttp requestHttp) {
-    super(requestHttp);
-  }
-
-  @Override
-  public WxMaAuditMediaUploadResult execute(String uri, File file, WxType wxType) throws WxErrorException, IOException {
-    HttpPost httpPost = new HttpPost(uri);
-    if (requestHttp.getRequestHttpProxy() != null) {
-      RequestConfig config = RequestConfig.custom().setProxy(requestHttp.getRequestHttpProxy()).build();
-      httpPost.setConfig(config);
-    }
-    if (file != null) {
-      HttpEntity entity = MultipartEntityBuilder
-        .create()
-        .addBinaryBody("media", file)
-        .setMode(HttpMultipartMode.RFC6532)
-        .build();
-      httpPost.setEntity(entity);
-    }
-    try (CloseableHttpResponse response = requestHttp.getRequestHttpClient().execute(httpPost)) {
-      String responseContent = Utf8ResponseHandler.INSTANCE.handleResponse(response);
-      WxError error = WxError.fromJson(responseContent, wxType);
-      if (error.getErrorCode() != 0) {
-        throw new WxErrorException(error);
-      }
-      return WxMaAuditMediaUploadResult.fromJson(responseContent);
-    } finally {
-      httpPost.releaseConnection();
-    }
-  }
-}

weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/executor/AuditMediaUploadRequestExecutor.java

@@ -1,47 +0,0 @@
-package cn.binarywang.wx.miniapp.executor;
-
-import java.io.File;
-import java.io.IOException;
-
-import me.chanjar.weixin.common.util.http.RequestExecutor;
-import me.chanjar.weixin.common.util.http.RequestHttp;
-import me.chanjar.weixin.common.util.http.ResponseHandler;
-import me.chanjar.weixin.common.enums.WxType;
-import me.chanjar.weixin.common.error.WxErrorException;
-import cn.binarywang.wx.miniapp.bean.WxMaAuditMediaUploadResult;
-
-/**
- * 小程序 提审素材上传接口
- * 上传媒体文件请求执行器.
- * 请求的参数是File, 返回的结果是String
- *
- * @author yangyh22
- * @since 2020/11/14
- */
-public abstract class AuditMediaUploadRequestExecutor<H, P> implements RequestExecutor<WxMaAuditMediaUploadResult, File> {
-
-  protected RequestHttp<H, P> requestHttp;
-
-  public AuditMediaUploadRequestExecutor(RequestHttp requestHttp) {
-    this.requestHttp = requestHttp;
-  }
-
-  @Override
-  public void execute(String uri, File data, ResponseHandler<WxMaAuditMediaUploadResult> handler, WxType wxType) throws WxErrorException, IOException {
-    handler.handle(this.execute(uri, data, wxType));
-  }
-
-  public static RequestExecutor<WxMaAuditMediaUploadResult, File> create(RequestHttp requestHttp) {
-    switch (requestHttp.getRequestType()) {
-      case APACHE_HTTP:
-        return new ApacheAuditMediaUploadRequestExecutor(requestHttp);
-      case JODD_HTTP:
-        return new JoddHttpAuditMediaUploadRequestExecutor(requestHttp);
-      case OK_HTTP:
-        return new OkHttpAuditMediaUploadRequestExecutor(requestHttp);
-      default:
-        return null;
-    }
-  }
-
-}

weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/executor/JoddHttpAuditMediaUploadRequestExecutor.java

@@ -1,45 +0,0 @@
-package cn.binarywang.wx.miniapp.executor;
-
-import java.io.File;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-
-import jodd.http.HttpConnectionProvider;
-import jodd.http.HttpRequest;
-import jodd.http.HttpResponse;
-import jodd.http.ProxyInfo;
-import me.chanjar.weixin.common.enums.WxType;
-import me.chanjar.weixin.common.error.WxError;
-import me.chanjar.weixin.common.error.WxErrorException;
-import me.chanjar.weixin.common.util.http.RequestHttp;
-import cn.binarywang.wx.miniapp.bean.WxMaAuditMediaUploadResult;
-
-/**
- * @author yangyh22
- * @since 2020/11/14
- */
-public class JoddHttpAuditMediaUploadRequestExecutor extends AuditMediaUploadRequestExecutor<HttpConnectionProvider, ProxyInfo> {
-
-  public JoddHttpAuditMediaUploadRequestExecutor(RequestHttp requestHttp) {
-    super(requestHttp);
-  }
-
-  @Override
-  public WxMaAuditMediaUploadResult execute(String uri, File file, WxType wxType) throws WxErrorException, IOException {
-    HttpRequest request = HttpRequest.post(uri);
-    if (requestHttp.getRequestHttpProxy() != null) {
-      requestHttp.getRequestHttpClient().useProxy(requestHttp.getRequestHttpProxy());
-    }
-    request.withConnectionProvider(requestHttp.getRequestHttpClient());
-    request.form("media", file);
-    HttpResponse response = request.send();
-    response.charset(StandardCharsets.UTF_8.name());
-
-    String responseContent = response.bodyText();
-    WxError error = WxError.fromJson(responseContent, wxType);
-    if (error.getErrorCode() != 0) {
-      throw new WxErrorException(error);
-    }
-    return WxMaAuditMediaUploadResult.fromJson(responseContent);
-  }
-}

weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/executor/OkHttpAuditMediaUploadRequestExecutor.java

@@ -1,49 +0,0 @@
-package cn.binarywang.wx.miniapp.executor;
-
-import java.io.File;
-import java.io.IOException;
-
-import me.chanjar.weixin.common.enums.WxType;
-import me.chanjar.weixin.common.error.WxError;
-import me.chanjar.weixin.common.error.WxErrorException;
-import me.chanjar.weixin.common.util.http.RequestHttp;
-import cn.binarywang.wx.miniapp.bean.WxMaAuditMediaUploadResult;
-import me.chanjar.weixin.common.util.http.okhttp.OkHttpProxyInfo;
-import okhttp3.MediaType;
-import okhttp3.MultipartBody;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.RequestBody;
-import okhttp3.Response;
-
-/**
- * @author yangyh22
- * @since 2020/11/14
- */
-public class OkHttpAuditMediaUploadRequestExecutor extends AuditMediaUploadRequestExecutor<OkHttpClient, OkHttpProxyInfo> {
-
-  public OkHttpAuditMediaUploadRequestExecutor(RequestHttp requestHttp) {
-    super(requestHttp);
-  }
-
-  @Override
-  public WxMaAuditMediaUploadResult execute(String uri, File file, WxType wxType) throws WxErrorException, IOException {
-
-    RequestBody body = new MultipartBody.Builder()
-      .setType(MediaType.parse("multipart/form-data"))
-      .addFormDataPart("media",
-        file.getName(),
-        RequestBody.create(MediaType.parse("application/octet-stream"), file))
-      .build();
-    Request request = new Request.Builder().url(uri).post(body).build();
-
-    Response response = requestHttp.getRequestHttpClient().newCall(request).execute();
-    String responseContent = response.body().string();
-    WxError error = WxError.fromJson(responseContent, wxType);
-    if (error.getErrorCode() != 0) {
-      throw new WxErrorException(error);
-    }
-    return WxMaAuditMediaUploadResult.fromJson(responseContent);
-  }
-
-}

weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/api/impl/WxMaLiveGoodsServiceImplTest.java

@@ -30,7 +30,8 @@ public class WxMaLiveGoodsServiceImplTest {
   @Test
   public void addGoods() throws Exception {
     //上传临时素材
-    WxMediaUploadResult mediaUpload = this.wxService.getMediaService().uploadMedia("image", new File("E:\\1.png"));
+    WxMediaUploadResult mediaUpload = this.wxService.getMediaService()
+      .uploadMedia("image", new File("./static/temp.jpg"));
 
     WxMaLiveGoodInfo goods = new WxMaLiveGoodInfo();
     goods.setCoverImgUrl(mediaUpload.getMediaId());

weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/api/impl/WxMaServiceImplTest.java

@@ -5,6 +5,8 @@ import cn.binarywang.wx.miniapp.config.WxMaConfig;
 import cn.binarywang.wx.miniapp.config.impl.WxMaDefaultConfigImpl;
 import cn.binarywang.wx.miniapp.test.ApiTestModule;
 import com.google.inject.Inject;
+import lombok.SneakyThrows;
+import me.chanjar.weixin.common.bean.CommonUploadParam;
 import me.chanjar.weixin.common.bean.WxAccessTokenEntity;
 import me.chanjar.weixin.common.error.WxError;
 import me.chanjar.weixin.common.error.WxErrorException;
@@ -16,6 +18,7 @@ import org.testng.Assert;
 import org.testng.annotations.Guice;
 import org.testng.annotations.Test;
 
+import java.io.File;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -184,6 +187,14 @@ public class WxMaServiceImplTest {
     }
   }
 
+  @SneakyThrows
+  @Test
+  public void upload() {
+    CommonUploadParam param = CommonUploadParam.fromFile("media", new File("./static/1.jpg"));
+    String result = wxService.upload("https://api.weixin.qq.com/wxa/sec/uploadauthmaterial", param);
+    System.out.println(result);
+  }
+
   @Test
   public void testGetWxMaConfig() {
   }