From 1bc05afce9f1c6157e319f49aca04cd887aa884c Mon Sep 17 00:00:00 2001 From: jinyu Date: Fri, 29 Jan 2016 10:12:54 +0800 Subject: [PATCH] up --- .../com/foxinmy/weixin4j/qy/WeixinProxy.java | 24 ++++++++++++------- .../foxinmy/weixin4j/qy/WeixinSuiteProxy.java | 15 ++++++++++++ .../com/foxinmy/weixin4j/qy/api/SuiteApi.java | 14 ----------- .../qy/suite/WeixinTokenSuiteCreator.java | 13 ++-------- 4 files changed, 32 insertions(+), 34 deletions(-) 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 ada1e02a..2c77b8c0 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 @@ -40,6 +40,7 @@ import com.foxinmy.weixin4j.qy.model.IdParameter; import com.foxinmy.weixin4j.qy.model.Party; import com.foxinmy.weixin4j.qy.model.Tag; import com.foxinmy.weixin4j.qy.model.User; +import com.foxinmy.weixin4j.qy.suite.SuitePerCodeHolder; import com.foxinmy.weixin4j.qy.suite.WeixinTokenSuiteCreator; import com.foxinmy.weixin4j.qy.token.WeixinTicketCreator; import com.foxinmy.weixin4j.qy.token.WeixinTokenCreator; @@ -49,7 +50,6 @@ import com.foxinmy.weixin4j.qy.type.KfType; import com.foxinmy.weixin4j.qy.type.UserStatus; import com.foxinmy.weixin4j.settings.Weixin4jSettings; import com.foxinmy.weixin4j.token.TokenHolder; -import com.foxinmy.weixin4j.token.TokenStorager; import com.foxinmy.weixin4j.tuple.MpArticle; import com.foxinmy.weixin4j.type.MediaType; import com.foxinmy.weixin4j.type.TicketType; @@ -103,15 +103,21 @@ public class WeixinProxy { /** * 第三方套件(永久授权码机制) * - * @param tokenCreator - * 微信企业号token创建(永久授权码) - * @param tokenStorager - * token存储 + * @param perCodeHolder + * 第三方套件永久授权码 + * {@link com.foxinmy.weixin4j.qy.api.SuiteApi#getPerCodeHolder(String)} + * @param suiteTokenHolder + * 第三方套件凭证token + * {@link com.foxinmy.weixin4j.qy.api.SuiteApi#getTokenSuiteHolder(String)} + * @see com.foxinmy.weixin4j.qy.api.SuiteApi + * @see WeixinSuiteProxy#getWeixinProxy(String, String) */ - public WeixinProxy(WeixinTokenSuiteCreator tokenCreator, - TokenStorager tokenStorager) { - this(new TokenHolder(tokenCreator, tokenStorager)); - this.settings = new Weixin4jSettings(tokenCreator.getAuthCorpId(), null); + public WeixinProxy(SuitePerCodeHolder perCodeHolder, + TokenHolder suiteTokenHolder) { + this(new TokenHolder(new WeixinTokenSuiteCreator(perCodeHolder, + suiteTokenHolder), suiteTokenHolder.getTokenStorager())); + this.settings = new Weixin4jSettings(perCodeHolder.getAuthCorpId(), + null); } /** diff --git a/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/WeixinSuiteProxy.java b/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/WeixinSuiteProxy.java index a5d42e03..6f763dc5 100644 --- a/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/WeixinSuiteProxy.java +++ b/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/WeixinSuiteProxy.java @@ -160,5 +160,20 @@ public class WeixinSuiteProxy { return providerApi.getLoginUrl(corpId, targetType, agentId); } + /** + * 创建WeixinProxy对象 + * + * @param suiteId + * 套件ID + * @param authCorpId + * 已授权的corpid + * @see com.foxinmy.weixin4j.qy.WeixinProxy + * @return + */ + public WeixinProxy getWeixinProxy(String suiteId, String authCorpId) { + return new WeixinProxy(api(suiteId).getPerCodeHolder(authCorpId), api( + suiteId).getSuiteTokenHolder()); + } + public final static String VERSION = "1.6.7"; } 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 338115ff..92d24c3f 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 @@ -6,7 +6,6 @@ import com.foxinmy.weixin4j.exception.WeixinException; import com.foxinmy.weixin4j.http.weixin.JsonResult; import com.foxinmy.weixin4j.http.weixin.WeixinResponse; import com.foxinmy.weixin4j.model.Token; -import com.foxinmy.weixin4j.qy.WeixinProxy; import com.foxinmy.weixin4j.qy.model.AgentInfo; import com.foxinmy.weixin4j.qy.model.AgentSetter; import com.foxinmy.weixin4j.qy.model.OUserInfo; @@ -111,19 +110,6 @@ public class SuiteApi extends QyApi { suiteTicketHolder.getTokenStorager()); } - /** - * 创建WeixinProxy对象 - * - * @param authCorpId - * 已授权的corpid - * @return - */ - public WeixinProxy getWeixinProxy(String authCorpId) { - return new WeixinProxy(new WeixinTokenSuiteCreator( - getPerCodeHolder(authCorpId), suiteTokenHolder), - suiteTicketHolder.getTokenStorager()); - } - /** * 设置套件授权配置:如果需要对某次授权进行配置，则调用本接口，目前仅可以设置哪些应用可以授权，不调用则默认允许所有应用进行授权。 * 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 31240719..fff9a445 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 @@ -29,9 +29,9 @@ public class WeixinTokenSuiteCreator implements TokenCreator { /** * * @param perCodeHolder - * 永久授权码 + * 第三方套件永久授权码 * @param suiteTokenHolder - * 套件token + * 第三方套件凭证token */ public WeixinTokenSuiteCreator(SuitePerCodeHolder perCodeHolder, TokenHolder suiteTokenHolder) { @@ -64,13 +64,4 @@ public class WeixinTokenSuiteCreator implements TokenCreator { token.setOriginalResult(response.getAsString()); return token; } - - /** - * 获取授权放的corpid - * - * @return - */ - public String getAuthCorpId() { - return this.perCodeHolder.getAuthCorpId(); - } }