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

update something

Browse Source
This commit is contained in:
jinyu 2015-06-27 23:23:11 +08:00
parent dbdc5eee72
commit 0b35861009
4 changed files with 12 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/WeixinSuiteProxy.java
View File

@ -39,6 +39,11 @@ public class WeixinSuiteProxy {
this(suiteId, suiteSecret, QyApi.DEFAULT_TOKEN_STORAGER); this(suiteId, suiteSecret, QyApi.DEFAULT_TOKEN_STORAGER);
} }
public WeixinSuiteProxy(TokenStorager tokenStorager) throws WeixinException {
this(QyApi.DEFAULT_WEIXIN_ACCOUNT.getSuiteId(),
QyApi.DEFAULT_WEIXIN_ACCOUNT.getSuiteSecret(), tokenStorager);
}
/** /**
* *
* @param suiteId * @param suiteId
@ -53,13 +58,13 @@ public class WeixinSuiteProxy {
*/ */
public WeixinSuiteProxy(String suiteId, String suiteSecret, public WeixinSuiteProxy(String suiteId, String suiteSecret,
TokenStorager tokenStorager) throws WeixinException { TokenStorager tokenStorager) throws WeixinException {
this.suiteApi = new SuiteApi(suiteId, suiteSecret, tokenStorager); this(new SuiteTicketHolder(suiteId, suiteSecret, tokenStorager));
} }
/** /**
* *
* @param suiteTicketHolder * @param suiteTicketHolder
* 套件ticket存取 * 套件ticket的存取
* @throws WeixinException * @throws WeixinException
*/ */
public WeixinSuiteProxy(SuiteTicketHolder suiteTicketHolder) public WeixinSuiteProxy(SuiteTicketHolder suiteTicketHolder)

29
weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/api/SuiteApi.java
View File

@ -18,7 +18,6 @@ import com.foxinmy.weixin4j.qy.suite.WeixinSuiteTokenCreator;
import com.foxinmy.weixin4j.qy.suite.WeixinTokenSuiteCreator; import com.foxinmy.weixin4j.qy.suite.WeixinTokenSuiteCreator;
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.token.TokenStorager;
/** /**
* 第三方应用套件 * 第三方应用套件
@ -48,34 +47,12 @@ public class SuiteApi extends QyApi {
*/ */
private final TokenHolder suitePreCodeHolder; private final TokenHolder suitePreCodeHolder;
public SuiteApi() throws WeixinException {
this(DEFAULT_WEIXIN_ACCOUNT.getSuiteId(), DEFAULT_WEIXIN_ACCOUNT
.getSuiteSecret());
}
public SuiteApi(String suiteId, String suiteSecret) throws WeixinException {
this(suiteId, suiteSecret, DEFAULT_TOKEN_STORAGER);
}
/**
*
* @param suiteId
* 应用ID
* @param suiteSecret
* 应用secret
* @param tokenStorager
* 应用token存储器
* @throws WeixinException
*/
public SuiteApi(String suiteId, String suiteSecret,
TokenStorager tokenStorager) throws WeixinException {
this(new SuiteTicketHolder(suiteId, suiteSecret, tokenStorager));
}
/** /**
* *
* @param suiteTicketHolder * @param suiteTicketHolder
* 套件ticket存取 * 套件ticket存取
* @param tokenStorager
* 应用token存储器
* @throws WeixinException * @throws WeixinException
*/ */
public SuiteApi(SuiteTicketHolder suiteTicketHolder) throws WeixinException { public SuiteApi(SuiteTicketHolder suiteTicketHolder) throws WeixinException {
@ -153,7 +130,7 @@ public class SuiteApi extends QyApi {
public JsonResult setSuiteSession(int... appids) throws WeixinException { public JsonResult setSuiteSession(int... appids) throws WeixinException {
String suite_set_session_uri = getRequestUri("suite_set_session_uri"); String suite_set_session_uri = getRequestUri("suite_set_session_uri");
JSONObject para = new JSONObject(); JSONObject para = new JSONObject();
para.put("pre_auth_code", suiteTicketHolder.getTicket()); para.put("pre_auth_code", suitePreCodeHolder.getAccessToken());
para.put("session_info", appids); para.put("session_info", appids);
WeixinResponse response = weixinClient WeixinResponse response = weixinClient
.post(String.format(suite_set_session_uri, .post(String.format(suite_set_session_uri,

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

@ -41,7 +41,7 @@ public class SuitePerCodeHolder {
* *
* @return * @return
*/ */
private String getCacheKey() { public String getCacheKey() {
return String.format("qy_suite_percode_%s", suiteId); return String.format("qy_suite_percode_%s", suiteId);
} }

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

@ -29,7 +29,6 @@ public class SuiteTicketHolder {
/** /**
* 查找ticket * 查找ticket
* *
* @param suiteId
* @return * @return
* @throws WeixinException * @throws WeixinException
*/ */
@ -40,10 +39,9 @@ public class SuiteTicketHolder {
/** /**
* 获取ticket的key * 获取ticket的key
* *
* @param suiteId
* @return * @return
*/ */
private String getCacheKey() { public String getCacheKey() {
return String.format("qy_suite_ticket_%s", suiteId); return String.format("qy_suite_ticket_%s", suiteId);
} }