From 105cf4bfe8378543e39c3a3c9b975616690db55d Mon Sep 17 00:00:00 2001
From: jinyu <foxinmy@gmail.com>
Date: Sat, 5 Dec 2015 10:21:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96WeixinTokenSuiteCreator?=
 =?UTF-8?q?=E7=9A=84=E6=9E=84=E9=80=A0=E5=87=BD=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/foxinmy/weixin4j/qy/api/SuiteApi.java |  4 ++--
 .../weixin4j/qy/suite/WeixinTokenSuiteCreator.java | 14 ++++++--------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/api/SuiteApi.java b/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/api/SuiteApi.java
index 1f9f4cb4..7698d751 100644
--- a/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/api/SuiteApi.java
+++ b/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/api/SuiteApi.java
@@ -108,7 +108,7 @@ public class SuiteApi extends QyApi {
 	 * @return 企业号token
 	 */
 	public TokenHolder createTokenHolder(String authCorpId) {
-		return new TokenHolder(new WeixinTokenSuiteCreator(authCorpId,
+		return new TokenHolder(new WeixinTokenSuiteCreator(
 				getPerCodeHolder(authCorpId), suiteTokenHolder),
 				suiteTicketHolder.getTokenStorager());
 	}
@@ -166,7 +166,7 @@ public class SuiteApi extends QyApi {
 		SuitePerCodeHolder suitePerCodeHolder = getPerCodeHolder(oInfo
 				.getCorpInfo().getCorpId());
 		// 缓存微信企业号access_token
-		TokenCreator tokenCreator = new WeixinTokenSuiteCreator(null,
+		TokenCreator tokenCreator = new WeixinTokenSuiteCreator(
 				suitePerCodeHolder, suiteTokenHolder);
 		Token token = new Token(obj.getString("access_token"));
 		token.setExpiresIn(obj.getIntValue("expires_in"));
diff --git a/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/suite/WeixinTokenSuiteCreator.java b/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/suite/WeixinTokenSuiteCreator.java
index e9d76881..fd225a03 100644
--- a/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/suite/WeixinTokenSuiteCreator.java
+++ b/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/suite/WeixinTokenSuiteCreator.java
@@ -23,22 +23,18 @@ import com.foxinmy.weixin4j.token.TokenHolder;
 public class WeixinTokenSuiteCreator implements TokenCreator {
 
 	private final WeixinRequestExecutor weixinExecutor;
-	private final String authCorpId;
 	private final SuitePerCodeHolder perCodeHolder;
 	private final TokenHolder suiteTokenHolder;
 
 	/**
 	 * 
-	 * @param authCorpId
-	 *            授权方corpid
 	 * @param perCodeHolder
 	 *            永久授权码
 	 * @param suiteTokenHolder
 	 *            套件token
 	 */
-	public WeixinTokenSuiteCreator(String authCorpId,
-			SuitePerCodeHolder perCodeHolder, TokenHolder suiteTokenHolder) {
-		this.authCorpId = authCorpId;
+	public WeixinTokenSuiteCreator(SuitePerCodeHolder perCodeHolder,
+			TokenHolder suiteTokenHolder) {
 		this.perCodeHolder = perCodeHolder;
 		this.suiteTokenHolder = suiteTokenHolder;
 		this.weixinExecutor = new WeixinRequestExecutor();
@@ -47,14 +43,16 @@ public class WeixinTokenSuiteCreator implements TokenCreator {
 	@Override
 	public String getCacheKey() {
 		return String.format("qy_token_suite_%s:%s",
-				perCodeHolder.getSuiteId(), authCorpId);
+				perCodeHolder.getSuiteId(), perCodeHolder.getAuthCorpId()
+
+		);
 	}
 
 	@Override
 	public Token createToken() throws WeixinException {
 		JSONObject obj = new JSONObject();
 		obj.put("suite_id", perCodeHolder.getSuiteId());
-		obj.put("auth_corpid", authCorpId);
+		obj.put("auth_corpid", perCodeHolder.getAuthCorpId());
 		obj.put("permanent_code", perCodeHolder.getPermanentCode());
 		WeixinResponse response = weixinExecutor.post(
 				String.format(URLConsts.TOKEN_SUITE_URL,