2.4.6 解决红包发送乱码

liyiorg · Nov 12, 2015 · 5efe1ce · 5efe1ce
1 parent 317e3e8
commit 5efe1ce
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/changelog.txt b/changelog.txt
@@ -2,6 +2,11 @@ WEIXIN-POPULAR CHANGELOG
 ===========================
 https://github.com/liyiorg/weixin-popular
 
+Changes in version 2.4.6 (2015-11-12)
+-------------------------------------
+*修改XmlResponseHandler 解决微信红包接口返回结果中文乱码问题
+*修改PayMchAPI 查询退款uri 地址错误
+
 Changes in version 2.4.5 (2015-09-08)
 -------------------------------------
 *修改QrcodeAPI 下载二维码bug

diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>weixin</groupId>
 	<artifactId>weixin-popular</artifactId>
-	<version>2.4.5-RELEASE</version>
+	<version>2.4.6-RELEASE</version>
 	<url>https://github.com/liyiorg/weixin-popular</url>
 
 	<dependencies>

diff --git a/src/main/java/weixin/popular/api/PayMchAPI.java b/src/main/java/weixin/popular/api/PayMchAPI.java
@@ -207,7 +207,7 @@ public static RefundqueryResult payRefundquery(Refundquery refundquery,String ke
 		String refundqueryXML = XMLConverUtil.convertToXML(refundquery);
 		HttpUriRequest httpUriRequest = RequestBuilder.post()
 				.setHeader(xmlHeader)
-				.setUri(MCH_URI + "/pay/refundqueryd")
+				.setUri(MCH_URI + "/pay/refundquery")
 				.setEntity(new StringEntity(refundqueryXML,Charset.forName("utf-8")))
 				.build();
 		return LocalHttpClient.executeXmlResult(httpUriRequest,RefundqueryResult.class);

diff --git a/src/main/java/weixin/popular/client/XmlResponseHandler.java b/src/main/java/weixin/popular/client/XmlResponseHandler.java
@@ -4,6 +4,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import org.apache.http.Header;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
 import org.apache.http.client.ClientProtocolException;
@@ -29,7 +30,12 @@ public T handleResponse(HttpResponse response)
 	                if (status >= 200 && status < 300) {
 	                    HttpEntity entity = response.getEntity();
 	                    String str = EntityUtils.toString(entity);
-	                   return XMLConverUtil.convertToObject(clazz,new String(str.getBytes("iso-8859-1"),"utf-8"));
+	                    Header contentType = response.getEntity().getContentType();
+	                    if(contentType!=null&&contentType.toString().matches(".*[uU][tT][fF]-8$")){
+	                    	return XMLConverUtil.convertToObject(clazz,str);
+	                    }else{
+	                    	return XMLConverUtil.convertToObject(clazz,new String(str.getBytes("iso-8859-1"),"utf-8"));
+	                    }
 	                } else {
 	                    throw new ClientProtocolException("Unexpected response status: " + status);
 	                }