| @@ -12,7 +12,8 @@ import me.chanjar.weixin.common.util.json.WxGsonBuilder; | |||||
| import me.chanjar.weixin.mp.api.WxMpMaterialService; | import me.chanjar.weixin.mp.api.WxMpMaterialService; | ||||
| import me.chanjar.weixin.mp.api.WxMpService; | import me.chanjar.weixin.mp.api.WxMpService; | ||||
| import me.chanjar.weixin.mp.bean.material.*; | import me.chanjar.weixin.mp.bean.material.*; | ||||
| import me.chanjar.weixin.mp.util.http.*; | |||||
| import me.chanjar.weixin.mp.util.requestexecuter.material.*; | |||||
| import me.chanjar.weixin.mp.util.requestexecuter.media.MediaImgUploadRequestExecutor; | |||||
| import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder; | import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder; | ||||
| import java.io.File; | import java.io.File; | ||||
| @@ -6,7 +6,7 @@ import me.chanjar.weixin.common.error.WxErrorException; | |||||
| import me.chanjar.weixin.mp.api.WxMpQrcodeService; | import me.chanjar.weixin.mp.api.WxMpQrcodeService; | ||||
| import me.chanjar.weixin.mp.api.WxMpService; | import me.chanjar.weixin.mp.api.WxMpService; | ||||
| import me.chanjar.weixin.mp.bean.result.WxMpQrCodeTicket; | import me.chanjar.weixin.mp.bean.result.WxMpQrCodeTicket; | ||||
| import me.chanjar.weixin.mp.util.http.QrCodeRequestExecutor; | |||||
| import me.chanjar.weixin.mp.util.requestexecuter.qrcode.QrCodeRequestExecutor; | |||||
| import org.apache.commons.lang3.StringUtils; | import org.apache.commons.lang3.StringUtils; | ||||
| import java.io.File; | import java.io.File; | ||||
| @@ -1,4 +1,4 @@ | |||||
| package me.chanjar.weixin.mp.util.http.apache; | |||||
| package me.chanjar.weixin.mp.util.requestexecuter.material; | |||||
| import me.chanjar.weixin.common.WxType; | import me.chanjar.weixin.common.WxType; | ||||
| import me.chanjar.weixin.common.error.WxError; | import me.chanjar.weixin.common.error.WxError; | ||||
| @@ -6,7 +6,6 @@ import me.chanjar.weixin.common.error.WxErrorException; | |||||
| import me.chanjar.weixin.common.util.http.RequestHttp; | import me.chanjar.weixin.common.util.http.RequestHttp; | ||||
| import me.chanjar.weixin.common.util.http.apache.Utf8ResponseHandler; | import me.chanjar.weixin.common.util.http.apache.Utf8ResponseHandler; | ||||
| import me.chanjar.weixin.common.util.json.WxGsonBuilder; | import me.chanjar.weixin.common.util.json.WxGsonBuilder; | ||||
| import me.chanjar.weixin.mp.util.http.MaterialDeleteRequestExecutor; | |||||
| import org.apache.http.HttpHost; | import org.apache.http.HttpHost; | ||||
| import org.apache.http.client.config.RequestConfig; | import org.apache.http.client.config.RequestConfig; | ||||
| import org.apache.http.client.methods.CloseableHttpResponse; | import org.apache.http.client.methods.CloseableHttpResponse; | ||||
| @@ -21,8 +20,8 @@ import java.util.Map; | |||||
| /** | /** | ||||
| * Created by ecoolper on 2017/5/5. | * Created by ecoolper on 2017/5/5. | ||||
| */ | */ | ||||
| public class ApacheMaterialDeleteRequestExecutor extends MaterialDeleteRequestExecutor<CloseableHttpClient, HttpHost> { | |||||
| public ApacheMaterialDeleteRequestExecutor(RequestHttp requestHttp) { | |||||
| public class MaterialDeleteApacheHttpRequestExecutor extends MaterialDeleteRequestExecutor<CloseableHttpClient, HttpHost> { | |||||
| public MaterialDeleteApacheHttpRequestExecutor(RequestHttp requestHttp) { | |||||
| super(requestHttp); | super(requestHttp); | ||||
| } | } | ||||
| @@ -1,4 +1,4 @@ | |||||
| package me.chanjar.weixin.mp.util.http.jodd; | |||||
| package me.chanjar.weixin.mp.util.requestexecuter.material; | |||||
| import jodd.http.HttpConnectionProvider; | import jodd.http.HttpConnectionProvider; | ||||
| import jodd.http.HttpRequest; | import jodd.http.HttpRequest; | ||||
| @@ -10,15 +10,14 @@ import me.chanjar.weixin.common.WxType; | |||||
| import me.chanjar.weixin.common.error.WxError; | import me.chanjar.weixin.common.error.WxError; | ||||
| import me.chanjar.weixin.common.error.WxErrorException; | import me.chanjar.weixin.common.error.WxErrorException; | ||||
| import me.chanjar.weixin.common.util.http.RequestHttp; | import me.chanjar.weixin.common.util.http.RequestHttp; | ||||
| import me.chanjar.weixin.mp.util.http.MaterialDeleteRequestExecutor; | |||||
| import java.io.IOException; | import java.io.IOException; | ||||
| /** | /** | ||||
| * Created by ecoolper on 2017/5/5. | * Created by ecoolper on 2017/5/5. | ||||
| */ | */ | ||||
| public class JoddMaterialDeleteRequestExecutor extends MaterialDeleteRequestExecutor<HttpConnectionProvider, ProxyInfo> { | |||||
| public JoddMaterialDeleteRequestExecutor(RequestHttp requestHttp) { | |||||
| public class MaterialDeleteJoddHttpRequestExecutor extends MaterialDeleteRequestExecutor<HttpConnectionProvider, ProxyInfo> { | |||||
| public MaterialDeleteJoddHttpRequestExecutor(RequestHttp requestHttp) { | |||||
| super(requestHttp); | super(requestHttp); | ||||
| } | } | ||||
| @@ -1,11 +1,10 @@ | |||||
| package me.chanjar.weixin.mp.util.http.okhttp; | |||||
| package me.chanjar.weixin.mp.util.requestexecuter.material; | |||||
| import me.chanjar.weixin.common.WxType; | import me.chanjar.weixin.common.WxType; | ||||
| import me.chanjar.weixin.common.error.WxError; | import me.chanjar.weixin.common.error.WxError; | ||||
| import me.chanjar.weixin.common.error.WxErrorException; | import me.chanjar.weixin.common.error.WxErrorException; | ||||
| import me.chanjar.weixin.common.util.http.RequestHttp; | import me.chanjar.weixin.common.util.http.RequestHttp; | ||||
| import me.chanjar.weixin.common.util.http.okhttp.OkHttpProxyInfo; | import me.chanjar.weixin.common.util.http.okhttp.OkHttpProxyInfo; | ||||
| import me.chanjar.weixin.mp.util.http.MaterialDeleteRequestExecutor; | |||||
| import okhttp3.*; | import okhttp3.*; | ||||
| import org.slf4j.Logger; | import org.slf4j.Logger; | ||||
| import org.slf4j.LoggerFactory; | import org.slf4j.LoggerFactory; | ||||
| @@ -15,17 +14,17 @@ import java.io.IOException; | |||||
| /** | /** | ||||
| * Created by ecoolper on 2017/5/5. | * Created by ecoolper on 2017/5/5. | ||||
| */ | */ | ||||
| public class OkhttpMaterialDeleteRequestExecutor extends MaterialDeleteRequestExecutor<OkHttpClient, OkHttpProxyInfo> { | |||||
| public class MaterialDeleteOkhttpRequestExecutor extends MaterialDeleteRequestExecutor<OkHttpClient, OkHttpProxyInfo> { | |||||
| private final Logger logger = LoggerFactory.getLogger(this.getClass()); | private final Logger logger = LoggerFactory.getLogger(this.getClass()); | ||||
| public OkhttpMaterialDeleteRequestExecutor(RequestHttp requestHttp) { | |||||
| public MaterialDeleteOkhttpRequestExecutor(RequestHttp requestHttp) { | |||||
| super(requestHttp); | super(requestHttp); | ||||
| } | } | ||||
| @Override | @Override | ||||
| public Boolean execute(String uri, String materialId) throws WxErrorException, IOException { | public Boolean execute(String uri, String materialId) throws WxErrorException, IOException { | ||||
| logger.debug("OkhttpMaterialDeleteRequestExecutor is running"); | |||||
| logger.debug("MaterialDeleteOkhttpRequestExecutor is running"); | |||||
| //得到httpClient | //得到httpClient | ||||
| OkHttpClient client = requestHttp.getRequestHttpClient(); | OkHttpClient client = requestHttp.getRequestHttpClient(); | ||||
| @@ -1,10 +1,7 @@ | |||||
| package me.chanjar.weixin.mp.util.http; | |||||
| package me.chanjar.weixin.mp.util.requestexecuter.material; | |||||
| import me.chanjar.weixin.common.util.http.RequestExecutor; | import me.chanjar.weixin.common.util.http.RequestExecutor; | ||||
| import me.chanjar.weixin.common.util.http.RequestHttp; | import me.chanjar.weixin.common.util.http.RequestHttp; | ||||
| import me.chanjar.weixin.mp.util.http.apache.ApacheMaterialDeleteRequestExecutor; | |||||
| import me.chanjar.weixin.mp.util.http.jodd.JoddMaterialDeleteRequestExecutor; | |||||
| import me.chanjar.weixin.mp.util.http.okhttp.OkhttpMaterialDeleteRequestExecutor; | |||||
| public abstract class MaterialDeleteRequestExecutor<H, P> implements RequestExecutor<Boolean, String> { | public abstract class MaterialDeleteRequestExecutor<H, P> implements RequestExecutor<Boolean, String> { | ||||
| protected RequestHttp<H, P> requestHttp; | protected RequestHttp<H, P> requestHttp; | ||||
| @@ -16,11 +13,11 @@ public abstract class MaterialDeleteRequestExecutor<H, P> implements RequestExec | |||||
| public static RequestExecutor<Boolean, String> create(RequestHttp requestHttp) { | public static RequestExecutor<Boolean, String> create(RequestHttp requestHttp) { | ||||
| switch (requestHttp.getRequestType()) { | switch (requestHttp.getRequestType()) { | ||||
| case APACHE_HTTP: | case APACHE_HTTP: | ||||
| return new ApacheMaterialDeleteRequestExecutor(requestHttp); | |||||
| return new MaterialDeleteApacheHttpRequestExecutor(requestHttp); | |||||
| case JODD_HTTP: | case JODD_HTTP: | ||||
| return new JoddMaterialDeleteRequestExecutor(requestHttp); | |||||
| return new MaterialDeleteJoddHttpRequestExecutor(requestHttp); | |||||
| case OK_HTTP: | case OK_HTTP: | ||||
| return new OkhttpMaterialDeleteRequestExecutor(requestHttp); | |||||
| return new MaterialDeleteOkhttpRequestExecutor(requestHttp); | |||||
| default: | default: | ||||
| return null; | return null; | ||||
| } | } | ||||
| @@ -1,4 +1,4 @@ | |||||
| package me.chanjar.weixin.mp.util.http.apache; | |||||
| package me.chanjar.weixin.mp.util.requestexecuter.material; | |||||
| import com.google.common.collect.ImmutableMap; | import com.google.common.collect.ImmutableMap; | ||||
| import me.chanjar.weixin.common.WxType; | import me.chanjar.weixin.common.WxType; | ||||
| @@ -8,7 +8,6 @@ import me.chanjar.weixin.common.util.http.RequestHttp; | |||||
| import me.chanjar.weixin.common.util.http.apache.Utf8ResponseHandler; | import me.chanjar.weixin.common.util.http.apache.Utf8ResponseHandler; | ||||
| import me.chanjar.weixin.common.util.json.WxGsonBuilder; | import me.chanjar.weixin.common.util.json.WxGsonBuilder; | ||||
| import me.chanjar.weixin.mp.bean.material.WxMpMaterialNews; | import me.chanjar.weixin.mp.bean.material.WxMpMaterialNews; | ||||
| import me.chanjar.weixin.mp.util.http.MaterialNewsInfoRequestExecutor; | |||||
| import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder; | import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder; | ||||
| import org.apache.http.HttpHost; | import org.apache.http.HttpHost; | ||||
| import org.apache.http.client.config.RequestConfig; | import org.apache.http.client.config.RequestConfig; | ||||
| @@ -27,11 +26,11 @@ import java.io.IOException; | |||||
| * @author ecoolper | * @author ecoolper | ||||
| * @date 2017/5/5 | * @date 2017/5/5 | ||||
| */ | */ | ||||
| public class ApacheMaterialNewsInfoRequestExecutor | |||||
| public class MaterialNewsInfoApacheHttpRequestExecutor | |||||
| extends MaterialNewsInfoRequestExecutor<CloseableHttpClient, HttpHost> { | extends MaterialNewsInfoRequestExecutor<CloseableHttpClient, HttpHost> { | ||||
| private final Logger logger = LoggerFactory.getLogger(this.getClass()); | private final Logger logger = LoggerFactory.getLogger(this.getClass()); | ||||
| public ApacheMaterialNewsInfoRequestExecutor(RequestHttp requestHttp) { | |||||
| public MaterialNewsInfoApacheHttpRequestExecutor(RequestHttp requestHttp) { | |||||
| super(requestHttp); | super(requestHttp); | ||||
| } | } | ||||
| @@ -1,4 +1,4 @@ | |||||
| package me.chanjar.weixin.mp.util.http.jodd; | |||||
| package me.chanjar.weixin.mp.util.requestexecuter.material; | |||||
| import com.google.common.collect.ImmutableMap; | import com.google.common.collect.ImmutableMap; | ||||
| import jodd.http.HttpConnectionProvider; | import jodd.http.HttpConnectionProvider; | ||||
| @@ -13,7 +13,6 @@ import me.chanjar.weixin.common.error.WxErrorException; | |||||
| import me.chanjar.weixin.common.util.http.RequestHttp; | import me.chanjar.weixin.common.util.http.RequestHttp; | ||||
| import me.chanjar.weixin.common.util.json.WxGsonBuilder; | import me.chanjar.weixin.common.util.json.WxGsonBuilder; | ||||
| import me.chanjar.weixin.mp.bean.material.WxMpMaterialNews; | import me.chanjar.weixin.mp.bean.material.WxMpMaterialNews; | ||||
| import me.chanjar.weixin.mp.util.http.MaterialNewsInfoRequestExecutor; | |||||
| import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder; | import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder; | ||||
| import org.slf4j.Logger; | import org.slf4j.Logger; | ||||
| import org.slf4j.LoggerFactory; | import org.slf4j.LoggerFactory; | ||||
| @@ -23,9 +22,9 @@ import java.io.IOException; | |||||
| /** | /** | ||||
| * Created by ecoolper on 2017/5/5. | * Created by ecoolper on 2017/5/5. | ||||
| */ | */ | ||||
| public class JoddMaterialNewsInfoRequestExecutor extends MaterialNewsInfoRequestExecutor<HttpConnectionProvider, ProxyInfo> { | |||||
| public class MaterialNewsInfoJoddHttpRequestExecutor extends MaterialNewsInfoRequestExecutor<HttpConnectionProvider, ProxyInfo> { | |||||
| private final Logger logger = LoggerFactory.getLogger(this.getClass()); | private final Logger logger = LoggerFactory.getLogger(this.getClass()); | ||||
| public JoddMaterialNewsInfoRequestExecutor(RequestHttp requestHttp) { | |||||
| public MaterialNewsInfoJoddHttpRequestExecutor(RequestHttp requestHttp) { | |||||
| super(requestHttp); | super(requestHttp); | ||||
| } | } | ||||
| @@ -1,4 +1,4 @@ | |||||
| package me.chanjar.weixin.mp.util.http.okhttp; | |||||
| package me.chanjar.weixin.mp.util.requestexecuter.material; | |||||
| import com.google.common.collect.ImmutableMap; | import com.google.common.collect.ImmutableMap; | ||||
| import me.chanjar.weixin.common.WxType; | import me.chanjar.weixin.common.WxType; | ||||
| @@ -8,7 +8,6 @@ import me.chanjar.weixin.common.util.http.RequestHttp; | |||||
| import me.chanjar.weixin.common.util.http.okhttp.OkHttpProxyInfo; | import me.chanjar.weixin.common.util.http.okhttp.OkHttpProxyInfo; | ||||
| import me.chanjar.weixin.common.util.json.WxGsonBuilder; | import me.chanjar.weixin.common.util.json.WxGsonBuilder; | ||||
| import me.chanjar.weixin.mp.bean.material.WxMpMaterialNews; | import me.chanjar.weixin.mp.bean.material.WxMpMaterialNews; | ||||
| import me.chanjar.weixin.mp.util.http.MaterialNewsInfoRequestExecutor; | |||||
| import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder; | import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder; | ||||
| import okhttp3.*; | import okhttp3.*; | ||||
| import org.slf4j.Logger; | import org.slf4j.Logger; | ||||
| @@ -19,9 +18,9 @@ import java.io.IOException; | |||||
| /** | /** | ||||
| * Created by ecoolper on 2017/5/5. | * Created by ecoolper on 2017/5/5. | ||||
| */ | */ | ||||
| public class OkhttpMaterialNewsInfoRequestExecutor extends MaterialNewsInfoRequestExecutor<OkHttpClient, OkHttpProxyInfo> { | |||||
| public class MaterialNewsInfoOkhttpRequestExecutor extends MaterialNewsInfoRequestExecutor<OkHttpClient, OkHttpProxyInfo> { | |||||
| private final Logger logger = LoggerFactory.getLogger(this.getClass()); | private final Logger logger = LoggerFactory.getLogger(this.getClass()); | ||||
| public OkhttpMaterialNewsInfoRequestExecutor(RequestHttp requestHttp) { | |||||
| public MaterialNewsInfoOkhttpRequestExecutor(RequestHttp requestHttp) { | |||||
| super(requestHttp); | super(requestHttp); | ||||
| } | } | ||||
| @@ -1,11 +1,8 @@ | |||||
| package me.chanjar.weixin.mp.util.http; | |||||
| package me.chanjar.weixin.mp.util.requestexecuter.material; | |||||
| import me.chanjar.weixin.common.util.http.RequestExecutor; | import me.chanjar.weixin.common.util.http.RequestExecutor; | ||||
| import me.chanjar.weixin.common.util.http.RequestHttp; | import me.chanjar.weixin.common.util.http.RequestHttp; | ||||
| import me.chanjar.weixin.mp.bean.material.WxMpMaterialNews; | import me.chanjar.weixin.mp.bean.material.WxMpMaterialNews; | ||||
| import me.chanjar.weixin.mp.util.http.apache.ApacheMaterialNewsInfoRequestExecutor; | |||||
| import me.chanjar.weixin.mp.util.http.jodd.JoddMaterialNewsInfoRequestExecutor; | |||||
| import me.chanjar.weixin.mp.util.http.okhttp.OkhttpMaterialNewsInfoRequestExecutor; | |||||
| public abstract class MaterialNewsInfoRequestExecutor<H, P> implements RequestExecutor<WxMpMaterialNews, String> { | public abstract class MaterialNewsInfoRequestExecutor<H, P> implements RequestExecutor<WxMpMaterialNews, String> { | ||||
| protected RequestHttp<H, P> requestHttp; | protected RequestHttp<H, P> requestHttp; | ||||
| @@ -17,11 +14,11 @@ public abstract class MaterialNewsInfoRequestExecutor<H, P> implements RequestEx | |||||
| public static RequestExecutor<WxMpMaterialNews, String> create(RequestHttp requestHttp) { | public static RequestExecutor<WxMpMaterialNews, String> create(RequestHttp requestHttp) { | ||||
| switch (requestHttp.getRequestType()) { | switch (requestHttp.getRequestType()) { | ||||
| case APACHE_HTTP: | case APACHE_HTTP: | ||||
| return new ApacheMaterialNewsInfoRequestExecutor(requestHttp); | |||||
| return new MaterialNewsInfoApacheHttpRequestExecutor(requestHttp); | |||||
| case JODD_HTTP: | case JODD_HTTP: | ||||
| return new JoddMaterialNewsInfoRequestExecutor(requestHttp); | |||||
| return new MaterialNewsInfoJoddHttpRequestExecutor(requestHttp); | |||||
| case OK_HTTP: | case OK_HTTP: | ||||
| return new OkhttpMaterialNewsInfoRequestExecutor(requestHttp); | |||||
| return new MaterialNewsInfoOkhttpRequestExecutor(requestHttp); | |||||
| default: | default: | ||||
| //TODO 需要优化抛出异常 | //TODO 需要优化抛出异常 | ||||
| return null; | return null; | ||||
| @@ -1,4 +1,4 @@ | |||||
| package me.chanjar.weixin.mp.util.http.apache; | |||||
| package me.chanjar.weixin.mp.util.requestexecuter.material; | |||||
| import me.chanjar.weixin.common.WxType; | import me.chanjar.weixin.common.WxType; | ||||
| import me.chanjar.weixin.common.error.WxError; | import me.chanjar.weixin.common.error.WxError; | ||||
| @@ -8,7 +8,6 @@ import me.chanjar.weixin.common.util.http.apache.Utf8ResponseHandler; | |||||
| import me.chanjar.weixin.common.util.json.WxGsonBuilder; | import me.chanjar.weixin.common.util.json.WxGsonBuilder; | ||||
| import me.chanjar.weixin.mp.bean.material.WxMpMaterial; | import me.chanjar.weixin.mp.bean.material.WxMpMaterial; | ||||
| import me.chanjar.weixin.mp.bean.material.WxMpMaterialUploadResult; | import me.chanjar.weixin.mp.bean.material.WxMpMaterialUploadResult; | ||||
| import me.chanjar.weixin.mp.util.http.MaterialUploadRequestExecutor; | |||||
| import org.apache.http.Consts; | import org.apache.http.Consts; | ||||
| import org.apache.http.HttpHost; | import org.apache.http.HttpHost; | ||||
| import org.apache.http.client.config.RequestConfig; | import org.apache.http.client.config.RequestConfig; | ||||
| @@ -28,8 +27,8 @@ import java.util.Map; | |||||
| /** | /** | ||||
| * Created by ecoolper on 2017/5/5. | * Created by ecoolper on 2017/5/5. | ||||
| */ | */ | ||||
| public class ApacheMaterialUploadRequestExecutor extends MaterialUploadRequestExecutor<CloseableHttpClient, HttpHost> { | |||||
| public ApacheMaterialUploadRequestExecutor(RequestHttp requestHttp) { | |||||
| public class MaterialUploadApacheHttpRequestExecutor extends MaterialUploadRequestExecutor<CloseableHttpClient, HttpHost> { | |||||
| public MaterialUploadApacheHttpRequestExecutor(RequestHttp requestHttp) { | |||||
| super(requestHttp); | super(requestHttp); | ||||
| } | } | ||||
| @@ -1,4 +1,4 @@ | |||||
| package me.chanjar.weixin.mp.util.http.jodd; | |||||
| package me.chanjar.weixin.mp.util.requestexecuter.material; | |||||
| import jodd.http.HttpConnectionProvider; | import jodd.http.HttpConnectionProvider; | ||||
| import jodd.http.HttpRequest; | import jodd.http.HttpRequest; | ||||
| @@ -13,7 +13,6 @@ import me.chanjar.weixin.common.util.http.RequestHttp; | |||||
| import me.chanjar.weixin.common.util.json.WxGsonBuilder; | import me.chanjar.weixin.common.util.json.WxGsonBuilder; | ||||
| import me.chanjar.weixin.mp.bean.material.WxMpMaterial; | import me.chanjar.weixin.mp.bean.material.WxMpMaterial; | ||||
| import me.chanjar.weixin.mp.bean.material.WxMpMaterialUploadResult; | import me.chanjar.weixin.mp.bean.material.WxMpMaterialUploadResult; | ||||
| import me.chanjar.weixin.mp.util.http.MaterialUploadRequestExecutor; | |||||
| import java.io.File; | import java.io.File; | ||||
| import java.io.FileNotFoundException; | import java.io.FileNotFoundException; | ||||
| @@ -23,8 +22,8 @@ import java.util.Map; | |||||
| /** | /** | ||||
| * Created by ecoolper on 2017/5/5. | * Created by ecoolper on 2017/5/5. | ||||
| */ | */ | ||||
| public class JoddMaterialUploadRequestExecutor extends MaterialUploadRequestExecutor<HttpConnectionProvider, ProxyInfo> { | |||||
| public JoddMaterialUploadRequestExecutor(RequestHttp requestHttp) { | |||||
| public class MaterialUploadJoddHttpRequestExecutor extends MaterialUploadRequestExecutor<HttpConnectionProvider, ProxyInfo> { | |||||
| public MaterialUploadJoddHttpRequestExecutor(RequestHttp requestHttp) { | |||||
| super(requestHttp); | super(requestHttp); | ||||
| } | } | ||||
| @@ -1,4 +1,4 @@ | |||||
| package me.chanjar.weixin.mp.util.http.okhttp; | |||||
| package me.chanjar.weixin.mp.util.requestexecuter.material; | |||||
| import me.chanjar.weixin.common.WxType; | import me.chanjar.weixin.common.WxType; | ||||
| import me.chanjar.weixin.common.error.WxError; | import me.chanjar.weixin.common.error.WxError; | ||||
| @@ -8,7 +8,6 @@ import me.chanjar.weixin.common.util.http.okhttp.OkHttpProxyInfo; | |||||
| import me.chanjar.weixin.common.util.json.WxGsonBuilder; | import me.chanjar.weixin.common.util.json.WxGsonBuilder; | ||||
| import me.chanjar.weixin.mp.bean.material.WxMpMaterial; | import me.chanjar.weixin.mp.bean.material.WxMpMaterial; | ||||
| import me.chanjar.weixin.mp.bean.material.WxMpMaterialUploadResult; | import me.chanjar.weixin.mp.bean.material.WxMpMaterialUploadResult; | ||||
| import me.chanjar.weixin.mp.util.http.MaterialUploadRequestExecutor; | |||||
| import okhttp3.*; | import okhttp3.*; | ||||
| import org.slf4j.Logger; | import org.slf4j.Logger; | ||||
| import org.slf4j.LoggerFactory; | import org.slf4j.LoggerFactory; | ||||
| @@ -21,16 +20,16 @@ import java.util.Map; | |||||
| /** | /** | ||||
| * Created by ecoolper on 2017/5/5. | * Created by ecoolper on 2017/5/5. | ||||
| */ | */ | ||||
| public class OkhttpMaterialUploadRequestExecutor extends MaterialUploadRequestExecutor<OkHttpClient, OkHttpProxyInfo> { | |||||
| public class MaterialUploadOkhttpRequestExecutor extends MaterialUploadRequestExecutor<OkHttpClient, OkHttpProxyInfo> { | |||||
| private final Logger logger = LoggerFactory.getLogger(this.getClass()); | private final Logger logger = LoggerFactory.getLogger(this.getClass()); | ||||
| public OkhttpMaterialUploadRequestExecutor(RequestHttp requestHttp) { | |||||
| public MaterialUploadOkhttpRequestExecutor(RequestHttp requestHttp) { | |||||
| super(requestHttp); | super(requestHttp); | ||||
| } | } | ||||
| @Override | @Override | ||||
| public WxMpMaterialUploadResult execute(String uri, WxMpMaterial material) throws WxErrorException, IOException { | public WxMpMaterialUploadResult execute(String uri, WxMpMaterial material) throws WxErrorException, IOException { | ||||
| logger.debug("OkhttpMaterialUploadRequestExecutor is running"); | |||||
| logger.debug("MaterialUploadOkhttpRequestExecutor is running"); | |||||
| if (material == null) { | if (material == null) { | ||||
| throw new WxErrorException(WxError.builder().errorCode(-1).errorMsg("非法请求,material参数为空").build()); | throw new WxErrorException(WxError.builder().errorCode(-1).errorMsg("非法请求,material参数为空").build()); | ||||
| } | } | ||||
| @@ -1,12 +1,9 @@ | |||||
| package me.chanjar.weixin.mp.util.http; | |||||
| package me.chanjar.weixin.mp.util.requestexecuter.material; | |||||
| import me.chanjar.weixin.common.util.http.RequestExecutor; | import me.chanjar.weixin.common.util.http.RequestExecutor; | ||||
| import me.chanjar.weixin.common.util.http.RequestHttp; | import me.chanjar.weixin.common.util.http.RequestHttp; | ||||
| import me.chanjar.weixin.mp.bean.material.WxMpMaterial; | import me.chanjar.weixin.mp.bean.material.WxMpMaterial; | ||||
| import me.chanjar.weixin.mp.bean.material.WxMpMaterialUploadResult; | import me.chanjar.weixin.mp.bean.material.WxMpMaterialUploadResult; | ||||
| import me.chanjar.weixin.mp.util.http.apache.ApacheMaterialUploadRequestExecutor; | |||||
| import me.chanjar.weixin.mp.util.http.jodd.JoddMaterialUploadRequestExecutor; | |||||
| import me.chanjar.weixin.mp.util.http.okhttp.OkhttpMaterialUploadRequestExecutor; | |||||
| /** | /** | ||||
| * @author codepiano | * @author codepiano | ||||
| @@ -21,11 +18,11 @@ public abstract class MaterialUploadRequestExecutor<H, P> implements RequestExec | |||||
| public static RequestExecutor<WxMpMaterialUploadResult, WxMpMaterial> create(RequestHttp requestHttp) { | public static RequestExecutor<WxMpMaterialUploadResult, WxMpMaterial> create(RequestHttp requestHttp) { | ||||
| switch (requestHttp.getRequestType()) { | switch (requestHttp.getRequestType()) { | ||||
| case APACHE_HTTP: | case APACHE_HTTP: | ||||
| return new ApacheMaterialUploadRequestExecutor(requestHttp); | |||||
| return new MaterialUploadApacheHttpRequestExecutor(requestHttp); | |||||
| case JODD_HTTP: | case JODD_HTTP: | ||||
| return new JoddMaterialUploadRequestExecutor(requestHttp); | |||||
| return new MaterialUploadJoddHttpRequestExecutor(requestHttp); | |||||
| case OK_HTTP: | case OK_HTTP: | ||||
| return new OkhttpMaterialUploadRequestExecutor(requestHttp); | |||||
| return new MaterialUploadOkhttpRequestExecutor(requestHttp); | |||||
| default: | default: | ||||
| return null; | return null; | ||||
| } | } | ||||
| @@ -1,4 +1,4 @@ | |||||
| package me.chanjar.weixin.mp.util.http.apache; | |||||
| package me.chanjar.weixin.mp.util.requestexecuter.material; | |||||
| import me.chanjar.weixin.common.WxType; | import me.chanjar.weixin.common.WxType; | ||||
| import me.chanjar.weixin.common.error.WxError; | import me.chanjar.weixin.common.error.WxError; | ||||
| @@ -7,7 +7,6 @@ import me.chanjar.weixin.common.util.http.RequestHttp; | |||||
| import me.chanjar.weixin.common.util.http.apache.Utf8ResponseHandler; | import me.chanjar.weixin.common.util.http.apache.Utf8ResponseHandler; | ||||
| import me.chanjar.weixin.common.util.json.WxGsonBuilder; | import me.chanjar.weixin.common.util.json.WxGsonBuilder; | ||||
| import me.chanjar.weixin.mp.bean.material.WxMpMaterialVideoInfoResult; | import me.chanjar.weixin.mp.bean.material.WxMpMaterialVideoInfoResult; | ||||
| import me.chanjar.weixin.mp.util.http.MaterialVideoInfoRequestExecutor; | |||||
| import org.apache.http.HttpHost; | import org.apache.http.HttpHost; | ||||
| import org.apache.http.client.config.RequestConfig; | import org.apache.http.client.config.RequestConfig; | ||||
| import org.apache.http.client.methods.CloseableHttpResponse; | import org.apache.http.client.methods.CloseableHttpResponse; | ||||
| @@ -22,8 +21,8 @@ import java.util.Map; | |||||
| /** | /** | ||||
| * Created by ecoolper on 2017/5/5. | * Created by ecoolper on 2017/5/5. | ||||
| */ | */ | ||||
| public class ApacheMaterialVideoInfoRequestExecutor extends MaterialVideoInfoRequestExecutor<CloseableHttpClient, HttpHost> { | |||||
| public ApacheMaterialVideoInfoRequestExecutor(RequestHttp requestHttp) { | |||||
| public class MaterialVideoInfoApacheHttpRequestExecutor extends MaterialVideoInfoRequestExecutor<CloseableHttpClient, HttpHost> { | |||||
| public MaterialVideoInfoApacheHttpRequestExecutor(RequestHttp requestHttp) { | |||||
| super(requestHttp); | super(requestHttp); | ||||
| } | } | ||||
| @@ -1,4 +1,4 @@ | |||||
| package me.chanjar.weixin.mp.util.http.jodd; | |||||
| package me.chanjar.weixin.mp.util.requestexecuter.material; | |||||
| import jodd.http.HttpConnectionProvider; | import jodd.http.HttpConnectionProvider; | ||||
| import jodd.http.HttpRequest; | import jodd.http.HttpRequest; | ||||
| @@ -11,15 +11,14 @@ import me.chanjar.weixin.common.error.WxError; | |||||
| import me.chanjar.weixin.common.error.WxErrorException; | import me.chanjar.weixin.common.error.WxErrorException; | ||||
| import me.chanjar.weixin.common.util.http.RequestHttp; | import me.chanjar.weixin.common.util.http.RequestHttp; | ||||
| import me.chanjar.weixin.mp.bean.material.WxMpMaterialVideoInfoResult; | import me.chanjar.weixin.mp.bean.material.WxMpMaterialVideoInfoResult; | ||||
| import me.chanjar.weixin.mp.util.http.MaterialVideoInfoRequestExecutor; | |||||
| import java.io.IOException; | import java.io.IOException; | ||||
| /** | /** | ||||
| * Created by ecoolper on 2017/5/5. | * Created by ecoolper on 2017/5/5. | ||||
| */ | */ | ||||
| public class JoddMaterialVideoInfoRequestExecutor extends MaterialVideoInfoRequestExecutor<HttpConnectionProvider, ProxyInfo> { | |||||
| public JoddMaterialVideoInfoRequestExecutor(RequestHttp requestHttp) { | |||||
| public class MaterialVideoInfoJoddHttpRequestExecutor extends MaterialVideoInfoRequestExecutor<HttpConnectionProvider, ProxyInfo> { | |||||
| public MaterialVideoInfoJoddHttpRequestExecutor(RequestHttp requestHttp) { | |||||
| super(requestHttp); | super(requestHttp); | ||||
| } | } | ||||
| @@ -1,4 +1,4 @@ | |||||
| package me.chanjar.weixin.mp.util.http.okhttp; | |||||
| package me.chanjar.weixin.mp.util.requestexecuter.material; | |||||
| import me.chanjar.weixin.common.WxType; | import me.chanjar.weixin.common.WxType; | ||||
| import me.chanjar.weixin.common.error.WxError; | import me.chanjar.weixin.common.error.WxError; | ||||
| @@ -6,7 +6,6 @@ import me.chanjar.weixin.common.error.WxErrorException; | |||||
| import me.chanjar.weixin.common.util.http.RequestHttp; | import me.chanjar.weixin.common.util.http.RequestHttp; | ||||
| import me.chanjar.weixin.common.util.http.okhttp.OkHttpProxyInfo; | import me.chanjar.weixin.common.util.http.okhttp.OkHttpProxyInfo; | ||||
| import me.chanjar.weixin.mp.bean.material.WxMpMaterialVideoInfoResult; | import me.chanjar.weixin.mp.bean.material.WxMpMaterialVideoInfoResult; | ||||
| import me.chanjar.weixin.mp.util.http.MaterialVideoInfoRequestExecutor; | |||||
| import okhttp3.*; | import okhttp3.*; | ||||
| import org.slf4j.Logger; | import org.slf4j.Logger; | ||||
| import org.slf4j.LoggerFactory; | import org.slf4j.LoggerFactory; | ||||
| @@ -16,16 +15,16 @@ import java.io.IOException; | |||||
| /** | /** | ||||
| * Created by ecoolper on 2017/5/5. | * Created by ecoolper on 2017/5/5. | ||||
| */ | */ | ||||
| public class OkhttpMaterialVideoInfoRequestExecutor extends MaterialVideoInfoRequestExecutor<OkHttpClient, OkHttpProxyInfo> { | |||||
| public class MaterialVideoInfoOkhttpRequestExecutor extends MaterialVideoInfoRequestExecutor<OkHttpClient, OkHttpProxyInfo> { | |||||
| private final Logger logger = LoggerFactory.getLogger(this.getClass()); | private final Logger logger = LoggerFactory.getLogger(this.getClass()); | ||||
| public OkhttpMaterialVideoInfoRequestExecutor(RequestHttp requestHttp) { | |||||
| public MaterialVideoInfoOkhttpRequestExecutor(RequestHttp requestHttp) { | |||||
| super(requestHttp); | super(requestHttp); | ||||
| } | } | ||||
| @Override | @Override | ||||
| public WxMpMaterialVideoInfoResult execute(String uri, String materialId) throws WxErrorException, IOException { | public WxMpMaterialVideoInfoResult execute(String uri, String materialId) throws WxErrorException, IOException { | ||||
| logger.debug("OkhttpMaterialVideoInfoRequestExecutor is running"); | |||||
| logger.debug("MaterialVideoInfoOkhttpRequestExecutor is running"); | |||||
| //得到httpClient | //得到httpClient | ||||
| OkHttpClient client = requestHttp.getRequestHttpClient(); | OkHttpClient client = requestHttp.getRequestHttpClient(); | ||||
| @@ -1,13 +1,10 @@ | |||||
| package me.chanjar.weixin.mp.util.http; | |||||
| package me.chanjar.weixin.mp.util.requestexecuter.material; | |||||
| import me.chanjar.weixin.common.util.http.RequestExecutor; | import me.chanjar.weixin.common.util.http.RequestExecutor; | ||||
| import me.chanjar.weixin.common.util.http.RequestHttp; | import me.chanjar.weixin.common.util.http.RequestHttp; | ||||
| import me.chanjar.weixin.mp.bean.material.WxMpMaterialVideoInfoResult; | import me.chanjar.weixin.mp.bean.material.WxMpMaterialVideoInfoResult; | ||||
| import me.chanjar.weixin.mp.util.http.apache.ApacheMaterialVideoInfoRequestExecutor; | |||||
| import me.chanjar.weixin.mp.util.http.jodd.JoddMaterialVideoInfoRequestExecutor; | |||||
| import me.chanjar.weixin.mp.util.http.okhttp.OkhttpMaterialVideoInfoRequestExecutor; | |||||
| public abstract class MaterialVideoInfoRequestExecutor<H, P> implements RequestExecutor<WxMpMaterialVideoInfoResult, String> { | public abstract class MaterialVideoInfoRequestExecutor<H, P> implements RequestExecutor<WxMpMaterialVideoInfoResult, String> { | ||||
| @@ -20,11 +17,11 @@ public abstract class MaterialVideoInfoRequestExecutor<H, P> implements RequestE | |||||
| public static RequestExecutor<WxMpMaterialVideoInfoResult, String> create(RequestHttp requestHttp) { | public static RequestExecutor<WxMpMaterialVideoInfoResult, String> create(RequestHttp requestHttp) { | ||||
| switch (requestHttp.getRequestType()) { | switch (requestHttp.getRequestType()) { | ||||
| case APACHE_HTTP: | case APACHE_HTTP: | ||||
| return new ApacheMaterialVideoInfoRequestExecutor(requestHttp); | |||||
| return new MaterialVideoInfoApacheHttpRequestExecutor(requestHttp); | |||||
| case JODD_HTTP: | case JODD_HTTP: | ||||
| return new JoddMaterialVideoInfoRequestExecutor(requestHttp); | |||||
| return new MaterialVideoInfoJoddHttpRequestExecutor(requestHttp); | |||||
| case OK_HTTP: | case OK_HTTP: | ||||
| return new OkhttpMaterialVideoInfoRequestExecutor(requestHttp); | |||||
| return new MaterialVideoInfoOkhttpRequestExecutor(requestHttp); | |||||
| default: | default: | ||||
| return null; | return null; | ||||
| } | } | ||||
| @@ -1,11 +1,10 @@ | |||||
| package me.chanjar.weixin.mp.util.http.apache; | |||||
| package me.chanjar.weixin.mp.util.requestexecuter.material; | |||||
| import me.chanjar.weixin.common.error.WxError; | import me.chanjar.weixin.common.error.WxError; | ||||
| import me.chanjar.weixin.common.error.WxErrorException; | import me.chanjar.weixin.common.error.WxErrorException; | ||||
| import me.chanjar.weixin.common.util.http.RequestHttp; | import me.chanjar.weixin.common.util.http.RequestHttp; | ||||
| import me.chanjar.weixin.common.util.http.apache.InputStreamResponseHandler; | import me.chanjar.weixin.common.util.http.apache.InputStreamResponseHandler; | ||||
| import me.chanjar.weixin.common.util.json.WxGsonBuilder; | import me.chanjar.weixin.common.util.json.WxGsonBuilder; | ||||
| import me.chanjar.weixin.mp.util.http.MaterialVoiceAndImageDownloadRequestExecutor; | |||||
| import org.apache.commons.io.IOUtils; | import org.apache.commons.io.IOUtils; | ||||
| import org.apache.http.HttpHost; | import org.apache.http.HttpHost; | ||||
| import org.apache.http.client.config.RequestConfig; | import org.apache.http.client.config.RequestConfig; | ||||
| @@ -25,8 +24,8 @@ import java.util.Map; | |||||
| /** | /** | ||||
| * Created by ecoolper on 2017/5/5. | * Created by ecoolper on 2017/5/5. | ||||
| */ | */ | ||||
| public class ApacheMaterialVoiceAndImageDownloadRequestExecutor extends MaterialVoiceAndImageDownloadRequestExecutor<CloseableHttpClient, HttpHost> { | |||||
| public ApacheMaterialVoiceAndImageDownloadRequestExecutor(RequestHttp requestHttp, File tmpDirFile) { | |||||
| public class MaterialVoiceAndImageDownloadApacheHttpRequestExecutor extends MaterialVoiceAndImageDownloadRequestExecutor<CloseableHttpClient, HttpHost> { | |||||
| public MaterialVoiceAndImageDownloadApacheHttpRequestExecutor(RequestHttp requestHttp, File tmpDirFile) { | |||||
| super(requestHttp, tmpDirFile); | super(requestHttp, tmpDirFile); | ||||
| } | } | ||||
| @@ -1,4 +1,4 @@ | |||||
| package me.chanjar.weixin.mp.util.http.jodd; | |||||
| package me.chanjar.weixin.mp.util.requestexecuter.material; | |||||
| import jodd.http.HttpConnectionProvider; | import jodd.http.HttpConnectionProvider; | ||||
| import jodd.http.HttpRequest; | import jodd.http.HttpRequest; | ||||
| @@ -10,7 +10,6 @@ import me.chanjar.weixin.common.error.WxError; | |||||
| import me.chanjar.weixin.common.error.WxErrorException; | import me.chanjar.weixin.common.error.WxErrorException; | ||||
| import me.chanjar.weixin.common.util.http.RequestHttp; | import me.chanjar.weixin.common.util.http.RequestHttp; | ||||
| import me.chanjar.weixin.common.util.json.WxGsonBuilder; | import me.chanjar.weixin.common.util.json.WxGsonBuilder; | ||||
| import me.chanjar.weixin.mp.util.http.MaterialVoiceAndImageDownloadRequestExecutor; | |||||
| import org.apache.commons.io.IOUtils; | import org.apache.commons.io.IOUtils; | ||||
| import java.io.ByteArrayInputStream; | import java.io.ByteArrayInputStream; | ||||
| @@ -22,8 +21,8 @@ import java.nio.charset.StandardCharsets; | |||||
| /** | /** | ||||
| * Created by ecoolper on 2017/5/5. | * Created by ecoolper on 2017/5/5. | ||||
| */ | */ | ||||
| public class JoddMaterialVoiceAndImageDownloadRequestExecutor extends MaterialVoiceAndImageDownloadRequestExecutor<HttpConnectionProvider, ProxyInfo> { | |||||
| public JoddMaterialVoiceAndImageDownloadRequestExecutor(RequestHttp requestHttp, File tmpDirFile) { | |||||
| public class MaterialVoiceAndImageDownloadJoddHttpRequestExecutor extends MaterialVoiceAndImageDownloadRequestExecutor<HttpConnectionProvider, ProxyInfo> { | |||||
| public MaterialVoiceAndImageDownloadJoddHttpRequestExecutor(RequestHttp requestHttp, File tmpDirFile) { | |||||
| super(requestHttp, tmpDirFile); | super(requestHttp, tmpDirFile); | ||||
| } | } | ||||
| @@ -1,11 +1,10 @@ | |||||
| package me.chanjar.weixin.mp.util.http.okhttp; | |||||
| package me.chanjar.weixin.mp.util.requestexecuter.material; | |||||
| import me.chanjar.weixin.common.WxType; | import me.chanjar.weixin.common.WxType; | ||||
| import me.chanjar.weixin.common.error.WxError; | import me.chanjar.weixin.common.error.WxError; | ||||
| import me.chanjar.weixin.common.error.WxErrorException; | import me.chanjar.weixin.common.error.WxErrorException; | ||||
| import me.chanjar.weixin.common.util.http.RequestHttp; | import me.chanjar.weixin.common.util.http.RequestHttp; | ||||
| import me.chanjar.weixin.common.util.http.okhttp.OkHttpProxyInfo; | import me.chanjar.weixin.common.util.http.okhttp.OkHttpProxyInfo; | ||||
| import me.chanjar.weixin.mp.util.http.MaterialVoiceAndImageDownloadRequestExecutor; | |||||
| import okhttp3.*; | import okhttp3.*; | ||||
| import okio.BufferedSink; | import okio.BufferedSink; | ||||
| import okio.Okio; | import okio.Okio; | ||||
| @@ -17,16 +16,16 @@ import java.io.*; | |||||
| /** | /** | ||||
| * Created by ecoolper on 2017/5/5. | * Created by ecoolper on 2017/5/5. | ||||
| */ | */ | ||||
| public class OkhttpMaterialVoiceAndImageDownloadRequestExecutor extends MaterialVoiceAndImageDownloadRequestExecutor<OkHttpClient, OkHttpProxyInfo> { | |||||
| public class MaterialVoiceAndImageDownloadOkhttpRequestExecutor extends MaterialVoiceAndImageDownloadRequestExecutor<OkHttpClient, OkHttpProxyInfo> { | |||||
| private final Logger logger = LoggerFactory.getLogger(this.getClass()); | private final Logger logger = LoggerFactory.getLogger(this.getClass()); | ||||
| public OkhttpMaterialVoiceAndImageDownloadRequestExecutor(RequestHttp requestHttp, File tmpDirFile) { | |||||
| public MaterialVoiceAndImageDownloadOkhttpRequestExecutor(RequestHttp requestHttp, File tmpDirFile) { | |||||
| super(requestHttp, tmpDirFile); | super(requestHttp, tmpDirFile); | ||||
| } | } | ||||
| @Override | @Override | ||||
| public InputStream execute(String uri, String materialId) throws WxErrorException, IOException { | public InputStream execute(String uri, String materialId) throws WxErrorException, IOException { | ||||
| logger.debug("OkhttpMaterialVoiceAndImageDownloadRequestExecutor is running"); | |||||
| logger.debug("MaterialVoiceAndImageDownloadOkhttpRequestExecutor is running"); | |||||
| OkHttpClient client = requestHttp.getRequestHttpClient(); | OkHttpClient client = requestHttp.getRequestHttpClient(); | ||||
| RequestBody requestBody = new FormBody.Builder().add("media_id", materialId).build(); | RequestBody requestBody = new FormBody.Builder().add("media_id", materialId).build(); | ||||
| Request request = new Request.Builder().url(uri).get().post(requestBody).build(); | Request request = new Request.Builder().url(uri).get().post(requestBody).build(); | ||||
| @@ -1,10 +1,7 @@ | |||||
| package me.chanjar.weixin.mp.util.http; | |||||
| package me.chanjar.weixin.mp.util.requestexecuter.material; | |||||
| import me.chanjar.weixin.common.util.http.RequestExecutor; | import me.chanjar.weixin.common.util.http.RequestExecutor; | ||||
| import me.chanjar.weixin.common.util.http.RequestHttp; | import me.chanjar.weixin.common.util.http.RequestHttp; | ||||
| import me.chanjar.weixin.mp.util.http.apache.ApacheMaterialVoiceAndImageDownloadRequestExecutor; | |||||
| import me.chanjar.weixin.mp.util.http.jodd.JoddMaterialVoiceAndImageDownloadRequestExecutor; | |||||
| import me.chanjar.weixin.mp.util.http.okhttp.OkhttpMaterialVoiceAndImageDownloadRequestExecutor; | |||||
| import java.io.File; | import java.io.File; | ||||
| import java.io.InputStream; | import java.io.InputStream; | ||||
| @@ -22,11 +19,11 @@ public abstract class MaterialVoiceAndImageDownloadRequestExecutor<H, P> | |||||
| public static RequestExecutor<InputStream, String> create(RequestHttp requestHttp, File tmpDirFile) { | public static RequestExecutor<InputStream, String> create(RequestHttp requestHttp, File tmpDirFile) { | ||||
| switch (requestHttp.getRequestType()) { | switch (requestHttp.getRequestType()) { | ||||
| case APACHE_HTTP: | case APACHE_HTTP: | ||||
| return new ApacheMaterialVoiceAndImageDownloadRequestExecutor(requestHttp, tmpDirFile); | |||||
| return new MaterialVoiceAndImageDownloadApacheHttpRequestExecutor(requestHttp, tmpDirFile); | |||||
| case JODD_HTTP: | case JODD_HTTP: | ||||
| return new JoddMaterialVoiceAndImageDownloadRequestExecutor(requestHttp, tmpDirFile); | |||||
| return new MaterialVoiceAndImageDownloadJoddHttpRequestExecutor(requestHttp, tmpDirFile); | |||||
| case OK_HTTP: | case OK_HTTP: | ||||
| return new OkhttpMaterialVoiceAndImageDownloadRequestExecutor(requestHttp, tmpDirFile); | |||||
| return new MaterialVoiceAndImageDownloadOkhttpRequestExecutor(requestHttp, tmpDirFile); | |||||
| default: | default: | ||||
| return null; | return null; | ||||
| } | } | ||||
| @@ -1,4 +1,4 @@ | |||||
| package me.chanjar.weixin.mp.util.http.apache; | |||||
| package me.chanjar.weixin.mp.util.requestexecuter.media; | |||||
| import me.chanjar.weixin.common.WxType; | import me.chanjar.weixin.common.WxType; | ||||
| import me.chanjar.weixin.common.error.WxError; | import me.chanjar.weixin.common.error.WxError; | ||||
| @@ -6,7 +6,6 @@ import me.chanjar.weixin.common.error.WxErrorException; | |||||
| import me.chanjar.weixin.common.util.http.RequestHttp; | import me.chanjar.weixin.common.util.http.RequestHttp; | ||||
| import me.chanjar.weixin.common.util.http.apache.Utf8ResponseHandler; | import me.chanjar.weixin.common.util.http.apache.Utf8ResponseHandler; | ||||
| import me.chanjar.weixin.mp.bean.material.WxMediaImgUploadResult; | import me.chanjar.weixin.mp.bean.material.WxMediaImgUploadResult; | ||||
| import me.chanjar.weixin.mp.util.http.MediaImgUploadRequestExecutor; | |||||
| import org.apache.http.HttpEntity; | import org.apache.http.HttpEntity; | ||||
| import org.apache.http.HttpHost; | import org.apache.http.HttpHost; | ||||
| import org.apache.http.client.config.RequestConfig; | import org.apache.http.client.config.RequestConfig; | ||||
| @@ -25,8 +24,8 @@ import java.io.IOException; | |||||
| * | * | ||||
| * @author ecoolper | * @author ecoolper | ||||
| */ | */ | ||||
| public class ApacheMediaImgUploadRequestExecutor extends MediaImgUploadRequestExecutor<CloseableHttpClient, HttpHost> { | |||||
| public ApacheMediaImgUploadRequestExecutor(RequestHttp requestHttp) { | |||||
| public class MediaImgUploadApacheHttpRequestExecutor extends MediaImgUploadRequestExecutor<CloseableHttpClient, HttpHost> { | |||||
| public MediaImgUploadApacheHttpRequestExecutor(RequestHttp requestHttp) { | |||||
| super(requestHttp); | super(requestHttp); | ||||
| } | } | ||||
| @@ -1,4 +1,4 @@ | |||||
| package me.chanjar.weixin.mp.util.http.jodd; | |||||
| package me.chanjar.weixin.mp.util.requestexecuter.media; | |||||
| import jodd.http.HttpConnectionProvider; | import jodd.http.HttpConnectionProvider; | ||||
| import jodd.http.HttpRequest; | import jodd.http.HttpRequest; | ||||
| @@ -11,7 +11,6 @@ import me.chanjar.weixin.common.error.WxError; | |||||
| import me.chanjar.weixin.common.error.WxErrorException; | import me.chanjar.weixin.common.error.WxErrorException; | ||||
| import me.chanjar.weixin.common.util.http.RequestHttp; | import me.chanjar.weixin.common.util.http.RequestHttp; | ||||
| import me.chanjar.weixin.mp.bean.material.WxMediaImgUploadResult; | import me.chanjar.weixin.mp.bean.material.WxMediaImgUploadResult; | ||||
| import me.chanjar.weixin.mp.util.http.MediaImgUploadRequestExecutor; | |||||
| import java.io.File; | import java.io.File; | ||||
| import java.io.IOException; | import java.io.IOException; | ||||
| @@ -21,8 +20,8 @@ import java.io.IOException; | |||||
| * | * | ||||
| * @author ecoolper | * @author ecoolper | ||||
| */ | */ | ||||
| public class JoddMediaImgUploadRequestExecutor extends MediaImgUploadRequestExecutor<HttpConnectionProvider, ProxyInfo> { | |||||
| public JoddMediaImgUploadRequestExecutor(RequestHttp requestHttp) { | |||||
| public class MediaImgUploadHttpRequestExecutor extends MediaImgUploadRequestExecutor<HttpConnectionProvider, ProxyInfo> { | |||||
| public MediaImgUploadHttpRequestExecutor(RequestHttp requestHttp) { | |||||
| super(requestHttp); | super(requestHttp); | ||||
| } | } | ||||
| @@ -1,4 +1,4 @@ | |||||
| package me.chanjar.weixin.mp.util.http.okhttp; | |||||
| package me.chanjar.weixin.mp.util.requestexecuter.media; | |||||
| import me.chanjar.weixin.common.WxType; | import me.chanjar.weixin.common.WxType; | ||||
| import me.chanjar.weixin.common.error.WxError; | import me.chanjar.weixin.common.error.WxError; | ||||
| @@ -6,7 +6,6 @@ import me.chanjar.weixin.common.error.WxErrorException; | |||||
| import me.chanjar.weixin.common.util.http.RequestHttp; | import me.chanjar.weixin.common.util.http.RequestHttp; | ||||
| import me.chanjar.weixin.common.util.http.okhttp.OkHttpProxyInfo; | import me.chanjar.weixin.common.util.http.okhttp.OkHttpProxyInfo; | ||||
| import me.chanjar.weixin.mp.bean.material.WxMediaImgUploadResult; | import me.chanjar.weixin.mp.bean.material.WxMediaImgUploadResult; | ||||
| import me.chanjar.weixin.mp.util.http.MediaImgUploadRequestExecutor; | |||||
| import okhttp3.*; | import okhttp3.*; | ||||
| import org.slf4j.Logger; | import org.slf4j.Logger; | ||||
| import org.slf4j.LoggerFactory; | import org.slf4j.LoggerFactory; | ||||
| @@ -19,16 +18,16 @@ import java.io.IOException; | |||||
| * | * | ||||
| * @author ecoolper | * @author ecoolper | ||||
| */ | */ | ||||
| public class OkhttpMediaImgUploadRequestExecutor extends MediaImgUploadRequestExecutor<OkHttpClient, OkHttpProxyInfo> { | |||||
| public class MediaImgUploadOkhttpRequestExecutor extends MediaImgUploadRequestExecutor<OkHttpClient, OkHttpProxyInfo> { | |||||
| private final Logger logger = LoggerFactory.getLogger(this.getClass()); | private final Logger logger = LoggerFactory.getLogger(this.getClass()); | ||||
| public OkhttpMediaImgUploadRequestExecutor(RequestHttp requestHttp) { | |||||
| public MediaImgUploadOkhttpRequestExecutor(RequestHttp requestHttp) { | |||||
| super(requestHttp); | super(requestHttp); | ||||
| } | } | ||||
| @Override | @Override | ||||
| public WxMediaImgUploadResult execute(String uri, File file) throws WxErrorException, IOException { | public WxMediaImgUploadResult execute(String uri, File file) throws WxErrorException, IOException { | ||||
| logger.debug("OkhttpMediaImgUploadRequestExecutor is running"); | |||||
| logger.debug("MediaImgUploadOkhttpRequestExecutor is running"); | |||||
| //得到httpClient | //得到httpClient | ||||
| OkHttpClient client = requestHttp.getRequestHttpClient(); | OkHttpClient client = requestHttp.getRequestHttpClient(); | ||||
| @@ -1,11 +1,8 @@ | |||||
| package me.chanjar.weixin.mp.util.http; | |||||
| package me.chanjar.weixin.mp.util.requestexecuter.media; | |||||
| import me.chanjar.weixin.common.util.http.RequestExecutor; | import me.chanjar.weixin.common.util.http.RequestExecutor; | ||||
| import me.chanjar.weixin.common.util.http.RequestHttp; | import me.chanjar.weixin.common.util.http.RequestHttp; | ||||
| import me.chanjar.weixin.mp.bean.material.WxMediaImgUploadResult; | import me.chanjar.weixin.mp.bean.material.WxMediaImgUploadResult; | ||||
| import me.chanjar.weixin.mp.util.http.apache.ApacheMediaImgUploadRequestExecutor; | |||||
| import me.chanjar.weixin.mp.util.http.jodd.JoddMediaImgUploadRequestExecutor; | |||||
| import me.chanjar.weixin.mp.util.http.okhttp.OkhttpMediaImgUploadRequestExecutor; | |||||
| import java.io.File; | import java.io.File; | ||||
| @@ -22,11 +19,11 @@ public abstract class MediaImgUploadRequestExecutor<H, P> implements RequestExec | |||||
| public static RequestExecutor<WxMediaImgUploadResult, File> create(RequestHttp requestHttp) { | public static RequestExecutor<WxMediaImgUploadResult, File> create(RequestHttp requestHttp) { | ||||
| switch (requestHttp.getRequestType()) { | switch (requestHttp.getRequestType()) { | ||||
| case APACHE_HTTP: | case APACHE_HTTP: | ||||
| return new ApacheMediaImgUploadRequestExecutor(requestHttp); | |||||
| return new MediaImgUploadApacheHttpRequestExecutor(requestHttp); | |||||
| case JODD_HTTP: | case JODD_HTTP: | ||||
| return new JoddMediaImgUploadRequestExecutor(requestHttp); | |||||
| return new MediaImgUploadHttpRequestExecutor(requestHttp); | |||||
| case OK_HTTP: | case OK_HTTP: | ||||
| return new OkhttpMediaImgUploadRequestExecutor(requestHttp); | |||||
| return new MediaImgUploadOkhttpRequestExecutor(requestHttp); | |||||
| default: | default: | ||||
| return null; | return null; | ||||
| } | } | ||||
| @@ -1,4 +1,4 @@ | |||||
| package me.chanjar.weixin.mp.util.http.apache; | |||||
| package me.chanjar.weixin.mp.util.requestexecuter.qrcode; | |||||
| import me.chanjar.weixin.common.WxType; | import me.chanjar.weixin.common.WxType; | ||||
| import me.chanjar.weixin.common.error.WxError; | import me.chanjar.weixin.common.error.WxError; | ||||
| @@ -8,7 +8,6 @@ import me.chanjar.weixin.common.util.http.RequestHttp; | |||||
| import me.chanjar.weixin.common.util.http.apache.InputStreamResponseHandler; | import me.chanjar.weixin.common.util.http.apache.InputStreamResponseHandler; | ||||
| import me.chanjar.weixin.common.util.http.apache.Utf8ResponseHandler; | import me.chanjar.weixin.common.util.http.apache.Utf8ResponseHandler; | ||||
| import me.chanjar.weixin.mp.bean.result.WxMpQrCodeTicket; | import me.chanjar.weixin.mp.bean.result.WxMpQrCodeTicket; | ||||
| import me.chanjar.weixin.mp.util.http.QrCodeRequestExecutor; | |||||
| import org.apache.http.Header; | import org.apache.http.Header; | ||||
| import org.apache.http.HttpHost; | import org.apache.http.HttpHost; | ||||
| import org.apache.http.client.config.RequestConfig; | import org.apache.http.client.config.RequestConfig; | ||||
| @@ -26,8 +25,8 @@ import java.util.UUID; | |||||
| /** | /** | ||||
| * Created by ecoolper on 2017/5/5. | * Created by ecoolper on 2017/5/5. | ||||
| */ | */ | ||||
| public class ApacheQrCodeRequestExecutor extends QrCodeRequestExecutor<CloseableHttpClient, HttpHost> { | |||||
| public ApacheQrCodeRequestExecutor(RequestHttp requestHttp) { | |||||
| public class QrCodeApacheHttpRequestExecutor extends QrCodeRequestExecutor<CloseableHttpClient, HttpHost> { | |||||
| public QrCodeApacheHttpRequestExecutor(RequestHttp requestHttp) { | |||||
| super(requestHttp); | super(requestHttp); | ||||
| } | } | ||||
| @@ -1,4 +1,4 @@ | |||||
| package me.chanjar.weixin.mp.util.http.jodd; | |||||
| package me.chanjar.weixin.mp.util.requestexecuter.qrcode; | |||||
| import jodd.http.HttpConnectionProvider; | import jodd.http.HttpConnectionProvider; | ||||
| import jodd.http.HttpRequest; | import jodd.http.HttpRequest; | ||||
| @@ -13,7 +13,6 @@ import me.chanjar.weixin.common.error.WxErrorException; | |||||
| import me.chanjar.weixin.common.util.fs.FileUtils; | import me.chanjar.weixin.common.util.fs.FileUtils; | ||||
| import me.chanjar.weixin.common.util.http.RequestHttp; | import me.chanjar.weixin.common.util.http.RequestHttp; | ||||
| import me.chanjar.weixin.mp.bean.result.WxMpQrCodeTicket; | import me.chanjar.weixin.mp.bean.result.WxMpQrCodeTicket; | ||||
| import me.chanjar.weixin.mp.util.http.QrCodeRequestExecutor; | |||||
| import java.io.ByteArrayInputStream; | import java.io.ByteArrayInputStream; | ||||
| import java.io.File; | import java.io.File; | ||||
| @@ -25,8 +24,8 @@ import java.util.UUID; | |||||
| /** | /** | ||||
| * Created by ecoolper on 2017/5/5. | * Created by ecoolper on 2017/5/5. | ||||
| */ | */ | ||||
| public class JoddQrCodeRequestExecutor extends QrCodeRequestExecutor<HttpConnectionProvider, ProxyInfo> { | |||||
| public JoddQrCodeRequestExecutor(RequestHttp requestHttp) { | |||||
| public class QrCodeJoddHttpRequestExecutor extends QrCodeRequestExecutor<HttpConnectionProvider, ProxyInfo> { | |||||
| public QrCodeJoddHttpRequestExecutor(RequestHttp requestHttp) { | |||||
| super(requestHttp); | super(requestHttp); | ||||
| } | } | ||||
| @@ -1,4 +1,4 @@ | |||||
| package me.chanjar.weixin.mp.util.http.okhttp; | |||||
| package me.chanjar.weixin.mp.util.requestexecuter.qrcode; | |||||
| import me.chanjar.weixin.common.WxType; | import me.chanjar.weixin.common.WxType; | ||||
| import me.chanjar.weixin.common.error.WxError; | import me.chanjar.weixin.common.error.WxError; | ||||
| @@ -7,7 +7,6 @@ import me.chanjar.weixin.common.util.fs.FileUtils; | |||||
| import me.chanjar.weixin.common.util.http.RequestHttp; | import me.chanjar.weixin.common.util.http.RequestHttp; | ||||
| import me.chanjar.weixin.common.util.http.okhttp.OkHttpProxyInfo; | import me.chanjar.weixin.common.util.http.okhttp.OkHttpProxyInfo; | ||||
| import me.chanjar.weixin.mp.bean.result.WxMpQrCodeTicket; | import me.chanjar.weixin.mp.bean.result.WxMpQrCodeTicket; | ||||
| import me.chanjar.weixin.mp.util.http.QrCodeRequestExecutor; | |||||
| import okhttp3.OkHttpClient; | import okhttp3.OkHttpClient; | ||||
| import okhttp3.Request; | import okhttp3.Request; | ||||
| import okhttp3.Response; | import okhttp3.Response; | ||||
| @@ -25,16 +24,16 @@ import java.util.UUID; | |||||
| * @author ecoolper | * @author ecoolper | ||||
| * @date 2017/5/5 | * @date 2017/5/5 | ||||
| */ | */ | ||||
| public class OkhttpQrCodeRequestExecutor extends QrCodeRequestExecutor<OkHttpClient, OkHttpProxyInfo> { | |||||
| public class QrCodeOkhttpRequestExecutor extends QrCodeRequestExecutor<OkHttpClient, OkHttpProxyInfo> { | |||||
| private final Logger logger = LoggerFactory.getLogger(this.getClass()); | private final Logger logger = LoggerFactory.getLogger(this.getClass()); | ||||
| public OkhttpQrCodeRequestExecutor(RequestHttp requestHttp) { | |||||
| public QrCodeOkhttpRequestExecutor(RequestHttp requestHttp) { | |||||
| super(requestHttp); | super(requestHttp); | ||||
| } | } | ||||
| @Override | @Override | ||||
| public File execute(String uri, WxMpQrCodeTicket ticket) throws WxErrorException, IOException { | public File execute(String uri, WxMpQrCodeTicket ticket) throws WxErrorException, IOException { | ||||
| logger.debug("OkhttpQrCodeRequestExecutor is running"); | |||||
| logger.debug("QrCodeOkhttpRequestExecutor is running"); | |||||
| if (ticket != null) { | if (ticket != null) { | ||||
| if (uri.indexOf('?') == -1) { | if (uri.indexOf('?') == -1) { | ||||
| @@ -1,13 +1,10 @@ | |||||
| package me.chanjar.weixin.mp.util.http; | |||||
| package me.chanjar.weixin.mp.util.requestexecuter.qrcode; | |||||
| import me.chanjar.weixin.common.error.WxError; | import me.chanjar.weixin.common.error.WxError; | ||||
| import me.chanjar.weixin.common.error.WxErrorException; | import me.chanjar.weixin.common.error.WxErrorException; | ||||
| import me.chanjar.weixin.common.util.http.RequestExecutor; | import me.chanjar.weixin.common.util.http.RequestExecutor; | ||||
| import me.chanjar.weixin.common.util.http.RequestHttp; | import me.chanjar.weixin.common.util.http.RequestHttp; | ||||
| import me.chanjar.weixin.mp.bean.result.WxMpQrCodeTicket; | import me.chanjar.weixin.mp.bean.result.WxMpQrCodeTicket; | ||||
| import me.chanjar.weixin.mp.util.http.apache.ApacheQrCodeRequestExecutor; | |||||
| import me.chanjar.weixin.mp.util.http.jodd.JoddQrCodeRequestExecutor; | |||||
| import me.chanjar.weixin.mp.util.http.okhttp.OkhttpQrCodeRequestExecutor; | |||||
| import java.io.File; | import java.io.File; | ||||
| @@ -26,11 +23,11 @@ public abstract class QrCodeRequestExecutor<H, P> implements RequestExecutor<Fil | |||||
| public static RequestExecutor<File, WxMpQrCodeTicket> create(RequestHttp requestHttp) throws WxErrorException { | public static RequestExecutor<File, WxMpQrCodeTicket> create(RequestHttp requestHttp) throws WxErrorException { | ||||
| switch (requestHttp.getRequestType()) { | switch (requestHttp.getRequestType()) { | ||||
| case APACHE_HTTP: | case APACHE_HTTP: | ||||
| return new ApacheQrCodeRequestExecutor(requestHttp); | |||||
| return new QrCodeApacheHttpRequestExecutor(requestHttp); | |||||
| case JODD_HTTP: | case JODD_HTTP: | ||||
| return new JoddQrCodeRequestExecutor(requestHttp); | |||||
| return new QrCodeJoddHttpRequestExecutor(requestHttp); | |||||
| case OK_HTTP: | case OK_HTTP: | ||||
| return new OkhttpQrCodeRequestExecutor(requestHttp); | |||||
| return new QrCodeOkhttpRequestExecutor(requestHttp); | |||||
| default: | default: | ||||
| throw new WxErrorException(WxError.builder().errorCode(-1).errorMsg("不支持的http框架").build()); | throw new WxErrorException(WxError.builder().errorCode(-1).errorMsg("不支持的http框架").build()); | ||||
| } | } | ||||