From 1a4bf6faa93dc711c87ba4e8d5a2e0a482297e9c Mon Sep 17 00:00:00 2001
From: jinyu <foxinmy@gmail.com>
Date: Fri, 21 Oct 2016 15:38:48 +0800
Subject: [PATCH] fixed micropay

---
 .../src/main/java/com/foxinmy/weixin4j/api/PayApi.java          | 2 +-
 weixin4j-example/src/main/resources/spring-weixin4j-proxy.xml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/api/PayApi.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/api/PayApi.java
index a0c59ec0..7da9f278 100644
--- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/api/PayApi.java
+++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/api/PayApi.java
@@ -110,7 +110,7 @@ public class PayApi extends MchApi {
 			super.declareMerchant(payPackage);
 			JSONObject _payPackage = (JSONObject) JSON.toJSON(payPackage);
 			// 不需要设置TradeType参数
-			_payPackage.remove("tradeType");
+			_payPackage.remove("trade_type");
 			payPackage.setSign(weixinSignature.sign(_payPackage));
 			String para = XmlStream.toXML(payPackage);
 			WeixinResponse response = weixinExecutor.post(
diff --git a/weixin4j-example/src/main/resources/spring-weixin4j-proxy.xml b/weixin4j-example/src/main/resources/spring-weixin4j-proxy.xml
index ce335aaa..0ff7e3d5 100644
--- a/weixin4j-example/src/main/resources/spring-weixin4j-proxy.xml
+++ b/weixin4j-example/src/main/resources/spring-weixin4j-proxy.xml
@@ -17,7 +17,7 @@
 		<!-- token存储:不声明则默认使用文件方式(FileCacheStorager)保存,请自行引入redis配置文件 -->
 		<!-- constructor-arg>
 			<bean class="com.foxinmy.weixin4j.cache.RedisCacheStorager">
-				<constructor-arg type="redis.clients.jedis.JedisPool">
+				<constructor-arg type="redis.clients.util.Pool">
 					<bean class="redis.clients.jedis.JedisPool">
 						<constructor-arg index="0">
 							<bean class="redis.clients.jedis.JedisPoolConfig">