binarywang#869 修复下载临时素材接口异常处理不当的问题

gaigeshen · binarywang · commit ac405b0bc296 · 2018-12-11T17:10:57.000+08:00
diff --git a/.gitignore b/.gitignore
@@ -53,3 +53,6 @@ sonar-project.properties
 
 !/.mvn/wrapper/maven-wrapper.jar
 *.versionsBackup
+
+# STS
+.factorypath
diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/HttpResponseProxy.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/HttpResponseProxy.java
@@ -58,7 +58,7 @@ public String getFileName() throws WxErrorException {
   private String getFileName(CloseableHttpResponse response) throws WxErrorException {
     Header[] contentDispositionHeader = response.getHeaders("Content-disposition");
     if (contentDispositionHeader == null || contentDispositionHeader.length == 0) {
-      throw new WxErrorException(WxError.builder().errorMsg("无法获取到文件名").build());
+      throw new WxErrorException(WxError.builder().errorMsg("无法获取到文件名").errorCode(99999).build());
     }
 
     return this.extractFileNameFromContentString(contentDispositionHeader[0].getValue());
@@ -76,15 +76,15 @@ private String getFileName(Response response) throws WxErrorException {
 
   private String extractFileNameFromContentString(String content) throws WxErrorException {
     if (content == null || content.length() == 0) {
-      throw new WxErrorException(WxError.builder().errorMsg("无法获取到文件名").build());
+      throw new WxErrorException(WxError.builder().errorMsg("无法获取到文件名").errorCode(99999).build());
     }
 
     Matcher m = PATTERN.matcher(content);
     if (m.matches()) {
       return m.group(1);
     }
 
-    throw new WxErrorException(WxError.builder().errorMsg("无法获取到文件名").build());
+    throw new WxErrorException(WxError.builder().errorMsg("无法获取到文件名").errorCode(99999).build());
   }
 
 }

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ public String getFileName() throws WxErrorException {`
`58`	`58`	`private String getFileName(CloseableHttpResponse response) throws WxErrorException {`
`59`	`59`	`Header[] contentDispositionHeader = response.getHeaders("Content-disposition");`
`60`	`60`	`if (contentDispositionHeader == null \|\| contentDispositionHeader.length == 0) {`
`61`		`- throw new WxErrorException(WxError.builder().errorMsg("无法获取到文件名").build());`
	`61`	`+ throw new WxErrorException(WxError.builder().errorMsg("无法获取到文件名").errorCode(99999).build());`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`return this.extractFileNameFromContentString(contentDispositionHeader[0].getValue());`
`@@ -76,15 +76,15 @@ private String getFileName(Response response) throws WxErrorException {`
`76`	`76`
`77`	`77`	`private String extractFileNameFromContentString(String content) throws WxErrorException {`
`78`	`78`	`if (content == null \|\| content.length() == 0) {`
`79`		`- throw new WxErrorException(WxError.builder().errorMsg("无法获取到文件名").build());`
	`79`	`+ throw new WxErrorException(WxError.builder().errorMsg("无法获取到文件名").errorCode(99999).build());`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`Matcher m = PATTERN.matcher(content);`
`83`	`83`	`if (m.matches()) {`
`84`	`84`	`return m.group(1);`
`85`	`85`	`}`
`86`	`86`
`87`		`- throw new WxErrorException(WxError.builder().errorMsg("无法获取到文件名").build());`
	`87`	`+ throw new WxErrorException(WxError.builder().errorMsg("无法获取到文件名").errorCode(99999).build());`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`}`