From bc937b4095808c53241315e0c5b630a609ea4229 Mon Sep 17 00:00:00 2001
From: jinyu <foxinmy@gmail.com>
Date: Fri, 26 Jun 2015 22:39:41 +0800
Subject: [PATCH] update WeixinProxy

---
 weixin4j-mp/README.md                                     | 2 +-
 .../main/java/com/foxinmy/weixin4j/mp/WeixinProxy.java    | 8 ++++++--
 .../main/java/com/foxinmy/weixin4j/qy/WeixinProxy.java    | 8 ++++++--
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/weixin4j-mp/README.md b/weixin4j-mp/README.md
index 01bf4eb6..e64eeb20 100644
--- a/weixin4j-mp/README.md
+++ b/weixin4j-mp/README.md
@@ -95,7 +95,7 @@ weixin4j.properties说明
     // 微信支付API
     WeixinPayProxy weixinPayProxy = new WeixinPayProxy();
     // weixinPayProxy = new WeixinPayProxy(weixinAccount);
-    weixinPayProxy.orderQueryV3(idQuery);
+    weixinPayProxy.orderQuery(idQuery);
 
 > 针对`token`存储有两种方案,`File存储`/`Redis存储`,当然也可自己实现`TokenStorager`,默认使用文件(xml)的方式保存token,如果环境中支持`redis`,建议使用[RedisTokenStorager](https://github.com/foxinmy/weixin4j/wiki/%E7%94%A8redis%E4%BF%9D%E5%AD%98token).
 >
diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/WeixinProxy.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/WeixinProxy.java
index 0a947cda..a890ab39 100644
--- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/WeixinProxy.java
+++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/WeixinProxy.java
@@ -101,8 +101,12 @@ public class WeixinProxy {
 
 	public WeixinProxy(String appid, String appsecret,
 			TokenStorager tokenStorager) {
-		this.tokenHolder = new TokenHolder(new WeixinTokenCreator(appid,
-				appsecret), tokenStorager);
+		this(new TokenHolder(new WeixinTokenCreator(appid, appsecret),
+				tokenStorager));
+	}
+
+	public WeixinProxy(TokenHolder tokenHolder) {
+		this.tokenHolder = tokenHolder;
 		this.mediaApi = new MediaApi(tokenHolder);
 		this.notifyApi = new NotifyApi(tokenHolder);
 		this.customApi = new CustomApi(tokenHolder);
diff --git a/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/WeixinProxy.java b/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/WeixinProxy.java
index adfb6408..33119947 100644
--- a/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/WeixinProxy.java
+++ b/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/WeixinProxy.java
@@ -97,8 +97,12 @@ public class WeixinProxy {
 	 */
 	public WeixinProxy(String corpid, String corpsecret,
 			TokenStorager tokenStorager) {
-		this.tokenHolder = new TokenHolder(new WeixinTokenCreator(corpid,
-				corpsecret), tokenStorager);
+		this(new TokenHolder(new WeixinTokenCreator(corpid, corpsecret),
+				tokenStorager));
+	}
+
+	public WeixinProxy(TokenHolder tokenHolder) {
+		this.tokenHolder = tokenHolder;
 		this.partyApi = new PartyApi(tokenHolder);
 		this.userApi = new UserApi(tokenHolder);
 		this.tagApi = new TagApi(tokenHolder);