修改了冲突和错误

ecoolper · ecoolper · commit d01d372b654f · 2017-04-27T20:14:52.000+08:00
diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/MediaDownloadRequestExecutor.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/MediaDownloadRequestExecutor.java
@@ -10,7 +10,6 @@
 import me.chanjar.weixin.common.util.fs.FileUtils;
 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.okhttp.OkhttpProxyInfo;
 import okhttp3.*;
 
@@ -112,7 +111,7 @@ public File executeApache(CloseableHttpClient httpclient, HttpHost httpProxy, St
         }
       }
 
-      String fileName = getFileNameApache(response);
+      String fileName = getFileName(response);
       if (StringUtils.isBlank(fileName)) {
         return null;
       }
@@ -129,6 +128,7 @@ public File executeApache(CloseableHttpClient httpclient, HttpHost httpProxy, St
 
   /**
    * jodd-http实现方式
+   *
    * @param provider
    * @param proxyInfo
    * @param uri
@@ -237,23 +237,7 @@ private String getFileName(Response response) throws WxErrorException {
     if (m.matches()) {
       return m.group(1);
     }
-    request.withConnectionProvider(provider);
-    HttpResponse response = request.send();
-    String contentType = response.header("Content-Type");
-    if (contentType != null && contentType.startsWith("application/json")) {
-      // application/json; encoding=utf-8 下载媒体文件出错
-      throw new WxErrorException(WxError.fromJson(response.bodyText()));
-    }
-
-    String fileName = getFileNameJodd(response);
-    if (StringUtils.isBlank(fileName)) {
-      return null;
-    }
-
-    InputStream inputStream = new ByteArrayInputStream(response.bodyBytes());
-    String[] nameAndExt = fileName.split("\\.");
-    return FileUtils.createTmpFile(inputStream, nameAndExt[0], nameAndExt[1], this.tmpDirFile);
+    throw new WxErrorException(WxError.newBuilder().setErrorMsg("无法获取到文件名").build());
   }
 
-
 }
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/apache/WxCpServiceImpl.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/apache/WxCpServiceImpl.java
@@ -1,13 +1,13 @@
 package me.chanjar.weixin.cp.api.impl.apache;
 
+
 import me.chanjar.weixin.common.bean.WxAccessToken;
 import me.chanjar.weixin.common.bean.result.WxError;
 import me.chanjar.weixin.common.exception.WxErrorException;
 import me.chanjar.weixin.common.util.http.apache.ApacheHttpClientBuilder;
 import me.chanjar.weixin.common.util.http.apache.DefaultApacheHttpClientBuilder;
 import me.chanjar.weixin.cp.api.impl.AbstractWxCpService;
 
-
 import org.apache.http.HttpHost;
 import org.apache.http.client.config.RequestConfig;
 import org.apache.http.client.methods.CloseableHttpResponse;
@@ -73,7 +73,6 @@ public String getAccessToken(boolean forceRefresh) throws WxErrorException {
   }
 
   @Override
-
   public void initHttp() {
     ApacheHttpClientBuilder apacheHttpClientBuilder = this.configStorage
       .getApacheHttpClientBuilder();
@@ -92,5 +91,4 @@ public void initHttp() {
 
     this.httpClient = apacheHttpClientBuilder.build();
   }
-
 }
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/jodd/WxCpServiceImpl.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/jodd/WxCpServiceImpl.java
@@ -19,7 +19,6 @@ public HttpConnectionProvider getRequestHttpClient() {
   @Override
   public ProxyInfo getRequestHttpProxy() {
     return httpProxy;
-
   }
 
   @Override
@@ -57,12 +56,10 @@ public String getAccessToken(boolean forceRefresh) throws WxErrorException {
 
   @Override
   public void initHttp() {
-
     if (this.configStorage.getHttpProxyHost() != null && this.configStorage.getHttpProxyPort() > 0) {
       httpProxy = new ProxyInfo(ProxyInfo.ProxyType.HTTP, configStorage.getHttpProxyHost(), configStorage.getHttpProxyPort(), configStorage.getHttpProxyUsername(), configStorage.getHttpProxyPassword());
     }
 
     httpClient = JoddHttp.httpConnectionProvider;
   }
-
 }
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/apache/WxMpServiceImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/apache/WxMpServiceImpl.java
@@ -1,6 +1,5 @@
 package me.chanjar.weixin.mp.api.impl.apache;
 
-
 import java.io.IOException;
 import java.util.concurrent.locks.Lock;
 
@@ -72,13 +71,11 @@ public String getAccessToken(boolean forceRefresh) throws WxErrorException {
           + this.getWxMpConfigStorage().getSecret();
         try {
           HttpGet httpGet = new HttpGet(url);
-
           if (this.getRequestHttpProxy() != null) {
             RequestConfig config = RequestConfig.custom().setProxy(this.getRequestHttpProxy()).build();
             httpGet.setConfig(config);
           }
           try (CloseableHttpResponse response = getRequestHttpClient().execute(httpGet)) {
-
             String resultContent = new BasicResponseHandler().handleResponse(response);
             WxError error = WxError.fromJson(resultContent);
             if (error.getErrorCode() != 0) {
@@ -99,5 +96,4 @@ public String getAccessToken(boolean forceRefresh) throws WxErrorException {
     }
     return this.getWxMpConfigStorage().getAccessToken();
   }
-
 }
diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpBusyRetryTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpBusyRetryTest.java
@@ -19,7 +19,7 @@ public class WxMpBusyRetryTest {
 
   @DataProvider(name = "getService")
   public Object[][] getService() {
-    WxMpService service = new WxMpServiceImpl0() {
+    WxMpService service = new WxMpServiceImpl() {
 
       @Override
       public synchronized <T, E> T executeInternal(
diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/test/ApiTestModule.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/test/ApiTestModule.java
@@ -20,7 +20,7 @@ public void configure(Binder binder) {
     try (InputStream is1 = ClassLoader.getSystemResourceAsStream("test-config.xml")) {
       TestConfigStorage config = this.fromXml(TestConfigStorage.class, is1);
       config.setAccessTokenLock(new ReentrantLock());
-      WxMpService wxService = new WxMpServiceImpl0();
+      WxMpService wxService = new WxMpServiceImpl();
       wxService.setWxMpConfigStorage(config);
 
       binder.bind(WxMpService.class).toInstance(wxService);
diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/demo/WxMpDemoServer.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/demo/WxMpDemoServer.java
@@ -5,7 +5,6 @@
 import me.chanjar.weixin.mp.api.WxMpMessageHandler;
 import me.chanjar.weixin.mp.api.WxMpMessageRouter;
 import me.chanjar.weixin.mp.api.WxMpService;
-
 import me.chanjar.weixin.mp.api.impl.apache.WxMpServiceImpl;
 
 import org.eclipse.jetty.server.Server;
@@ -49,7 +48,7 @@ private static void initWeixin() {
         .fromXml(is1);
 
       wxMpConfigStorage = config;
-      wxMpService = new WxMpServiceImpl0();
+      wxMpService = new WxMpServiceImpl();
       wxMpService.setWxMpConfigStorage(config);
 
       WxMpMessageHandler logHandler = new DemoLogHandler();

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,6 @@ public HttpConnectionProvider getRequestHttpClient() {`
`19`	`19`	`@Override`
`20`	`20`	`public ProxyInfo getRequestHttpProxy() {`
`21`	`21`	`return httpProxy;`
`22`		`-`
`23`	`22`	`}`
`24`	`23`
`25`	`24`	`@Override`
`@@ -57,12 +56,10 @@ public String getAccessToken(boolean forceRefresh) throws WxErrorException {`
`57`	`56`
`58`	`57`	`@Override`
`59`	`58`	`public void initHttp() {`
`60`		`-`
`61`	`59`	`if (this.configStorage.getHttpProxyHost() != null && this.configStorage.getHttpProxyPort() > 0) {`
`62`	`60`	`httpProxy = new ProxyInfo(ProxyInfo.ProxyType.HTTP, configStorage.getHttpProxyHost(), configStorage.getHttpProxyPort(), configStorage.getHttpProxyUsername(), configStorage.getHttpProxyPassword());`
`63`	`61`	`}`
`64`	`62`
`65`	`63`	`httpClient = JoddHttp.httpConnectionProvider;`
`66`	`64`	`}`
`67`		`-`
`68`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`package me.chanjar.weixin.mp.api.impl.apache;`
`2`	`2`
`3`		`-`
`4`	`3`	`import java.io.IOException;`
`5`	`4`	`import java.util.concurrent.locks.Lock;`
`6`	`5`
`@@ -72,13 +71,11 @@ public String getAccessToken(boolean forceRefresh) throws WxErrorException {`
`72`	`71`	`+ this.getWxMpConfigStorage().getSecret();`
`73`	`72`	`try {`
`74`	`73`	`HttpGet httpGet = new HttpGet(url);`
`75`		`-`
`76`	`74`	`if (this.getRequestHttpProxy() != null) {`
`77`	`75`	`RequestConfig config = RequestConfig.custom().setProxy(this.getRequestHttpProxy()).build();`
`78`	`76`	`httpGet.setConfig(config);`
`79`	`77`	`}`
`80`	`78`	`try (CloseableHttpResponse response = getRequestHttpClient().execute(httpGet)) {`
`81`		`-`
`82`	`79`	`String resultContent = new BasicResponseHandler().handleResponse(response);`
`83`	`80`	`WxError error = WxError.fromJson(resultContent);`
`84`	`81`	`if (error.getErrorCode() != 0) {`
`@@ -99,5 +96,4 @@ public String getAccessToken(boolean forceRefresh) throws WxErrorException {`
`99`	`96`	`}`
`100`	`97`	`return this.getWxMpConfigStorage().getAccessToken();`
`101`	`98`	`}`
`102`		`-`
`103`	`99`	`}`