niko/weixin4j
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

初始化开放平台第三方组件

Browse Source
This commit is contained in:
jinyu
2016-07-05 18:49:27 +08:00
parent aaff5652a9
commit 135b1318f5
15 changed files with 481 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files
weixin4j-qy/CHANGE.md
+5 -1
View File
@@ -183,4 +183,8 @@
* 2016-05-07
+ version upgrade to 1.6.9
+ version upgrade to 1.6.9
* 2016-06-20
+ version upgrade to 1.7.0
weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/WeixinProxy.java
+4 -4
View File
@@ -140,16 +140,16 @@ public class WeixinProxy {
* @param perCodeManager
* 第三方套件永久授权码
* {@link com.foxinmy.weixin4j.qy.api.SuiteApi#getPerCodeManager(String)}
* @param suitetokenManager
* @param perTokenManager
* 第三方套件凭证token
* {@link com.foxinmy.weixin4j.qy.api.SuiteApi#getTokenSuiteManager(String)}
* {@link com.foxinmy.weixin4j.qy.api.SuiteApi#getPerTokenManager(String)}
* @see com.foxinmy.weixin4j.qy.api.SuiteApi
* @see WeixinSuiteProxy#getWeixinProxy(String, String)
*/
public WeixinProxy(SuitePerCodeManager perCodeManager,
TokenManager suiteTokenManager) {
TokenManager perTokenManager) {
this(new TokenManager(new WeixinTokenSuiteCreator(perCodeManager,
suiteTokenManager), perCodeManager.getCacheStorager()));
perTokenManager), perCodeManager.getCacheStorager()));
this.settings = new Weixin4jSettings<WeixinAccount>(new WeixinAccount(
perCodeManager.getAuthCorpId(), null));
}
weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/WeixinSuiteProxy.java
+14 -25
View File
@@ -14,11 +14,11 @@ import com.foxinmy.weixin4j.qy.api.ProviderApi;
import com.foxinmy.weixin4j.qy.api.SuiteApi;
import com.foxinmy.weixin4j.qy.model.OUserInfo;
import com.foxinmy.weixin4j.qy.model.WeixinQyAccount;
import com.foxinmy.weixin4j.qy.suite.SuiteTicketManager;
import com.foxinmy.weixin4j.qy.token.WeixinProviderTokenCreator;
import com.foxinmy.weixin4j.qy.type.LoginTargetType;
import com.foxinmy.weixin4j.qy.type.URLConsts;
import com.foxinmy.weixin4j.setting.Weixin4jSettings;
import com.foxinmy.weixin4j.token.TicketManager;
import com.foxinmy.weixin4j.token.TokenManager;
import com.foxinmy.weixin4j.util.StringUtil;
import com.foxinmy.weixin4j.util.Weixin4jConfigUtil;
@@ -54,8 +54,8 @@ public class WeixinSuiteProxy {
* 默认使用文件方式保存token、使用weixin4j.properties配置的账号信息
*/
public WeixinSuiteProxy() {
this(new Weixin4jSettings<WeixinQyAccount>(JSON.parseObject(
Weixin4jConfigUtil.getValue("account"), WeixinQyAccount.class)));
this(new Weixin4jSettings<WeixinQyAccount>(
JSON.parseObject(Weixin4jConfigUtil.getValue("account"), WeixinQyAccount.class)));
}
/**
@@ -69,22 +69,16 @@ public class WeixinSuiteProxy {
if (suites != null && !suites.isEmpty()) {
this.suiteMap = new HashMap<String, SuiteApi>(suites.size());
for (WeixinAccount suite : suites) {
this.suiteMap.put(
suite.getId(),
new SuiteApi(
new SuiteTicketManager(suite.getId(), suite
.getSecret(), settings
.getCacheStorager0())));
this.suiteMap.put(suite.getId(), new SuiteApi(
new TicketManager(suite.getId(), suite.getSecret(), settings.getCacheStorager0())));
}
this.suiteMap.put(null, suiteMap.get(suites.get(0).getId()));
}
if (StringUtil.isNotBlank(settings.getAccount().getId())
&& StringUtil.isNotBlank(settings.getAccount()
.getProviderSecret())) {
&& StringUtil.isNotBlank(settings.getAccount().getProviderSecret())) {
this.providerApi = new ProviderApi(
new TokenManager(new WeixinProviderTokenCreator(settings
.getAccount().getId(), settings.getAccount()
.getProviderSecret()), settings.getCacheStorager0()),
new TokenManager(new WeixinProviderTokenCreator(settings.getAccount().getId(),
settings.getAccount().getProviderSecret()), settings.getCacheStorager0()),
settings.getCacheStorager0());
}
}
@@ -132,8 +126,7 @@ public class WeixinSuiteProxy {
* 推送suite_ticket协议</a>
* @throws WeixinException
*/
public void cacheTicket(String suiteId, String suiteTicket)
throws WeixinException {
public void cacheTicket(String suiteId, String suiteTicket) throws WeixinException {
suite(suiteId).getTicketManager().cachingTicket(suiteTicket);
}
@@ -148,8 +141,7 @@ public class WeixinSuiteProxy {
* @throws WeixinException
*/
public String getSuiteAuthorizeURL(String suiteId) throws WeixinException {
String redirectUri = Weixin4jConfigUtil
.getValue("suite.oauth.redirect.uri");
String redirectUri = Weixin4jConfigUtil.getValue("suite.oauth.redirect.uri");
return getSuiteAuthorizeURL(suiteId, redirectUri, "state");
}
@@ -169,11 +161,9 @@ public class WeixinSuiteProxy {
* @return 请求授权的URL
* @throws WeixinException
*/
public String getSuiteAuthorizeURL(String suiteId, String redirectUri,
String state) throws WeixinException {
public String getSuiteAuthorizeURL(String suiteId, String redirectUri, String state) throws WeixinException {
try {
return String.format(URLConsts.SUITE_OAUTH_URL, suiteId,
suite(suiteId).getTicketManager().getTicket(),
return String.format(URLConsts.SUITE_OAUTH_URL, suiteId, suite(suiteId).getTicketManager().getTicket(),
URLEncoder.encode(redirectUri, Consts.UTF_8.name()), state);
} catch (UnsupportedEncodingException e) {
;
@@ -215,8 +205,7 @@ public class WeixinSuiteProxy {
* 获取登录企业号官网的url</a>
* @throws WeixinException
*/
public String getLoginUrl(String corpId, LoginTargetType targetType,
int agentId) throws WeixinException {
public String getLoginUrl(String corpId, LoginTargetType targetType, int agentId) throws WeixinException {
return providerApi.getLoginUrl(corpId, targetType, agentId);
}
@@ -232,7 +221,7 @@ public class WeixinSuiteProxy {
*/
public WeixinProxy getWeixinProxy(String suiteId, String authCorpId) {
return new WeixinProxy(suite(suiteId).getPerCodeManager(authCorpId),
suite(suiteId).getSuiteTokenManager());
suite(suiteId).getPerTokenManager(authCorpId));
}
public final static String VERSION = "1.7.0";
weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/api/SuiteApi.java
+35 -35
View File
@@ -11,10 +11,10 @@ import com.foxinmy.weixin4j.qy.model.AgentSetter;
import com.foxinmy.weixin4j.qy.model.OUserInfo;
import com.foxinmy.weixin4j.qy.model.User;
import com.foxinmy.weixin4j.qy.suite.SuitePerCodeManager;
import com.foxinmy.weixin4j.qy.suite.SuiteTicketManager;
import com.foxinmy.weixin4j.qy.suite.WeixinSuitePreCodeCreator;
import com.foxinmy.weixin4j.qy.suite.WeixinSuiteTokenCreator;
import com.foxinmy.weixin4j.qy.suite.WeixinTokenSuiteCreator;
import com.foxinmy.weixin4j.token.TicketManager;
import com.foxinmy.weixin4j.token.TokenCreator;
import com.foxinmy.weixin4j.token.TokenManager;
@@ -32,29 +32,29 @@ public class SuiteApi extends QyApi {
/**
* 应用套件token
*/
private final TokenManager suiteTokenManager;
private final TokenManager tokenManager;
/**
* 应用套件ticket
*/
private final SuiteTicketManager suiteTicketManager;
private final TicketManager ticketManager;
/**
* 应用套件pre_code
*/
private final TokenManager suitePreCodeManager;
private final TokenManager preCodeManager;
/**
*
* @param suiteTicketManager
* @param ticketManager
* 套件ticket存取
*/
public SuiteApi(SuiteTicketManager suiteTicketManager) {
this.suiteTicketManager = suiteTicketManager;
this.suiteTokenManager = new TokenManager(new WeixinSuiteTokenCreator(
suiteTicketManager), suiteTicketManager.getCacheStorager());
this.suitePreCodeManager = new TokenManager(
new WeixinSuitePreCodeCreator(suiteTokenManager,
suiteTicketManager.getSuiteId()),
suiteTicketManager.getCacheStorager());
public SuiteApi(TicketManager ticketManager) {
this.ticketManager = ticketManager;
this.tokenManager = new TokenManager(new WeixinSuiteTokenCreator(
ticketManager), ticketManager.getCacheStorager());
this.preCodeManager = new TokenManager(
new WeixinSuitePreCodeCreator(tokenManager,
ticketManager.getId()),
ticketManager.getCacheStorager());
}
/**
@@ -62,8 +62,8 @@ public class SuiteApi extends QyApi {
*
* @return
*/
public TokenManager getSuiteTokenManager() {
return this.suiteTokenManager;
public TokenManager getTokenManager() {
return this.tokenManager;
}
/**
@@ -71,8 +71,8 @@ public class SuiteApi extends QyApi {
*
* @return
*/
public SuiteTicketManager getTicketManager() {
return this.suiteTicketManager;
public TicketManager getTicketManager() {
return this.ticketManager;
}
/**
@@ -81,7 +81,7 @@ public class SuiteApi extends QyApi {
* @return
*/
public TokenManager getPreCodeManager() {
return this.suitePreCodeManager;
return this.preCodeManager;
}
/**
@@ -93,8 +93,8 @@ public class SuiteApi extends QyApi {
*/
public SuitePerCodeManager getPerCodeManager(String authCorpId) {
return new SuitePerCodeManager(authCorpId,
suiteTicketManager.getSuiteId(),
suiteTicketManager.getCacheStorager());
ticketManager.getId(),
ticketManager.getCacheStorager());
}
/**
@@ -104,10 +104,10 @@ public class SuiteApi extends QyApi {
* 授权方corpid
* @return 企业号token
*/
public TokenManager getTokenSuiteManager(String authCorpId) {
public TokenManager getPerTokenManager(String authCorpId) {
return new TokenManager(new WeixinTokenSuiteCreator(
getPerCodeManager(authCorpId), suiteTokenManager),
suiteTicketManager.getCacheStorager());
getPerCodeManager(authCorpId), tokenManager),
ticketManager.getCacheStorager());
}
/**
@@ -124,13 +124,13 @@ public class SuiteApi extends QyApi {
public JsonResult setSuiteSession(int... appids) throws WeixinException {
String suite_set_session_uri = getRequestUri("suite_set_session_uri");
JSONObject para = new JSONObject();
para.put("pre_auth_code", suitePreCodeManager.getAccessToken());
para.put("pre_auth_code", preCodeManager.getAccessToken());
JSONObject appid = new JSONObject();
appid.put("appid", appids);
para.put("session_info", appid);
WeixinResponse response = weixinExecutor.post(
String.format(suite_set_session_uri,
suiteTokenManager.getAccessToken()),
tokenManager.getAccessToken()),
para.toJSONString());
return response.getAsJsonResult();
}
@@ -151,11 +151,11 @@ public class SuiteApi extends QyApi {
throws WeixinException {
String suite_get_permanent_uri = getRequestUri("suite_get_permanent_uri");
JSONObject obj = new JSONObject();
obj.put("suite_id", suiteTicketManager.getSuiteId());
obj.put("suite_id", ticketManager.getId());
obj.put("auth_code", authCode);
WeixinResponse response = weixinExecutor
.post(String.format(suite_get_permanent_uri,
suiteTokenManager.getAccessToken()), obj.toJSONString());
tokenManager.getAccessToken()), obj.toJSONString());
obj = response.getAsJson();
obj.put("corp_info", obj.remove("auth_corp_info"));
obj.put("user_info", obj.remove("auth_user_info"));
@@ -165,10 +165,10 @@ public class SuiteApi extends QyApi {
.getCorpInfo().getCorpId());
// 缓存微信企业号access_token
TokenCreator tokenCreator = new WeixinTokenSuiteCreator(
suitePerCodeManager, suiteTokenManager);
suitePerCodeManager, tokenManager);
Token token = new Token(obj.getString("access_token"),
obj.getLongValue("expires_in") * 1000l);
suiteTicketManager.getCacheStorager()
ticketManager.getCacheStorager()
.caching(tokenCreator.key(), token);
// 缓存微信企业号永久授权码
suitePerCodeManager.cachingPermanentCode(obj
@@ -190,13 +190,13 @@ public class SuiteApi extends QyApi {
public OUserInfo getOAuthInfo(String authCorpId) throws WeixinException {
String suite_get_authinfo_uri = getRequestUri("suite_get_authinfo_uri");
JSONObject obj = new JSONObject();
obj.put("suite_id", suiteTicketManager.getSuiteId());
obj.put("suite_id", ticketManager.getId());
obj.put("auth_corpid", authCorpId);
obj.put("permanent_code", getPerCodeManager(authCorpId)
.getPermanentCode());
WeixinResponse response = weixinExecutor
.post(String.format(suite_get_authinfo_uri,
suiteTokenManager.getAccessToken()), obj.toJSONString());
tokenManager.getAccessToken()), obj.toJSONString());
obj = response.getAsJson();
obj.put("corp_info", obj.remove("auth_corp_info"));
obj.put("user_info", obj.remove("auth_user_info"));
@@ -220,14 +220,14 @@ public class SuiteApi extends QyApi {
throws WeixinException {
String suite_get_agent_uri = getRequestUri("suite_get_agent_uri");
JSONObject obj = new JSONObject();
obj.put("suite_id", suiteTicketManager.getSuiteId());
obj.put("suite_id", ticketManager.getId());
obj.put("auth_corpid", authCorpId);
obj.put("permanent_code", getPerCodeManager(authCorpId)
.getPermanentCode());
obj.put("agentid", agentid);
WeixinResponse response = weixinExecutor
.post(String.format(suite_get_agent_uri,
suiteTokenManager.getAccessToken()), obj.toJSONString());
tokenManager.getAccessToken()), obj.toJSONString());
JSONObject jsonObj = response.getAsJson();
AgentInfo agent = JSON.toJavaObject(jsonObj, AgentInfo.class);
agent.setAllowUsers(JSON.parseArray(
@@ -258,14 +258,14 @@ public class SuiteApi extends QyApi {
throws WeixinException {
String suite_set_agent_uri = getRequestUri("suite_set_agent_uri");
JSONObject obj = new JSONObject();
obj.put("suite_id", suiteTicketManager.getSuiteId());
obj.put("suite_id", ticketManager.getId());
obj.put("auth_corpid", authCorpId);
obj.put("permanent_code", getPerCodeManager(authCorpId)
.getPermanentCode());
obj.put("agent", agentSet);
WeixinResponse response = weixinExecutor.post(
String.format(suite_set_agent_uri,
suiteTokenManager.getAccessToken()),
tokenManager.getAccessToken()),
JSON.toJSONString(obj, AgentApi.typeFilter));
return response.getAsJsonResult();
}
weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/suite/SuiteTicketManager.java
-72
View File
@@ -1,72 +0,0 @@
package com.foxinmy.weixin4j.qy.suite;
import com.foxinmy.weixin4j.cache.CacheStorager;
import com.foxinmy.weixin4j.exception.WeixinException;
import com.foxinmy.weixin4j.model.Token;
import com.foxinmy.weixin4j.token.TokenCreator;
/**
* 应用套件ticket的存取
*
* @className SuiteTicketManager
* @author jinyu(foxinmy@gmail.com)
* @date 2015年6月22日
* @since JDK 1.6
* @see
*/
public class SuiteTicketManager {
private final String suiteId;
private final String suiteSecret;
private final CacheStorager<Token> cacheStorager;
public SuiteTicketManager(String suiteId, String suiteSecret,
CacheStorager<Token> cacheStorager) {
this.suiteId = suiteId;
this.suiteSecret = suiteSecret;
this.cacheStorager = cacheStorager;
}
/**
* 获取ticket
*
* @return
* @throws WeixinException
*/
public String getTicket() throws WeixinException {
return cacheStorager.lookup(getCacheKey()).getAccessToken();
}
/**
* 获取ticket的key
*
* @return
*/
public String getCacheKey() {
return String.format("%sqy_suite_ticket_%s",
TokenCreator.CACHEKEY_PREFIX, suiteId);
}
/**
* 缓存ticket
*
* @param ticket
* @throws WeixinException
*/
public void cachingTicket(String ticket) throws WeixinException {
Token token = new Token(ticket);
cacheStorager.caching(getCacheKey(), token);
}
public String getSuiteId() {
return this.suiteId;
}
public String getSuiteSecret() {
return this.suiteSecret;
}
public CacheStorager<Token> getCacheStorager() {
return this.cacheStorager;
}
}
weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/suite/WeixinSuiteTokenCreator.java
+6 -5
View File
@@ -5,6 +5,7 @@ import com.foxinmy.weixin4j.exception.WeixinException;
import com.foxinmy.weixin4j.http.weixin.WeixinResponse;
import com.foxinmy.weixin4j.model.Token;
import com.foxinmy.weixin4j.qy.type.URLConsts;
import com.foxinmy.weixin4j.token.TicketManager;
import com.foxinmy.weixin4j.token.TokenCreator;
/**
@@ -20,27 +21,27 @@ import com.foxinmy.weixin4j.token.TokenCreator;
*/
public class WeixinSuiteTokenCreator extends TokenCreator {
private final SuiteTicketManager ticketManager;
private final TicketManager ticketManager;
/**
*
* @param ticketManager
* 套件ticket存取
*/
public WeixinSuiteTokenCreator(SuiteTicketManager ticketManager) {
public WeixinSuiteTokenCreator(TicketManager ticketManager) {
this.ticketManager = ticketManager;
}
@Override
public String key0() {
return String.format("qy_suite_token_%s", ticketManager.getSuiteId());
return String.format("qy_suite_token_%s", ticketManager.getId());
}
@Override
public Token create() throws WeixinException {
JSONObject obj = new JSONObject();
obj.put("suite_id", ticketManager.getSuiteId());
obj.put("suite_secret", ticketManager.getSuiteSecret());
obj.put("suite_id", ticketManager.getId());
obj.put("suite_secret", ticketManager.getSecret());
obj.put("suite_ticket", ticketManager.getTicket());
WeixinResponse response = weixinExecutor.post(
URLConsts.SUITE_TOKEN_URL, obj.toJSONString());