From 0daaa011ef16cb1dab22d36b81d85a48c47c600a Mon Sep 17 00:00:00 2001 From: Binary Wang Date: Sun, 10 Jun 2018 00:28:26 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=84=E8=A7=84=E8=8C=83RequestExec?= =?UTF-8?q?uter=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../weixin/mp/api/impl/WxMpMaterialServiceImpl.java | 3 ++- .../weixin/mp/api/impl/WxMpQrcodeServiceImpl.java | 2 +- .../MaterialDeleteApacheHttpRequestExecutor.java} | 7 +++---- .../MaterialDeleteJoddHttpRequestExecutor.java} | 7 +++---- .../MaterialDeleteOkhttpRequestExecutor.java} | 9 ++++----- .../material}/MaterialDeleteRequestExecutor.java | 11 ++++------- .../MaterialNewsInfoApacheHttpRequestExecutor.java} | 7 +++---- .../MaterialNewsInfoJoddHttpRequestExecutor.java} | 7 +++---- .../MaterialNewsInfoOkhttpRequestExecutor.java} | 7 +++---- .../material}/MaterialNewsInfoRequestExecutor.java | 11 ++++------- .../MaterialUploadApacheHttpRequestExecutor.java} | 7 +++---- .../MaterialUploadJoddHttpRequestExecutor.java} | 7 +++---- .../MaterialUploadOkhttpRequestExecutor.java} | 9 ++++----- .../material}/MaterialUploadRequestExecutor.java | 11 ++++------- .../MaterialVideoInfoApacheHttpRequestExecutor.java} | 7 +++---- .../MaterialVideoInfoJoddHttpRequestExecutor.java} | 7 +++---- .../MaterialVideoInfoOkhttpRequestExecutor.java} | 9 ++++----- .../material}/MaterialVideoInfoRequestExecutor.java | 11 ++++------- ...iceAndImageDownloadApacheHttpRequestExecutor.java} | 7 +++---- ...VoiceAndImageDownloadJoddHttpRequestExecutor.java} | 7 +++---- ...alVoiceAndImageDownloadOkhttpRequestExecutor.java} | 9 ++++----- .../MaterialVoiceAndImageDownloadRequestExecutor.java | 11 ++++------- .../MediaImgUploadApacheHttpRequestExecutor.java} | 7 +++---- .../media/MediaImgUploadHttpRequestExecutor.java} | 7 +++---- .../media/MediaImgUploadOkhttpRequestExecutor.java} | 9 ++++----- .../media}/MediaImgUploadRequestExecutor.java | 11 ++++------- .../qrcode/QrCodeApacheHttpRequestExecutor.java} | 7 +++---- .../qrcode/QrCodeJoddHttpRequestExecutor.java} | 7 +++---- .../qrcode/QrCodeOkhttpRequestExecutor.java} | 9 ++++----- .../qrcode}/QrCodeRequestExecutor.java | 11 ++++------- 30 files changed, 100 insertions(+), 141 deletions(-) rename weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/{http/apache/ApacheMaterialDeleteRequestExecutor.java => requestexecuter/material/MaterialDeleteApacheHttpRequestExecutor.java} (84%) rename weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/{http/jodd/JoddMaterialDeleteRequestExecutor.java => requestexecuter/material/MaterialDeleteJoddHttpRequestExecutor.java} (79%) rename weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/{http/okhttp/OkhttpMaterialDeleteRequestExecutor.java => requestexecuter/material/MaterialDeleteOkhttpRequestExecutor.java} (80%) rename weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/{http => requestexecuter/material}/MaterialDeleteRequestExecutor.java (56%) rename weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/{http/apache/ApacheMaterialNewsInfoRequestExecutor.java => requestexecuter/material/MaterialNewsInfoApacheHttpRequestExecutor.java} (90%) rename weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/{http/jodd/JoddMaterialNewsInfoRequestExecutor.java => requestexecuter/material/MaterialNewsInfoJoddHttpRequestExecutor.java} (84%) rename weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/{http/okhttp/OkhttpMaterialNewsInfoRequestExecutor.java => requestexecuter/material/MaterialNewsInfoOkhttpRequestExecutor.java} (87%) rename weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/{http => requestexecuter/material}/MaterialNewsInfoRequestExecutor.java (60%) rename weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/{http/apache/ApacheMaterialUploadRequestExecutor.java => requestexecuter/material/MaterialUploadApacheHttpRequestExecutor.java} (90%) rename weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/{http/jodd/JoddMaterialUploadRequestExecutor.java => requestexecuter/material/MaterialUploadJoddHttpRequestExecutor.java} (86%) rename weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/{http/okhttp/OkhttpMaterialUploadRequestExecutor.java => requestexecuter/material/MaterialUploadOkhttpRequestExecutor.java} (87%) rename weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/{http => requestexecuter/material}/MaterialUploadRequestExecutor.java (62%) rename weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/{http/apache/ApacheMaterialVideoInfoRequestExecutor.java => requestexecuter/material/MaterialVideoInfoApacheHttpRequestExecutor.java} (85%) rename weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/{http/jodd/JoddMaterialVideoInfoRequestExecutor.java => requestexecuter/material/MaterialVideoInfoJoddHttpRequestExecutor.java} (80%) rename weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/{http/okhttp/OkhttpMaterialVideoInfoRequestExecutor.java => requestexecuter/material/MaterialVideoInfoOkhttpRequestExecutor.java} (81%) rename weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/{http => requestexecuter/material}/MaterialVideoInfoRequestExecutor.java (61%) rename weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/{http/apache/ApacheMaterialVoiceAndImageDownloadRequestExecutor.java => requestexecuter/material/MaterialVoiceAndImageDownloadApacheHttpRequestExecutor.java} (85%) rename weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/{http/jodd/JoddMaterialVoiceAndImageDownloadRequestExecutor.java => requestexecuter/material/MaterialVoiceAndImageDownloadJoddHttpRequestExecutor.java} (83%) rename weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/{http/okhttp/OkhttpMaterialVoiceAndImageDownloadRequestExecutor.java => requestexecuter/material/MaterialVoiceAndImageDownloadOkhttpRequestExecutor.java} (83%) rename weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/{http => requestexecuter/material}/MaterialVoiceAndImageDownloadRequestExecutor.java (58%) rename weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/{http/apache/ApacheMediaImgUploadRequestExecutor.java => requestexecuter/media/MediaImgUploadApacheHttpRequestExecutor.java} (87%) rename weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/{http/jodd/JoddMediaImgUploadRequestExecutor.java => requestexecuter/media/MediaImgUploadHttpRequestExecutor.java} (86%) rename weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/{http/okhttp/OkhttpMediaImgUploadRequestExecutor.java => requestexecuter/media/MediaImgUploadOkhttpRequestExecutor.java} (83%) rename weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/{http => requestexecuter/media}/MediaImgUploadRequestExecutor.java (61%) rename weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/{http/apache/ApacheQrCodeRequestExecutor.java => requestexecuter/qrcode/QrCodeApacheHttpRequestExecutor.java} (89%) rename weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/{http/jodd/JoddQrCodeRequestExecutor.java => requestexecuter/qrcode/QrCodeJoddHttpRequestExecutor.java} (87%) rename weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/{http/okhttp/OkhttpQrCodeRequestExecutor.java => requestexecuter/qrcode/QrCodeOkhttpRequestExecutor.java} (86%) rename weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/{http => requestexecuter/qrcode}/QrCodeRequestExecutor.java (69%) diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpMaterialServiceImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpMaterialServiceImpl.java index 882ba4f7..5c539b5b 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpMaterialServiceImpl.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpMaterialServiceImpl.java @@ -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.WxMpService; 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 java.io.File; diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpQrcodeServiceImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpQrcodeServiceImpl.java index 6f752180..5783ce79 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpQrcodeServiceImpl.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpQrcodeServiceImpl.java @@ -6,7 +6,7 @@ import me.chanjar.weixin.common.error.WxErrorException; import me.chanjar.weixin.mp.api.WxMpQrcodeService; import me.chanjar.weixin.mp.api.WxMpService; 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 java.io.File; diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/apache/ApacheMaterialDeleteRequestExecutor.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/material/MaterialDeleteApacheHttpRequestExecutor.java similarity index 84% rename from weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/apache/ApacheMaterialDeleteRequestExecutor.java rename to weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/material/MaterialDeleteApacheHttpRequestExecutor.java index 3330997d..b6409325 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/apache/ApacheMaterialDeleteRequestExecutor.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/material/MaterialDeleteApacheHttpRequestExecutor.java @@ -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.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.apache.Utf8ResponseHandler; 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.client.config.RequestConfig; import org.apache.http.client.methods.CloseableHttpResponse; @@ -21,8 +20,8 @@ import java.util.Map; /** * Created by ecoolper on 2017/5/5. */ -public class ApacheMaterialDeleteRequestExecutor extends MaterialDeleteRequestExecutor { - public ApacheMaterialDeleteRequestExecutor(RequestHttp requestHttp) { +public class MaterialDeleteApacheHttpRequestExecutor extends MaterialDeleteRequestExecutor { + public MaterialDeleteApacheHttpRequestExecutor(RequestHttp requestHttp) { super(requestHttp); } diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/jodd/JoddMaterialDeleteRequestExecutor.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/material/MaterialDeleteJoddHttpRequestExecutor.java similarity index 79% rename from weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/jodd/JoddMaterialDeleteRequestExecutor.java rename to weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/material/MaterialDeleteJoddHttpRequestExecutor.java index 2ddfd463..f1ffdd6b 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/jodd/JoddMaterialDeleteRequestExecutor.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/material/MaterialDeleteJoddHttpRequestExecutor.java @@ -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.HttpRequest; @@ -10,15 +10,14 @@ import me.chanjar.weixin.common.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.mp.util.http.MaterialDeleteRequestExecutor; import java.io.IOException; /** * Created by ecoolper on 2017/5/5. */ -public class JoddMaterialDeleteRequestExecutor extends MaterialDeleteRequestExecutor { - public JoddMaterialDeleteRequestExecutor(RequestHttp requestHttp) { +public class MaterialDeleteJoddHttpRequestExecutor extends MaterialDeleteRequestExecutor { + public MaterialDeleteJoddHttpRequestExecutor(RequestHttp requestHttp) { super(requestHttp); } diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpMaterialDeleteRequestExecutor.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/material/MaterialDeleteOkhttpRequestExecutor.java similarity index 80% rename from weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpMaterialDeleteRequestExecutor.java rename to weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/material/MaterialDeleteOkhttpRequestExecutor.java index 5b4bb15d..1635793e 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpMaterialDeleteRequestExecutor.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/material/MaterialDeleteOkhttpRequestExecutor.java @@ -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.error.WxError; import me.chanjar.weixin.common.error.WxErrorException; import me.chanjar.weixin.common.util.http.RequestHttp; import me.chanjar.weixin.common.util.http.okhttp.OkHttpProxyInfo; -import me.chanjar.weixin.mp.util.http.MaterialDeleteRequestExecutor; import okhttp3.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -15,17 +14,17 @@ import java.io.IOException; /** * Created by ecoolper on 2017/5/5. */ -public class OkhttpMaterialDeleteRequestExecutor extends MaterialDeleteRequestExecutor { +public class MaterialDeleteOkhttpRequestExecutor extends MaterialDeleteRequestExecutor { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - public OkhttpMaterialDeleteRequestExecutor(RequestHttp requestHttp) { + public MaterialDeleteOkhttpRequestExecutor(RequestHttp requestHttp) { super(requestHttp); } @Override public Boolean execute(String uri, String materialId) throws WxErrorException, IOException { - logger.debug("OkhttpMaterialDeleteRequestExecutor is running"); + logger.debug("MaterialDeleteOkhttpRequestExecutor is running"); //得到httpClient OkHttpClient client = requestHttp.getRequestHttpClient(); diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MaterialDeleteRequestExecutor.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/material/MaterialDeleteRequestExecutor.java similarity index 56% rename from weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MaterialDeleteRequestExecutor.java rename to weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/material/MaterialDeleteRequestExecutor.java index 51b7a677..a185b54d 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MaterialDeleteRequestExecutor.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/material/MaterialDeleteRequestExecutor.java @@ -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.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 implements RequestExecutor { protected RequestHttp requestHttp; @@ -16,11 +13,11 @@ public abstract class MaterialDeleteRequestExecutor implements RequestExec public static RequestExecutor create(RequestHttp requestHttp) { switch (requestHttp.getRequestType()) { case APACHE_HTTP: - return new ApacheMaterialDeleteRequestExecutor(requestHttp); + return new MaterialDeleteApacheHttpRequestExecutor(requestHttp); case JODD_HTTP: - return new JoddMaterialDeleteRequestExecutor(requestHttp); + return new MaterialDeleteJoddHttpRequestExecutor(requestHttp); case OK_HTTP: - return new OkhttpMaterialDeleteRequestExecutor(requestHttp); + return new MaterialDeleteOkhttpRequestExecutor(requestHttp); default: return null; } diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/apache/ApacheMaterialNewsInfoRequestExecutor.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/material/MaterialNewsInfoApacheHttpRequestExecutor.java similarity index 90% rename from weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/apache/ApacheMaterialNewsInfoRequestExecutor.java rename to weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/material/MaterialNewsInfoApacheHttpRequestExecutor.java index 11401722..aa717c0a 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/apache/ApacheMaterialNewsInfoRequestExecutor.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/material/MaterialNewsInfoApacheHttpRequestExecutor.java @@ -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 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.json.WxGsonBuilder; 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 org.apache.http.HttpHost; import org.apache.http.client.config.RequestConfig; @@ -27,11 +26,11 @@ import java.io.IOException; * @author ecoolper * @date 2017/5/5 */ -public class ApacheMaterialNewsInfoRequestExecutor +public class MaterialNewsInfoApacheHttpRequestExecutor extends MaterialNewsInfoRequestExecutor { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - public ApacheMaterialNewsInfoRequestExecutor(RequestHttp requestHttp) { + public MaterialNewsInfoApacheHttpRequestExecutor(RequestHttp requestHttp) { super(requestHttp); } diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/jodd/JoddMaterialNewsInfoRequestExecutor.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/material/MaterialNewsInfoJoddHttpRequestExecutor.java similarity index 84% rename from weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/jodd/JoddMaterialNewsInfoRequestExecutor.java rename to weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/material/MaterialNewsInfoJoddHttpRequestExecutor.java index c3d6687f..d91e2afc 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/jodd/JoddMaterialNewsInfoRequestExecutor.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/material/MaterialNewsInfoJoddHttpRequestExecutor.java @@ -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 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.json.WxGsonBuilder; 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 org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -23,9 +22,9 @@ import java.io.IOException; /** * Created by ecoolper on 2017/5/5. */ -public class JoddMaterialNewsInfoRequestExecutor extends MaterialNewsInfoRequestExecutor { +public class MaterialNewsInfoJoddHttpRequestExecutor extends MaterialNewsInfoRequestExecutor { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - public JoddMaterialNewsInfoRequestExecutor(RequestHttp requestHttp) { + public MaterialNewsInfoJoddHttpRequestExecutor(RequestHttp requestHttp) { super(requestHttp); } diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpMaterialNewsInfoRequestExecutor.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/material/MaterialNewsInfoOkhttpRequestExecutor.java similarity index 87% rename from weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpMaterialNewsInfoRequestExecutor.java rename to weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/material/MaterialNewsInfoOkhttpRequestExecutor.java index 17f86bbf..5883a058 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpMaterialNewsInfoRequestExecutor.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/material/MaterialNewsInfoOkhttpRequestExecutor.java @@ -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 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.json.WxGsonBuilder; 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 okhttp3.*; import org.slf4j.Logger; @@ -19,9 +18,9 @@ import java.io.IOException; /** * Created by ecoolper on 2017/5/5. */ -public class OkhttpMaterialNewsInfoRequestExecutor extends MaterialNewsInfoRequestExecutor { +public class MaterialNewsInfoOkhttpRequestExecutor extends MaterialNewsInfoRequestExecutor { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - public OkhttpMaterialNewsInfoRequestExecutor(RequestHttp requestHttp) { + public MaterialNewsInfoOkhttpRequestExecutor(RequestHttp requestHttp) { super(requestHttp); } diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MaterialNewsInfoRequestExecutor.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/material/MaterialNewsInfoRequestExecutor.java similarity index 60% rename from weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MaterialNewsInfoRequestExecutor.java rename to weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/material/MaterialNewsInfoRequestExecutor.java index 24c00fe7..62ef709a 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MaterialNewsInfoRequestExecutor.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/material/MaterialNewsInfoRequestExecutor.java @@ -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.RequestHttp; 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 implements RequestExecutor { protected RequestHttp requestHttp; @@ -17,11 +14,11 @@ public abstract class MaterialNewsInfoRequestExecutor implements RequestEx public static RequestExecutor create(RequestHttp requestHttp) { switch (requestHttp.getRequestType()) { case APACHE_HTTP: - return new ApacheMaterialNewsInfoRequestExecutor(requestHttp); + return new MaterialNewsInfoApacheHttpRequestExecutor(requestHttp); case JODD_HTTP: - return new JoddMaterialNewsInfoRequestExecutor(requestHttp); + return new MaterialNewsInfoJoddHttpRequestExecutor(requestHttp); case OK_HTTP: - return new OkhttpMaterialNewsInfoRequestExecutor(requestHttp); + return new MaterialNewsInfoOkhttpRequestExecutor(requestHttp); default: //TODO 需要优化抛出异常 return null; diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/apache/ApacheMaterialUploadRequestExecutor.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/material/MaterialUploadApacheHttpRequestExecutor.java similarity index 90% rename from weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/apache/ApacheMaterialUploadRequestExecutor.java rename to weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/material/MaterialUploadApacheHttpRequestExecutor.java index f36db36c..d2e1029f 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/apache/ApacheMaterialUploadRequestExecutor.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/material/MaterialUploadApacheHttpRequestExecutor.java @@ -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.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.mp.bean.material.WxMpMaterial; 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.HttpHost; import org.apache.http.client.config.RequestConfig; @@ -28,8 +27,8 @@ import java.util.Map; /** * Created by ecoolper on 2017/5/5. */ -public class ApacheMaterialUploadRequestExecutor extends MaterialUploadRequestExecutor { - public ApacheMaterialUploadRequestExecutor(RequestHttp requestHttp) { +public class MaterialUploadApacheHttpRequestExecutor extends MaterialUploadRequestExecutor { + public MaterialUploadApacheHttpRequestExecutor(RequestHttp requestHttp) { super(requestHttp); } diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/jodd/JoddMaterialUploadRequestExecutor.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/material/MaterialUploadJoddHttpRequestExecutor.java similarity index 86% rename from weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/jodd/JoddMaterialUploadRequestExecutor.java rename to weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/material/MaterialUploadJoddHttpRequestExecutor.java index 7ef1846c..a09788a8 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/jodd/JoddMaterialUploadRequestExecutor.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/material/MaterialUploadJoddHttpRequestExecutor.java @@ -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.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.mp.bean.material.WxMpMaterial; import me.chanjar.weixin.mp.bean.material.WxMpMaterialUploadResult; -import me.chanjar.weixin.mp.util.http.MaterialUploadRequestExecutor; import java.io.File; import java.io.FileNotFoundException; @@ -23,8 +22,8 @@ import java.util.Map; /** * Created by ecoolper on 2017/5/5. */ -public class JoddMaterialUploadRequestExecutor extends MaterialUploadRequestExecutor { - public JoddMaterialUploadRequestExecutor(RequestHttp requestHttp) { +public class MaterialUploadJoddHttpRequestExecutor extends MaterialUploadRequestExecutor { + public MaterialUploadJoddHttpRequestExecutor(RequestHttp requestHttp) { super(requestHttp); } diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpMaterialUploadRequestExecutor.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/material/MaterialUploadOkhttpRequestExecutor.java similarity index 87% rename from weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpMaterialUploadRequestExecutor.java rename to weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/material/MaterialUploadOkhttpRequestExecutor.java index d2b43406..879df496 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpMaterialUploadRequestExecutor.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/material/MaterialUploadOkhttpRequestExecutor.java @@ -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.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.mp.bean.material.WxMpMaterial; import me.chanjar.weixin.mp.bean.material.WxMpMaterialUploadResult; -import me.chanjar.weixin.mp.util.http.MaterialUploadRequestExecutor; import okhttp3.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -21,16 +20,16 @@ import java.util.Map; /** * Created by ecoolper on 2017/5/5. */ -public class OkhttpMaterialUploadRequestExecutor extends MaterialUploadRequestExecutor { +public class MaterialUploadOkhttpRequestExecutor extends MaterialUploadRequestExecutor { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - public OkhttpMaterialUploadRequestExecutor(RequestHttp requestHttp) { + public MaterialUploadOkhttpRequestExecutor(RequestHttp requestHttp) { super(requestHttp); } @Override public WxMpMaterialUploadResult execute(String uri, WxMpMaterial material) throws WxErrorException, IOException { - logger.debug("OkhttpMaterialUploadRequestExecutor is running"); + logger.debug("MaterialUploadOkhttpRequestExecutor is running"); if (material == null) { throw new WxErrorException(WxError.builder().errorCode(-1).errorMsg("非法请求,material参数为空").build()); } diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MaterialUploadRequestExecutor.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/material/MaterialUploadRequestExecutor.java similarity index 62% rename from weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MaterialUploadRequestExecutor.java rename to weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/material/MaterialUploadRequestExecutor.java index 86f3aeee..c279be32 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MaterialUploadRequestExecutor.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/material/MaterialUploadRequestExecutor.java @@ -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.RequestHttp; import me.chanjar.weixin.mp.bean.material.WxMpMaterial; 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 @@ -21,11 +18,11 @@ public abstract class MaterialUploadRequestExecutor implements RequestExec public static RequestExecutor create(RequestHttp requestHttp) { switch (requestHttp.getRequestType()) { case APACHE_HTTP: - return new ApacheMaterialUploadRequestExecutor(requestHttp); + return new MaterialUploadApacheHttpRequestExecutor(requestHttp); case JODD_HTTP: - return new JoddMaterialUploadRequestExecutor(requestHttp); + return new MaterialUploadJoddHttpRequestExecutor(requestHttp); case OK_HTTP: - return new OkhttpMaterialUploadRequestExecutor(requestHttp); + return new MaterialUploadOkhttpRequestExecutor(requestHttp); default: return null; } diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/apache/ApacheMaterialVideoInfoRequestExecutor.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/material/MaterialVideoInfoApacheHttpRequestExecutor.java similarity index 85% rename from weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/apache/ApacheMaterialVideoInfoRequestExecutor.java rename to weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/material/MaterialVideoInfoApacheHttpRequestExecutor.java index cb2a727d..65af9cf7 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/apache/ApacheMaterialVideoInfoRequestExecutor.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/material/MaterialVideoInfoApacheHttpRequestExecutor.java @@ -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.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.json.WxGsonBuilder; 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.client.config.RequestConfig; import org.apache.http.client.methods.CloseableHttpResponse; @@ -22,8 +21,8 @@ import java.util.Map; /** * Created by ecoolper on 2017/5/5. */ -public class ApacheMaterialVideoInfoRequestExecutor extends MaterialVideoInfoRequestExecutor { - public ApacheMaterialVideoInfoRequestExecutor(RequestHttp requestHttp) { +public class MaterialVideoInfoApacheHttpRequestExecutor extends MaterialVideoInfoRequestExecutor { + public MaterialVideoInfoApacheHttpRequestExecutor(RequestHttp requestHttp) { super(requestHttp); } diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/jodd/JoddMaterialVideoInfoRequestExecutor.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/material/MaterialVideoInfoJoddHttpRequestExecutor.java similarity index 80% rename from weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/jodd/JoddMaterialVideoInfoRequestExecutor.java rename to weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/material/MaterialVideoInfoJoddHttpRequestExecutor.java index 8f98884f..852bea5d 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/jodd/JoddMaterialVideoInfoRequestExecutor.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/material/MaterialVideoInfoJoddHttpRequestExecutor.java @@ -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.HttpRequest; @@ -11,15 +11,14 @@ 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.mp.bean.material.WxMpMaterialVideoInfoResult; -import me.chanjar.weixin.mp.util.http.MaterialVideoInfoRequestExecutor; import java.io.IOException; /** * Created by ecoolper on 2017/5/5. */ -public class JoddMaterialVideoInfoRequestExecutor extends MaterialVideoInfoRequestExecutor { - public JoddMaterialVideoInfoRequestExecutor(RequestHttp requestHttp) { +public class MaterialVideoInfoJoddHttpRequestExecutor extends MaterialVideoInfoRequestExecutor { + public MaterialVideoInfoJoddHttpRequestExecutor(RequestHttp requestHttp) { super(requestHttp); } diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpMaterialVideoInfoRequestExecutor.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/material/MaterialVideoInfoOkhttpRequestExecutor.java similarity index 81% rename from weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpMaterialVideoInfoRequestExecutor.java rename to weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/material/MaterialVideoInfoOkhttpRequestExecutor.java index 579175a0..118c9673 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpMaterialVideoInfoRequestExecutor.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/material/MaterialVideoInfoOkhttpRequestExecutor.java @@ -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.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.okhttp.OkHttpProxyInfo; import me.chanjar.weixin.mp.bean.material.WxMpMaterialVideoInfoResult; -import me.chanjar.weixin.mp.util.http.MaterialVideoInfoRequestExecutor; import okhttp3.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -16,16 +15,16 @@ import java.io.IOException; /** * Created by ecoolper on 2017/5/5. */ -public class OkhttpMaterialVideoInfoRequestExecutor extends MaterialVideoInfoRequestExecutor { +public class MaterialVideoInfoOkhttpRequestExecutor extends MaterialVideoInfoRequestExecutor { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - public OkhttpMaterialVideoInfoRequestExecutor(RequestHttp requestHttp) { + public MaterialVideoInfoOkhttpRequestExecutor(RequestHttp requestHttp) { super(requestHttp); } @Override public WxMpMaterialVideoInfoResult execute(String uri, String materialId) throws WxErrorException, IOException { - logger.debug("OkhttpMaterialVideoInfoRequestExecutor is running"); + logger.debug("MaterialVideoInfoOkhttpRequestExecutor is running"); //得到httpClient OkHttpClient client = requestHttp.getRequestHttpClient(); diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MaterialVideoInfoRequestExecutor.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/material/MaterialVideoInfoRequestExecutor.java similarity index 61% rename from weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MaterialVideoInfoRequestExecutor.java rename to weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/material/MaterialVideoInfoRequestExecutor.java index 73948052..b09fd75a 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MaterialVideoInfoRequestExecutor.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/material/MaterialVideoInfoRequestExecutor.java @@ -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.RequestHttp; 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 implements RequestExecutor { @@ -20,11 +17,11 @@ public abstract class MaterialVideoInfoRequestExecutor implements RequestE public static RequestExecutor create(RequestHttp requestHttp) { switch (requestHttp.getRequestType()) { case APACHE_HTTP: - return new ApacheMaterialVideoInfoRequestExecutor(requestHttp); + return new MaterialVideoInfoApacheHttpRequestExecutor(requestHttp); case JODD_HTTP: - return new JoddMaterialVideoInfoRequestExecutor(requestHttp); + return new MaterialVideoInfoJoddHttpRequestExecutor(requestHttp); case OK_HTTP: - return new OkhttpMaterialVideoInfoRequestExecutor(requestHttp); + return new MaterialVideoInfoOkhttpRequestExecutor(requestHttp); default: return null; } diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/apache/ApacheMaterialVoiceAndImageDownloadRequestExecutor.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/material/MaterialVoiceAndImageDownloadApacheHttpRequestExecutor.java similarity index 85% rename from weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/apache/ApacheMaterialVoiceAndImageDownloadRequestExecutor.java rename to weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/material/MaterialVoiceAndImageDownloadApacheHttpRequestExecutor.java index 026a3341..cb295d06 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/apache/ApacheMaterialVoiceAndImageDownloadRequestExecutor.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/material/MaterialVoiceAndImageDownloadApacheHttpRequestExecutor.java @@ -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.WxErrorException; import me.chanjar.weixin.common.util.http.RequestHttp; import me.chanjar.weixin.common.util.http.apache.InputStreamResponseHandler; 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.http.HttpHost; import org.apache.http.client.config.RequestConfig; @@ -25,8 +24,8 @@ import java.util.Map; /** * Created by ecoolper on 2017/5/5. */ -public class ApacheMaterialVoiceAndImageDownloadRequestExecutor extends MaterialVoiceAndImageDownloadRequestExecutor { - public ApacheMaterialVoiceAndImageDownloadRequestExecutor(RequestHttp requestHttp, File tmpDirFile) { +public class MaterialVoiceAndImageDownloadApacheHttpRequestExecutor extends MaterialVoiceAndImageDownloadRequestExecutor { + public MaterialVoiceAndImageDownloadApacheHttpRequestExecutor(RequestHttp requestHttp, File tmpDirFile) { super(requestHttp, tmpDirFile); } diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/jodd/JoddMaterialVoiceAndImageDownloadRequestExecutor.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/material/MaterialVoiceAndImageDownloadJoddHttpRequestExecutor.java similarity index 83% rename from weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/jodd/JoddMaterialVoiceAndImageDownloadRequestExecutor.java rename to weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/material/MaterialVoiceAndImageDownloadJoddHttpRequestExecutor.java index f307843f..391befbb 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/jodd/JoddMaterialVoiceAndImageDownloadRequestExecutor.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/material/MaterialVoiceAndImageDownloadJoddHttpRequestExecutor.java @@ -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.HttpRequest; @@ -10,7 +10,6 @@ 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.json.WxGsonBuilder; -import me.chanjar.weixin.mp.util.http.MaterialVoiceAndImageDownloadRequestExecutor; import org.apache.commons.io.IOUtils; import java.io.ByteArrayInputStream; @@ -22,8 +21,8 @@ import java.nio.charset.StandardCharsets; /** * Created by ecoolper on 2017/5/5. */ -public class JoddMaterialVoiceAndImageDownloadRequestExecutor extends MaterialVoiceAndImageDownloadRequestExecutor { - public JoddMaterialVoiceAndImageDownloadRequestExecutor(RequestHttp requestHttp, File tmpDirFile) { +public class MaterialVoiceAndImageDownloadJoddHttpRequestExecutor extends MaterialVoiceAndImageDownloadRequestExecutor { + public MaterialVoiceAndImageDownloadJoddHttpRequestExecutor(RequestHttp requestHttp, File tmpDirFile) { super(requestHttp, tmpDirFile); } diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpMaterialVoiceAndImageDownloadRequestExecutor.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/material/MaterialVoiceAndImageDownloadOkhttpRequestExecutor.java similarity index 83% rename from weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpMaterialVoiceAndImageDownloadRequestExecutor.java rename to weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/material/MaterialVoiceAndImageDownloadOkhttpRequestExecutor.java index 8bd374ce..8952d173 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpMaterialVoiceAndImageDownloadRequestExecutor.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/material/MaterialVoiceAndImageDownloadOkhttpRequestExecutor.java @@ -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.error.WxError; import me.chanjar.weixin.common.error.WxErrorException; import me.chanjar.weixin.common.util.http.RequestHttp; import me.chanjar.weixin.common.util.http.okhttp.OkHttpProxyInfo; -import me.chanjar.weixin.mp.util.http.MaterialVoiceAndImageDownloadRequestExecutor; import okhttp3.*; import okio.BufferedSink; import okio.Okio; @@ -17,16 +16,16 @@ import java.io.*; /** * Created by ecoolper on 2017/5/5. */ -public class OkhttpMaterialVoiceAndImageDownloadRequestExecutor extends MaterialVoiceAndImageDownloadRequestExecutor { +public class MaterialVoiceAndImageDownloadOkhttpRequestExecutor extends MaterialVoiceAndImageDownloadRequestExecutor { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - public OkhttpMaterialVoiceAndImageDownloadRequestExecutor(RequestHttp requestHttp, File tmpDirFile) { + public MaterialVoiceAndImageDownloadOkhttpRequestExecutor(RequestHttp requestHttp, File tmpDirFile) { super(requestHttp, tmpDirFile); } @Override public InputStream execute(String uri, String materialId) throws WxErrorException, IOException { - logger.debug("OkhttpMaterialVoiceAndImageDownloadRequestExecutor is running"); + logger.debug("MaterialVoiceAndImageDownloadOkhttpRequestExecutor is running"); OkHttpClient client = requestHttp.getRequestHttpClient(); RequestBody requestBody = new FormBody.Builder().add("media_id", materialId).build(); Request request = new Request.Builder().url(uri).get().post(requestBody).build(); diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MaterialVoiceAndImageDownloadRequestExecutor.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/material/MaterialVoiceAndImageDownloadRequestExecutor.java similarity index 58% rename from weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MaterialVoiceAndImageDownloadRequestExecutor.java rename to weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/material/MaterialVoiceAndImageDownloadRequestExecutor.java index 8a4f7462..c11c41cc 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MaterialVoiceAndImageDownloadRequestExecutor.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/material/MaterialVoiceAndImageDownloadRequestExecutor.java @@ -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.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.InputStream; @@ -22,11 +19,11 @@ public abstract class MaterialVoiceAndImageDownloadRequestExecutor public static RequestExecutor create(RequestHttp requestHttp, File tmpDirFile) { switch (requestHttp.getRequestType()) { case APACHE_HTTP: - return new ApacheMaterialVoiceAndImageDownloadRequestExecutor(requestHttp, tmpDirFile); + return new MaterialVoiceAndImageDownloadApacheHttpRequestExecutor(requestHttp, tmpDirFile); case JODD_HTTP: - return new JoddMaterialVoiceAndImageDownloadRequestExecutor(requestHttp, tmpDirFile); + return new MaterialVoiceAndImageDownloadJoddHttpRequestExecutor(requestHttp, tmpDirFile); case OK_HTTP: - return new OkhttpMaterialVoiceAndImageDownloadRequestExecutor(requestHttp, tmpDirFile); + return new MaterialVoiceAndImageDownloadOkhttpRequestExecutor(requestHttp, tmpDirFile); default: return null; } diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/apache/ApacheMediaImgUploadRequestExecutor.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/media/MediaImgUploadApacheHttpRequestExecutor.java similarity index 87% rename from weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/apache/ApacheMediaImgUploadRequestExecutor.java rename to weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/media/MediaImgUploadApacheHttpRequestExecutor.java index 07c193a2..dc6d9792 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/apache/ApacheMediaImgUploadRequestExecutor.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/media/MediaImgUploadApacheHttpRequestExecutor.java @@ -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.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.apache.Utf8ResponseHandler; 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.HttpHost; import org.apache.http.client.config.RequestConfig; @@ -25,8 +24,8 @@ import java.io.IOException; * * @author ecoolper */ -public class ApacheMediaImgUploadRequestExecutor extends MediaImgUploadRequestExecutor { - public ApacheMediaImgUploadRequestExecutor(RequestHttp requestHttp) { +public class MediaImgUploadApacheHttpRequestExecutor extends MediaImgUploadRequestExecutor { + public MediaImgUploadApacheHttpRequestExecutor(RequestHttp requestHttp) { super(requestHttp); } diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/jodd/JoddMediaImgUploadRequestExecutor.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/media/MediaImgUploadHttpRequestExecutor.java similarity index 86% rename from weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/jodd/JoddMediaImgUploadRequestExecutor.java rename to weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/media/MediaImgUploadHttpRequestExecutor.java index 60ef4985..c7ff37ba 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/jodd/JoddMediaImgUploadRequestExecutor.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/media/MediaImgUploadHttpRequestExecutor.java @@ -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.HttpRequest; @@ -11,7 +11,6 @@ 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.mp.bean.material.WxMediaImgUploadResult; -import me.chanjar.weixin.mp.util.http.MediaImgUploadRequestExecutor; import java.io.File; import java.io.IOException; @@ -21,8 +20,8 @@ import java.io.IOException; * * @author ecoolper */ -public class JoddMediaImgUploadRequestExecutor extends MediaImgUploadRequestExecutor { - public JoddMediaImgUploadRequestExecutor(RequestHttp requestHttp) { +public class MediaImgUploadHttpRequestExecutor extends MediaImgUploadRequestExecutor { + public MediaImgUploadHttpRequestExecutor(RequestHttp requestHttp) { super(requestHttp); } diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpMediaImgUploadRequestExecutor.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/media/MediaImgUploadOkhttpRequestExecutor.java similarity index 83% rename from weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpMediaImgUploadRequestExecutor.java rename to weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/media/MediaImgUploadOkhttpRequestExecutor.java index 89e5e28f..c787126e 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpMediaImgUploadRequestExecutor.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/media/MediaImgUploadOkhttpRequestExecutor.java @@ -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.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.okhttp.OkHttpProxyInfo; import me.chanjar.weixin.mp.bean.material.WxMediaImgUploadResult; -import me.chanjar.weixin.mp.util.http.MediaImgUploadRequestExecutor; import okhttp3.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -19,16 +18,16 @@ import java.io.IOException; * * @author ecoolper */ -public class OkhttpMediaImgUploadRequestExecutor extends MediaImgUploadRequestExecutor { +public class MediaImgUploadOkhttpRequestExecutor extends MediaImgUploadRequestExecutor { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - public OkhttpMediaImgUploadRequestExecutor(RequestHttp requestHttp) { + public MediaImgUploadOkhttpRequestExecutor(RequestHttp requestHttp) { super(requestHttp); } @Override public WxMediaImgUploadResult execute(String uri, File file) throws WxErrorException, IOException { - logger.debug("OkhttpMediaImgUploadRequestExecutor is running"); + logger.debug("MediaImgUploadOkhttpRequestExecutor is running"); //得到httpClient OkHttpClient client = requestHttp.getRequestHttpClient(); diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MediaImgUploadRequestExecutor.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/media/MediaImgUploadRequestExecutor.java similarity index 61% rename from weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MediaImgUploadRequestExecutor.java rename to weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/media/MediaImgUploadRequestExecutor.java index e187561f..c937fbe5 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MediaImgUploadRequestExecutor.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/media/MediaImgUploadRequestExecutor.java @@ -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.RequestHttp; 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; @@ -22,11 +19,11 @@ public abstract class MediaImgUploadRequestExecutor implements RequestExec public static RequestExecutor create(RequestHttp requestHttp) { switch (requestHttp.getRequestType()) { case APACHE_HTTP: - return new ApacheMediaImgUploadRequestExecutor(requestHttp); + return new MediaImgUploadApacheHttpRequestExecutor(requestHttp); case JODD_HTTP: - return new JoddMediaImgUploadRequestExecutor(requestHttp); + return new MediaImgUploadHttpRequestExecutor(requestHttp); case OK_HTTP: - return new OkhttpMediaImgUploadRequestExecutor(requestHttp); + return new MediaImgUploadOkhttpRequestExecutor(requestHttp); default: return null; } diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/apache/ApacheQrCodeRequestExecutor.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/qrcode/QrCodeApacheHttpRequestExecutor.java similarity index 89% rename from weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/apache/ApacheQrCodeRequestExecutor.java rename to weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/qrcode/QrCodeApacheHttpRequestExecutor.java index dc2db772..6280be7a 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/apache/ApacheQrCodeRequestExecutor.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/qrcode/QrCodeApacheHttpRequestExecutor.java @@ -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.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.Utf8ResponseHandler; 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.HttpHost; import org.apache.http.client.config.RequestConfig; @@ -26,8 +25,8 @@ import java.util.UUID; /** * Created by ecoolper on 2017/5/5. */ -public class ApacheQrCodeRequestExecutor extends QrCodeRequestExecutor { - public ApacheQrCodeRequestExecutor(RequestHttp requestHttp) { +public class QrCodeApacheHttpRequestExecutor extends QrCodeRequestExecutor { + public QrCodeApacheHttpRequestExecutor(RequestHttp requestHttp) { super(requestHttp); } diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/jodd/JoddQrCodeRequestExecutor.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/qrcode/QrCodeJoddHttpRequestExecutor.java similarity index 87% rename from weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/jodd/JoddQrCodeRequestExecutor.java rename to weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/qrcode/QrCodeJoddHttpRequestExecutor.java index 5eb066b0..1798065f 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/jodd/JoddQrCodeRequestExecutor.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/qrcode/QrCodeJoddHttpRequestExecutor.java @@ -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.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.http.RequestHttp; import me.chanjar.weixin.mp.bean.result.WxMpQrCodeTicket; -import me.chanjar.weixin.mp.util.http.QrCodeRequestExecutor; import java.io.ByteArrayInputStream; import java.io.File; @@ -25,8 +24,8 @@ import java.util.UUID; /** * Created by ecoolper on 2017/5/5. */ -public class JoddQrCodeRequestExecutor extends QrCodeRequestExecutor { - public JoddQrCodeRequestExecutor(RequestHttp requestHttp) { +public class QrCodeJoddHttpRequestExecutor extends QrCodeRequestExecutor { + public QrCodeJoddHttpRequestExecutor(RequestHttp requestHttp) { super(requestHttp); } diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpQrCodeRequestExecutor.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/qrcode/QrCodeOkhttpRequestExecutor.java similarity index 86% rename from weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpQrCodeRequestExecutor.java rename to weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/qrcode/QrCodeOkhttpRequestExecutor.java index acecf735..825af377 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpQrCodeRequestExecutor.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/qrcode/QrCodeOkhttpRequestExecutor.java @@ -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.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.okhttp.OkHttpProxyInfo; import me.chanjar.weixin.mp.bean.result.WxMpQrCodeTicket; -import me.chanjar.weixin.mp.util.http.QrCodeRequestExecutor; import okhttp3.OkHttpClient; import okhttp3.Request; import okhttp3.Response; @@ -25,16 +24,16 @@ import java.util.UUID; * @author ecoolper * @date 2017/5/5 */ -public class OkhttpQrCodeRequestExecutor extends QrCodeRequestExecutor { +public class QrCodeOkhttpRequestExecutor extends QrCodeRequestExecutor { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - public OkhttpQrCodeRequestExecutor(RequestHttp requestHttp) { + public QrCodeOkhttpRequestExecutor(RequestHttp requestHttp) { super(requestHttp); } @Override public File execute(String uri, WxMpQrCodeTicket ticket) throws WxErrorException, IOException { - logger.debug("OkhttpQrCodeRequestExecutor is running"); + logger.debug("QrCodeOkhttpRequestExecutor is running"); if (ticket != null) { if (uri.indexOf('?') == -1) { diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/QrCodeRequestExecutor.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/qrcode/QrCodeRequestExecutor.java similarity index 69% rename from weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/QrCodeRequestExecutor.java rename to weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/qrcode/QrCodeRequestExecutor.java index e7b8cce3..7c666cd0 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/QrCodeRequestExecutor.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/qrcode/QrCodeRequestExecutor.java @@ -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.WxErrorException; import me.chanjar.weixin.common.util.http.RequestExecutor; import me.chanjar.weixin.common.util.http.RequestHttp; 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; @@ -26,11 +23,11 @@ public abstract class QrCodeRequestExecutor implements RequestExecutor create(RequestHttp requestHttp) throws WxErrorException { switch (requestHttp.getRequestType()) { case APACHE_HTTP: - return new ApacheQrCodeRequestExecutor(requestHttp); + return new QrCodeApacheHttpRequestExecutor(requestHttp); case JODD_HTTP: - return new JoddQrCodeRequestExecutor(requestHttp); + return new QrCodeJoddHttpRequestExecutor(requestHttp); case OK_HTTP: - return new OkhttpQrCodeRequestExecutor(requestHttp); + return new QrCodeOkhttpRequestExecutor(requestHttp); default: throw new WxErrorException(WxError.builder().errorCode(-1).errorMsg("不支持的http框架").build()); }