lsm/weixin-java-tools
1
0
Fork 0
mirror of https://gitee.com/binary/weixin-java-tools.git synced 2025-07-19 07:44:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #76 from wechat-group/revert-75-agentid-type

Browse Source 
Revert "修改WxCpMessage中agentId的数据类型, String-> Integer"
This commit is contained in:
Binary Wang 2016-11-16 15:21:28 +08:00 committed by GitHub
commit e7d70307eb
8 changed files with 298 additions and 294 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -26,7 +26,6 @@ test-config.xml
/gradle/
*.bat
/gradlew
**/build/
# OSX
# Icon must end with two \r

2
weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpConfigStorage.java
View File

@ -45,7 +45,7 @@ public interface WxCpConfigStorage {
String getCorpSecret();
Integer getAgentId();
String getAgentId();
String getToken();

6
weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpInMemoryConfigStorage.java
View File

@ -19,7 +19,7 @@ public class WxCpInMemoryConfigStorage implements WxCpConfigStorage {
protected volatile String token;
protected volatile String accessToken;
protected volatile String aesKey;
protected volatile Integer agentId;
protected volatile String agentId;
protected volatile long expiresTime;
protected volatile String oauth2redirectUri;
@ -146,11 +146,11 @@ public class WxCpInMemoryConfigStorage implements WxCpConfigStorage {
}
@Override
public Integer getAgentId() {
public String getAgentId() {
return this.agentId;
}
public void setAgentId(Integer agentId) {
public void setAgentId(String agentId) {
this.agentId = agentId;
}

6
weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpJedisConfigStorage.java
View File

@ -25,7 +25,7 @@ public class WxCpJedisConfigStorage implements WxCpConfigStorage {
private volatile String token;
private volatile String aesKey;
private volatile Integer agentId;
private volatile String agentId;
private volatile String oauth2redirectUri;
@ -150,7 +150,7 @@ public class WxCpJedisConfigStorage implements WxCpConfigStorage {
}
@Override
public Integer getAgentId() {
public String getAgentId() {
return this.agentId;
}
@ -230,7 +230,7 @@ public class WxCpJedisConfigStorage implements WxCpConfigStorage {
this.aesKey = aesKey;
}
public void setAgentId(Integer agentId) {
public void setAgentId(String agentId) {
this.agentId = agentId;
}

16
weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpService.java
View File

@ -160,7 +160,7 @@ public interface WxCpService {
*
* @param menu
* @throws WxErrorException
* @see #menuCreate(Integer, WxMenu)
* @see #menuCreate(String, me.chanjar.weixin.common.bean.menu.WxMenu)
*/
void menuCreate(WxMenu menu) throws WxErrorException;
@ -177,7 +177,7 @@ public interface WxCpService {
* @throws WxErrorException
* @see #menuCreate(me.chanjar.weixin.common.bean.menu.WxMenu)
*/
void menuCreate(Integer agentId, WxMenu menu) throws WxErrorException;
void menuCreate(String agentId, WxMenu menu) throws WxErrorException;
/**
* <pre>
@ -188,7 +188,7 @@ public interface WxCpService {
* </pre>
*
* @throws WxErrorException
* @see #menuDelete(Integer)
* @see #menuDelete(String)
*/
void menuDelete() throws WxErrorException;
@ -204,7 +204,7 @@ public interface WxCpService {
* @throws WxErrorException
* @see #menuDelete()
*/
void menuDelete(Integer agentId) throws WxErrorException;
void menuDelete(String agentId) throws WxErrorException;
/**
* <pre>
@ -215,7 +215,7 @@ public interface WxCpService {
* </pre>
*
* @throws WxErrorException
* @see #menuGet(Integer)
* @see #menuGet(String)
*/
WxMenu menuGet() throws WxErrorException;
@ -231,7 +231,7 @@ public interface WxCpService {
* @throws WxErrorException
* @see #menuGet()
*/
WxMenu menuGet(Integer agentId) throws WxErrorException;
WxMenu menuGet(String agentId) throws WxErrorException;
/**
* <pre>
@ -425,7 +425,7 @@ public interface WxCpService {
*
* @param code
* @return [userid, deviceid]
* @see #oauth2getUserInfo(Integer, String)
* @see #oauth2getUserInfo(String, String)
*/
String[] oauth2getUserInfo(String code) throws WxErrorException;
@ -443,7 +443,7 @@ public interface WxCpService {
* @return [userid, deviceid]
* @see #oauth2getUserInfo(String)
*/
String[] oauth2getUserInfo(Integer agentId, String code) throws WxErrorException;
String[] oauth2getUserInfo(String agentId, String code) throws WxErrorException;
/**

8
weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpServiceImpl.java
View File

@ -191,7 +191,7 @@ public class WxCpServiceImpl implements WxCpService {
}
@Override
public void menuCreate(Integer agentId, WxMenu menu) throws WxErrorException {
public void menuCreate(String agentId, WxMenu menu) throws WxErrorException {
String url = "https://qyapi.weixin.qq.com/cgi-bin/menu/create?agentid="
+ this.configStorage.getAgentId();
post(url, menu.toJson());
@ -203,7 +203,7 @@ public class WxCpServiceImpl implements WxCpService {
}
@Override
public void menuDelete(Integer agentId) throws WxErrorException {
public void menuDelete(String agentId) throws WxErrorException {
String url = "https://qyapi.weixin.qq.com/cgi-bin/menu/delete?agentid=" + agentId;
get(url, null);
}
@ -214,7 +214,7 @@ public class WxCpServiceImpl implements WxCpService {
}
@Override
public WxMenu menuGet(Integer agentId) throws WxErrorException {
public WxMenu menuGet(String agentId) throws WxErrorException {
String url = "https://qyapi.weixin.qq.com/cgi-bin/menu/get?agentid=" + agentId;
try {
String resultContent = get(url, null);
@ -487,7 +487,7 @@ this.configStorage.getOauth2redirectUri(),
}
@Override
public String[] oauth2getUserInfo(Integer agentId, String code) throws WxErrorException {
public String[] oauth2getUserInfo(String agentId, String code) throws WxErrorException {
String url = "https://qyapi.weixin.qq.com/cgi-bin/user/getuserinfo?"
+ "code=" + code
+ "&agentid=" + agentId;

17
weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpMessage.java
View File

@ -1,12 +1,17 @@
package me.chanjar.weixin.cp.bean;
import me.chanjar.weixin.cp.bean.messagebuilder.*;
import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
import me.chanjar.weixin.cp.bean.messagebuilder.FileBuilder;
import me.chanjar.weixin.cp.bean.messagebuilder.ImageBuilder;
import me.chanjar.weixin.cp.bean.messagebuilder.NewsBuilder;
import me.chanjar.weixin.cp.bean.messagebuilder.TextBuilder;
import me.chanjar.weixin.cp.bean.messagebuilder.VideoBuilder;
import me.chanjar.weixin.cp.bean.messagebuilder.VoiceBuilder;
import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder;
/**
* 消息
*
@ -18,7 +23,7 @@ public class WxCpMessage implements Serializable {
private String toUser;
private String toParty;
private String toTag;
private Integer agentId;
private String agentId;
private String msgType;
private String content;
private String mediaId;
@ -96,11 +101,11 @@ public class WxCpMessage implements Serializable {
this.toTag = toTag;
}
public Integer getAgentId() {
public String getAgentId() {
return this.agentId;
}
public void setAgentId(Integer agentId) {
public void setAgentId(String agentId) {
this.agentId = agentId;
}

4
weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/messagebuilder/BaseBuilder.java
View File

@ -5,13 +5,13 @@ import me.chanjar.weixin.cp.bean.WxCpMessage;
public class BaseBuilder<T> {
protected String msgType;
protected Integer agentId;
protected String agentId;
protected String toUser;
protected String toParty;
protected String toTag;
protected String safe;
public T agentId(Integer agentId) {
public T agentId(String agentId) {
this.agentId = agentId;
return (T) this;
}