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-03-30 18:45:05 +08:00
parent aa8e1c759d
commit 845c4d111b
6 changed files with 286 additions and 291 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/weixin/WeixinRequestExecutor.java
View File

@ -95,7 +95,7 @@ public class WeixinRequestExecutor {
return doRequest(request); return doRequest(request);
} }
public WeixinResponse doRequest(HttpRequest request) throws WeixinException { protected WeixinResponse doRequest(HttpRequest request) throws WeixinException {
request.setParams(params); request.setParams(params);
try { try {
logger.info("weixin request >> " + request.getMethod() + " " logger.info("weixin request >> " + request.getMethod() + " "

16
weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/token/WeixinTicketCreator.java
View File

@ -17,9 +17,9 @@ import com.foxinmy.weixin4j.type.TicketType;
* @author jy * @author jy
* @date 2015年1月10日 * @date 2015年1月10日
* @since JDK 1.6 * @since JDK 1.6
* @see <a * @see <a href=
* href="https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421141115&token=&lang=zh_CN">JS * "https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421141115&token=&lang=zh_CN">
* TICKET</a> * JS TICKET</a>
*/ */
public class WeixinTicketCreator implements TokenCreator { public class WeixinTicketCreator implements TokenCreator {
@ -38,8 +38,7 @@ public class WeixinTicketCreator implements TokenCreator {
* @param weixinTokenHolder * @param weixinTokenHolder
* <font color="red">公众平台的access_token</font> * <font color="red">公众平台的access_token</font>
*/ */
public WeixinTicketCreator(String appid, TicketType ticketType, public WeixinTicketCreator(String appid, TicketType ticketType, TokenHolder weixinTokenHolder) {
TokenHolder weixinTokenHolder) {
this.appid = appid; this.appid = appid;
this.ticketType = ticketType; this.ticketType = ticketType;
this.weixinTokenHolder = weixinTokenHolder; this.weixinTokenHolder = weixinTokenHolder;
@ -48,14 +47,13 @@ public class WeixinTicketCreator implements TokenCreator {
@Override @Override
public String getCacheKey() { public String getCacheKey() {
return String.format("weixin4j_mp_ticket_%s_%s", appid, ticketType.name()); return String.format("weixin4j_mp_ticket_%s_%s", ticketType.name(), appid);
} }
@Override @Override
public Token createToken() throws WeixinException { public Token createToken() throws WeixinException {
WeixinResponse response = weixinExecutor.get(String.format( WeixinResponse response = weixinExecutor.get(
URLConsts.TICKET_URL, weixinTokenHolder.getToken() String.format(URLConsts.TICKET_URL, weixinTokenHolder.getToken().getAccessToken(), ticketType.name()));
.getAccessToken(), ticketType.name()));
JSONObject result = response.getAsJson(); JSONObject result = response.getAsJson();
Token token = new Token(result.getString("ticket")); Token token = new Token(result.getString("ticket"));
token.setExpiresIn(result.getIntValue("expires_in")); token.setExpiresIn(result.getIntValue("expires_in"));

146
weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/suite/SuitePerCodeHolder.java
View File

@ -1,73 +1,73 @@
package com.foxinmy.weixin4j.qy.suite; package com.foxinmy.weixin4j.qy.suite;
import com.foxinmy.weixin4j.exception.WeixinException; import com.foxinmy.weixin4j.exception.WeixinException;
import com.foxinmy.weixin4j.model.Token; import com.foxinmy.weixin4j.model.Token;
import com.foxinmy.weixin4j.token.TokenStorager; import com.foxinmy.weixin4j.token.TokenStorager;
/** /**
* 应用套件永久授权码的存取 * 应用套件永久授权码的存取
* *
* @className SuitePerCodeHolder * @className SuitePerCodeHolder
* @author jy * @author jy
* @date 2015年6月22日 * @date 2015年6月22日
* @since JDK 1.6 * @since JDK 1.6
* @see * @see
*/ */
public class SuitePerCodeHolder { public class SuitePerCodeHolder {
private final String authCorpId; private final String authCorpId;
private final String suiteId; private final String suiteId;
private final TokenStorager tokenStorager; private final TokenStorager tokenStorager;
public SuitePerCodeHolder(String authCorpId, String suiteId, public SuitePerCodeHolder(String authCorpId, String suiteId,
TokenStorager tokenStorager) { TokenStorager tokenStorager) {
this.authCorpId = authCorpId; this.authCorpId = authCorpId;
this.suiteId = suiteId; this.suiteId = suiteId;
this.tokenStorager = tokenStorager; this.tokenStorager = tokenStorager;
} }
/** /**
* 缓存永久授权码 * 缓存永久授权码
* *
* @param permanentCode * @param permanentCode
* @throws WeixinException * @throws WeixinException
*/ */
public void cachingPermanentCode(String permanentCode) public void cachingPermanentCode(String permanentCode)
throws WeixinException { throws WeixinException {
Token token = new Token(permanentCode); Token token = new Token(permanentCode);
token.setExpiresIn(-1); token.setExpiresIn(-1);
tokenStorager.caching(getCacheKey(), token); tokenStorager.caching(getCacheKey(), token);
} }
/** /**
* 获取永久授权码的key * 获取永久授权码的key
* *
* @return * @return
*/ */
public String getCacheKey() { public String getCacheKey() {
return String.format("weixin4j_qy_suite_percode_%s:%s", suiteId, return String.format("weixin4j_qy_suite_percode_%s_%s", suiteId,
authCorpId); authCorpId);
} }
/** /**
* 查找永久授权码 * 查找永久授权码
* *
* @return * @return
* @throws WeixinException * @throws WeixinException
*/ */
public String getPermanentCode() throws WeixinException { public String getPermanentCode() throws WeixinException {
return tokenStorager.lookup(getCacheKey()).getAccessToken(); return tokenStorager.lookup(getCacheKey()).getAccessToken();
} }
public String getSuiteId() { public String getSuiteId() {
return this.suiteId; return this.suiteId;
} }
public String getAuthCorpId() { public String getAuthCorpId() {
return this.authCorpId; return this.authCorpId;
} }
public TokenStorager getTokenStorager() { public TokenStorager getTokenStorager() {
return this.tokenStorager; return this.tokenStorager;
} }
} }

142
weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/suite/SuiteTicketHolder.java
View File

@ -1,71 +1,71 @@
package com.foxinmy.weixin4j.qy.suite; package com.foxinmy.weixin4j.qy.suite;
import com.foxinmy.weixin4j.exception.WeixinException; import com.foxinmy.weixin4j.exception.WeixinException;
import com.foxinmy.weixin4j.model.Token; import com.foxinmy.weixin4j.model.Token;
import com.foxinmy.weixin4j.token.TokenStorager; import com.foxinmy.weixin4j.token.TokenStorager;
/** /**
* 应用套件ticket的存取 * 应用套件ticket的存取
* *
* @className SuiteTicketHolder * @className SuiteTicketHolder
* @author jy * @author jy
* @date 2015年6月22日 * @date 2015年6月22日
* @since JDK 1.6 * @since JDK 1.6
* @see * @see
*/ */
public class SuiteTicketHolder { public class SuiteTicketHolder {
private final String suiteId; private final String suiteId;
private final String suiteSecret; private final String suiteSecret;
private final TokenStorager tokenStorager; private final TokenStorager tokenStorager;
public SuiteTicketHolder(String suiteId, String suiteSecret, public SuiteTicketHolder(String suiteId, String suiteSecret,
TokenStorager tokenStorager) { TokenStorager tokenStorager) {
this.suiteId = suiteId; this.suiteId = suiteId;
this.suiteSecret = suiteSecret; this.suiteSecret = suiteSecret;
this.tokenStorager = tokenStorager; this.tokenStorager = tokenStorager;
} }
/** /**
* 获取ticket * 获取ticket
* *
* @return * @return
* @throws WeixinException * @throws WeixinException
*/ */
public String getTicket() throws WeixinException { public String getTicket() throws WeixinException {
return tokenStorager.lookup(getCacheKey()).getAccessToken(); return tokenStorager.lookup(getCacheKey()).getAccessToken();
} }
/** /**
* 获取ticket的key * 获取ticket的key
* *
* @return * @return
*/ */
public String getCacheKey() { public String getCacheKey() {
return String.format("qy_suite_ticket_%s", suiteId); return String.format("weixin4j_qy_suite_ticket_%s", suiteId);
} }
/** /**
* 缓存ticket * 缓存ticket
* *
* @param ticket * @param ticket
* @throws WeixinException * @throws WeixinException
*/ */
public void cachingTicket(String ticket) throws WeixinException { public void cachingTicket(String ticket) throws WeixinException {
Token token = new Token(ticket); Token token = new Token(ticket);
token.setExpiresIn(-1); token.setExpiresIn(-1);
tokenStorager.caching(getCacheKey(), token); tokenStorager.caching(getCacheKey(), token);
} }
public String getSuiteId() { public String getSuiteId() {
return this.suiteId; return this.suiteId;
} }
public String getSuiteSecret() { public String getSuiteSecret() {
return this.suiteSecret; return this.suiteSecret;
} }
public TokenStorager getTokenStorager() { public TokenStorager getTokenStorager() {
return this.tokenStorager; return this.tokenStorager;
} }
} }

134
weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/suite/WeixinTokenSuiteCreator.java
View File

@ -1,67 +1,67 @@
package com.foxinmy.weixin4j.qy.suite; package com.foxinmy.weixin4j.qy.suite;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.foxinmy.weixin4j.exception.WeixinException; import com.foxinmy.weixin4j.exception.WeixinException;
import com.foxinmy.weixin4j.http.weixin.WeixinRequestExecutor; import com.foxinmy.weixin4j.http.weixin.WeixinRequestExecutor;
import com.foxinmy.weixin4j.http.weixin.WeixinResponse; import com.foxinmy.weixin4j.http.weixin.WeixinResponse;
import com.foxinmy.weixin4j.model.Token; import com.foxinmy.weixin4j.model.Token;
import com.foxinmy.weixin4j.qy.type.URLConsts; import com.foxinmy.weixin4j.qy.type.URLConsts;
import com.foxinmy.weixin4j.token.TokenCreator; import com.foxinmy.weixin4j.token.TokenCreator;
import com.foxinmy.weixin4j.token.TokenHolder; import com.foxinmy.weixin4j.token.TokenHolder;
/** /**
* 微信企业号token创建(永久授权码) * 微信企业号token创建(永久授权码)
* *
* @className WeixinTokenSuiteCreator * @className WeixinTokenSuiteCreator
* @author jy * @author jy
* @date 2015年6月17日 * @date 2015年6月17日
* @since JDK 1.6 * @since JDK 1.6
* @see <a * @see <a
* 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.E4.BC.81.E4.B8.9A.E5.8F.B7access_token">获取企业号access_token</a> * 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.E4.BC.81.E4.B8.9A.E5.8F.B7access_token">获取企业号access_token</a>
* @see com.foxinmy.weixin4j.model.Token * @see com.foxinmy.weixin4j.model.Token
*/ */
public class WeixinTokenSuiteCreator implements TokenCreator { public class WeixinTokenSuiteCreator implements TokenCreator {
private final WeixinRequestExecutor weixinExecutor; private final WeixinRequestExecutor weixinExecutor;
private final SuitePerCodeHolder perCodeHolder; private final SuitePerCodeHolder perCodeHolder;
private final TokenHolder suiteTokenHolder; private final TokenHolder suiteTokenHolder;
/** /**
* *
* @param perCodeHolder * @param perCodeHolder
* 第三方套件永久授权码 * 第三方套件永久授权码
* @param suiteTokenHolder * @param suiteTokenHolder
* 第三方套件凭证token * 第三方套件凭证token
*/ */
public WeixinTokenSuiteCreator(SuitePerCodeHolder perCodeHolder, public WeixinTokenSuiteCreator(SuitePerCodeHolder perCodeHolder,
TokenHolder suiteTokenHolder) { TokenHolder suiteTokenHolder) {
this.perCodeHolder = perCodeHolder; this.perCodeHolder = perCodeHolder;
this.suiteTokenHolder = suiteTokenHolder; this.suiteTokenHolder = suiteTokenHolder;
this.weixinExecutor = new WeixinRequestExecutor(); this.weixinExecutor = new WeixinRequestExecutor();
} }
@Override @Override
public String getCacheKey() { public String getCacheKey() {
return String.format("weixin4j_qy_token_suite_%s:%s", return String.format("weixin4j_qy_token_suite_%s_%s",
perCodeHolder.getSuiteId(), perCodeHolder.getAuthCorpId() perCodeHolder.getSuiteId(), perCodeHolder.getAuthCorpId()
); );
} }
@Override @Override
public Token createToken() throws WeixinException { public Token createToken() throws WeixinException {
JSONObject obj = new JSONObject(); JSONObject obj = new JSONObject();
obj.put("suite_id", perCodeHolder.getSuiteId()); obj.put("suite_id", perCodeHolder.getSuiteId());
obj.put("auth_corpid", perCodeHolder.getAuthCorpId()); obj.put("auth_corpid", perCodeHolder.getAuthCorpId());
obj.put("permanent_code", perCodeHolder.getPermanentCode()); obj.put("permanent_code", perCodeHolder.getPermanentCode());
WeixinResponse response = weixinExecutor.post( WeixinResponse response = weixinExecutor.post(
String.format(URLConsts.TOKEN_SUITE_URL, String.format(URLConsts.TOKEN_SUITE_URL,
suiteTokenHolder.getAccessToken()), obj.toJSONString()); suiteTokenHolder.getAccessToken()), obj.toJSONString());
obj = response.getAsJson(); obj = response.getAsJson();
Token token = new Token(obj.getString("access_token")); Token token = new Token(obj.getString("access_token"));
token.setExpiresIn(obj.getIntValue("expires_in")); token.setExpiresIn(obj.getIntValue("expires_in"));
token.setCreateTime(System.currentTimeMillis()); token.setCreateTime(System.currentTimeMillis());
token.setOriginalResult(response.getAsString()); token.setOriginalResult(response.getAsString());
return token; return token;
} }
} }

137
weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/token/WeixinTicketCreator.java
View File

@ -1,70 +1,67 @@
package com.foxinmy.weixin4j.qy.token; package com.foxinmy.weixin4j.qy.token;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.foxinmy.weixin4j.exception.WeixinException; import com.foxinmy.weixin4j.exception.WeixinException;
import com.foxinmy.weixin4j.http.weixin.WeixinRequestExecutor; import com.foxinmy.weixin4j.http.weixin.WeixinRequestExecutor;
import com.foxinmy.weixin4j.http.weixin.WeixinResponse; import com.foxinmy.weixin4j.http.weixin.WeixinResponse;
import com.foxinmy.weixin4j.model.Token; import com.foxinmy.weixin4j.model.Token;
import com.foxinmy.weixin4j.qy.type.URLConsts; import com.foxinmy.weixin4j.qy.type.URLConsts;
import com.foxinmy.weixin4j.token.TokenCreator; import com.foxinmy.weixin4j.token.TokenCreator;
import com.foxinmy.weixin4j.token.TokenHolder; import com.foxinmy.weixin4j.token.TokenHolder;
import com.foxinmy.weixin4j.type.TicketType; import com.foxinmy.weixin4j.type.TicketType;
/** /**
* 微信企业号TICKET创建(包括jsticket、其它JSSDK所需的ticket的创建 * 微信企业号TICKET创建(包括jsticket、其它JSSDK所需的ticket的创建
* *
* @className WeixinTicketCreator * @className WeixinTicketCreator
* @author jy * @author jy
* @date 2015年12月25日 * @date 2015年12月25日
* @since JDK 1.6 <a href= * @since JDK 1.6 <a href=
* "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" * "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> * >JSTICKET</a>
*/ */
public class WeixinTicketCreator implements TokenCreator { public class WeixinTicketCreator implements TokenCreator {
private final String corpid; private final String corpid;
private final TicketType ticketType; private final TicketType ticketType;
private final TokenHolder weixinTokenHolder; private final TokenHolder weixinTokenHolder;
private final WeixinRequestExecutor weixinExecutor; private final WeixinRequestExecutor weixinExecutor;
/** /**
* @param corpid * @param corpid
* 企业号ID * 企业号ID
* @param ticketType * @param ticketType
* 票据类型 * 票据类型
* @param weixinTokenHolder * @param weixinTokenHolder
* <font color="red">企业号的的access_token</font> * <font color="red">企业号的的access_token</font>
*/ */
public WeixinTicketCreator(String corpid, TicketType ticketType, public WeixinTicketCreator(String corpid, TicketType ticketType, TokenHolder weixinTokenHolder) {
TokenHolder weixinTokenHolder) { this.corpid = corpid;
this.corpid = corpid; this.ticketType = ticketType;
this.ticketType = ticketType; this.weixinTokenHolder = weixinTokenHolder;
this.weixinTokenHolder = weixinTokenHolder; this.weixinExecutor = new WeixinRequestExecutor();
this.weixinExecutor = new WeixinRequestExecutor(); }
}
@Override
@Override public String getCacheKey() {
public String getCacheKey() { return String.format("weixin4j_qy_ticket_%s_%s", ticketType.name(), corpid);
return String.format("weixin4j_qy_ticket_%s_%s", corpid, ticketType.name()); }
}
@Override
@Override public Token createToken() throws WeixinException {
public Token createToken() throws WeixinException { WeixinResponse response = null;
WeixinResponse response = null; if (ticketType == TicketType.jsapi) {
if (ticketType == TicketType.jsapi) { response = weixinExecutor
response = weixinExecutor.get(String.format( .get(String.format(URLConsts.JS_TICKET_URL, weixinTokenHolder.getToken().getAccessToken()));
URLConsts.JS_TICKET_URL, weixinTokenHolder.getToken() } else {
.getAccessToken())); response = weixinExecutor.get(String.format(URLConsts.TICKET_URL,
} else { weixinTokenHolder.getToken().getAccessToken(), ticketType.name()));
response = weixinExecutor.get(String.format(URLConsts.TICKET_URL, }
weixinTokenHolder.getToken().getAccessToken(), JSONObject result = response.getAsJson();
ticketType.name())); Token token = new Token(result.getString("ticket"));
} token.setExpiresIn(result.getIntValue("expires_in"));
JSONObject result = response.getAsJson(); token.setCreateTime(System.currentTimeMillis());
Token token = new Token(result.getString("ticket")); token.setOriginalResult(response.getAsString());
token.setExpiresIn(result.getIntValue("expires_in")); return token;
token.setCreateTime(System.currentTimeMillis()); }
token.setOriginalResult(response.getAsString()); }
return token;
}
}