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

删除AbstractTokenCreator，引入CacheCreator<T>类

Browse Source
This commit is contained in:
jinyu
2016-05-24 18:15:35 +08:00
parent eb54ea9079
commit f6c12e07f3
16 changed files with 382 additions and 370 deletions
Download Patch File Download Diff File Expand all files Collapse all files
weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/api/SuiteApi.java
+1 -1
View File
@@ -168,7 +168,7 @@ public class SuiteApi extends QyApi {
Token token = new Token(obj.getString("access_token"));
token.setExpiresIn(obj.getIntValue("expires_in"));
suiteTicketHolder.getTokenStorager().caching(
tokenCreator.getCacheKey(), token);
tokenCreator.key(), token);
// 缓存微信企业号永久授权码
suitePerCodeHolder
.cachingPermanentCode(obj.getString("permanent_code"));
weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/suite/WeixinSuitePreCodeCreator.java
+6 -6
View File
@@ -5,12 +5,12 @@ 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.AbstractTokenCreator;
import com.foxinmy.weixin4j.token.TokenCreator;
import com.foxinmy.weixin4j.token.TokenHolder;
/**
* 微信企业号应用套件预授权码创建
*
*
* @className WeixinSuitePreCodeCreator
* @author jinyu(foxinmy@gmail.com)
* @date 2015年6月17日
@@ -20,13 +20,13 @@ import com.foxinmy.weixin4j.token.TokenHolder;
* 获取应用套件预授权码</a>
* @see com.foxinmy.weixin4j.model.Token
*/
public class WeixinSuitePreCodeCreator extends AbstractTokenCreator {
public class WeixinSuitePreCodeCreator extends TokenCreator {
private final TokenHolder suiteTokenHolder;
private final String suiteId;
/**
*
*
* @param suiteTokenHolder
* 应用套件的token
* @param suiteId
@@ -38,12 +38,12 @@ public class WeixinSuitePreCodeCreator extends AbstractTokenCreator {
}
@Override
public String getCacheKey0() {
public String key0() {
return String.format("qy_suite_precode_%s", suiteId);
}
@Override
public Token createToken() throws WeixinException {
public Token create() throws WeixinException {
WeixinResponse response = weixinExecutor.post(
String.format(URLConsts.SUITE_PRE_CODE_URL, suiteTokenHolder.getAccessToken()),
String.format("{\"suite_id\":\"%s\"}", suiteId));
weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/suite/WeixinSuiteTokenCreator.java
+6 -6
View File
@@ -5,11 +5,11 @@ 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.AbstractTokenCreator;
import com.foxinmy.weixin4j.token.TokenCreator;
/**
* 微信企业号应用套件凭证创建
*
*
* @className WeixinSuiteTokenCreator
* @author jinyu(foxinmy@gmail.com)
* @date 2015年6月17日
@@ -18,12 +18,12 @@ import com.foxinmy.weixin4j.token.AbstractTokenCreator;
* href="http://qydev.weixin.qq.com/wiki/index.php?title=%E7%AC%AC%E4%B8%89%E6%96%B9%E5%BA%94%E7%94%A8%E6%8E%A5%E5%8F%A3%E8%AF%B4%E6%98%8E#.E8.8E.B7.E5.8F.96.E5.BA.94.E7.94.A8.E5.A5.97.E4.BB.B6.E4.BB.A4.E7.89.8C">获取应用套件凭证</a>
* @see com.foxinmy.weixin4j.model.Token
*/
public class WeixinSuiteTokenCreator extends AbstractTokenCreator {
public class WeixinSuiteTokenCreator extends TokenCreator {
private final SuiteTicketHolder ticketHolder;
/**
*
*
* @param stringStorager
* 套件ticket存取器
*/
@@ -32,12 +32,12 @@ public class WeixinSuiteTokenCreator extends AbstractTokenCreator {
}
@Override
public String getCacheKey0() {
public String key0() {
return String.format("qy_suite_token_%s", ticketHolder.getSuiteId());
}
@Override
public Token createToken() throws WeixinException {
public Token create() throws WeixinException {
JSONObject obj = new JSONObject();
obj.put("suite_id", ticketHolder.getSuiteId());
obj.put("suite_secret", ticketHolder.getSuiteSecret());
weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/suite/WeixinTokenSuiteCreator.java
+6 -6
View File
@@ -5,12 +5,12 @@ 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.AbstractTokenCreator;
import com.foxinmy.weixin4j.token.TokenCreator;
import com.foxinmy.weixin4j.token.TokenHolder;
/**
* 微信企业号token创建(永久授权码)
*
*
* @className WeixinTokenSuiteCreator
* @author jinyu(foxinmy@gmail.com)
* @date 2015年6月17日
@@ -20,13 +20,13 @@ import com.foxinmy.weixin4j.token.TokenHolder;
* 获取企业号access_token</a>
* @see com.foxinmy.weixin4j.model.Token
*/
public class WeixinTokenSuiteCreator extends AbstractTokenCreator {
public class WeixinTokenSuiteCreator extends TokenCreator {
private final SuitePerCodeHolder perCodeHolder;
private final TokenHolder suiteTokenHolder;
/**
*
*
* @param perCodeHolder
* 第三方套件永久授权码
* @param suiteTokenHolder
@@ -38,12 +38,12 @@ public class WeixinTokenSuiteCreator extends AbstractTokenCreator {
}
@Override
public String getCacheKey0() {
public String key0() {
return String.format("qy_token_suite_%s_%s", perCodeHolder.getSuiteId(), perCodeHolder.getAuthCorpId());
}
@Override
public Token createToken() throws WeixinException {
public Token create() throws WeixinException {
JSONObject obj = new JSONObject();
obj.put("suite_id", perCodeHolder.getSuiteId());
obj.put("auth_corpid", perCodeHolder.getAuthCorpId());
weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/token/WeixinProviderTokenCreator.java
+6 -6
View File
@@ -5,11 +5,11 @@ 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.AbstractTokenCreator;
import com.foxinmy.weixin4j.token.TokenCreator;
/**
* 微信企业号应用提供商凭证创建
*
*
* @className WeixinTokenCreator
* @author jinyu(foxinmy@gmail.com)
* @date 2015年1月10日
@@ -19,13 +19,13 @@ import com.foxinmy.weixin4j.token.AbstractTokenCreator;
* 获取应用提供商凭证</a>
* @see com.foxinmy.weixin4j.model.Token
*/
public class WeixinProviderTokenCreator extends AbstractTokenCreator {
public class WeixinProviderTokenCreator extends TokenCreator {
private final String corpid;
private final String providersecret;
/**
*
*
* @param corpid
* 企业号ID
* @param providersecret
@@ -37,12 +37,12 @@ public class WeixinProviderTokenCreator extends AbstractTokenCreator {
}
@Override
public String getCacheKey0() {
public String key0() {
return String.format("qy_provider_token_%s", corpid);
}
@Override
public Token createToken() throws WeixinException {
public Token create() throws WeixinException {
JSONObject obj = new JSONObject();
obj.put("corpid", corpid);
obj.put("provider_secret", providersecret);
weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/token/WeixinTicketCreator.java
+5 -5
View File
@@ -5,13 +5,13 @@ 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.AbstractTokenCreator;
import com.foxinmy.weixin4j.token.TokenCreator;
import com.foxinmy.weixin4j.token.TokenHolder;
import com.foxinmy.weixin4j.type.TicketType;
/**
* 微信企业号TICKET创建(包括jsticket、其它JSSDK所需的ticket的创建
*
*
* @className WeixinTicketCreator
* @author jinyu(foxinmy@gmail.com)
* @date 2015年12月25日
@@ -19,7 +19,7 @@ import com.foxinmy.weixin4j.type.TicketType;
* "http://qydev.weixin.qq.com/wiki/index.php?title=%E5%BE%AE%E4%BF%A1JS-SDK%E6%8E%A5%E5%8F%A3#.E9.99.84.E5.BD.951-JS-SDK.E4.BD.BF.E7.94.A8.E6.9D.83.E9.99.90.E7.AD.BE.E5.90.8D.E7.AE.97.E6.B3.95"
* >JSTICKET</a>
*/
public class WeixinTicketCreator extends AbstractTokenCreator {
public class WeixinTicketCreator extends TokenCreator {
private final String corpid;
private final TicketType ticketType;
@@ -40,12 +40,12 @@ public class WeixinTicketCreator extends AbstractTokenCreator {
}
@Override
public String getCacheKey0() {
public String key0() {
return String.format("qy_ticket_%s_%s", ticketType.name(), corpid);
}
@Override
public Token createToken() throws WeixinException {
public Token create() throws WeixinException {
WeixinResponse response = null;
if (ticketType == TicketType.jsapi) {
response = weixinExecutor
weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/token/WeixinTokenCreator.java
+6 -6
View File
@@ -5,11 +5,11 @@ 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.AbstractTokenCreator;
import com.foxinmy.weixin4j.token.TokenCreator;
/**
* 微信企业号TOKEN创建
*
*
* @className WeixinTokenCreator
* @author jinyu(foxinmy@gmail.com)
* @date 2015年1月10日
@@ -19,13 +19,13 @@ import com.foxinmy.weixin4j.token.AbstractTokenCreator;
* 微信企业号获取token说明</a>
* @see com.foxinmy.weixin4j.model.Token
*/
public class WeixinTokenCreator extends AbstractTokenCreator {
public class WeixinTokenCreator extends TokenCreator {
private final String corpid;
private final String corpsecret;
/**
*
*
* @param corpid
* 企业号ID
* @param corpsecret
@@ -37,12 +37,12 @@ public class WeixinTokenCreator extends AbstractTokenCreator {
}
@Override
public String getCacheKey0() {
public String key0() {
return String.format("qy_token_%s", corpid);
}
@Override
public Token createToken() throws WeixinException {
public Token create() throws WeixinException {
String tokenUrl = String.format(URLConsts.ASSESS_TOKEN_URL, corpid,
corpsecret);
WeixinResponse response = weixinExecutor.get(tokenUrl);