Browse Source

修复一些warning,尤其是导致打包warning的不规范或不必要的javadoc

master
BinaryWang 8 years ago
parent
commit
5d957582e3
10 changed files with 22 additions and 210 deletions
  1. +0
    -7
      weixin-java-cp/src/main/java/me/chanjar/weixin/cp/util/xml/XStreamTransformer.java
  2. +0
    -1
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMessageMatcher.java
  3. +0
    -1
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMessageRouter.java
  4. +15
    -59
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMessageRouterRule.java
  5. +1
    -118
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpService.java
  6. +0
    -5
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpCustomMessage.java
  7. +6
    -6
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpMassOpenIdsMessage.java
  8. +0
    -4
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpXmlMessage.java
  9. +0
    -8
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpXmlOutMessage.java
  10. +0
    -1
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/kefu/result/WxMpKfInfo.java

+ 0
- 7
weixin-java-cp/src/main/java/me/chanjar/weixin/cp/util/xml/XStreamTransformer.java View File

@@ -14,10 +14,6 @@ public class XStreamTransformer {

/**
* xml -> pojo
*
* @param clazz
* @param xml
* @return
*/
@SuppressWarnings("unchecked")
public static <T> T fromXml(Class<T> clazz, String xml) {
@@ -43,9 +39,6 @@ public class XStreamTransformer {
/**
* pojo -> xml
*
* @param clazz
* @param object
* @return
*/
public static <T> String toXml(Class<T> clazz, T object) {
return CLASS_2_XSTREAM_INSTANCE.get(clazz).toXML(object);


+ 0
- 1
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMessageMatcher.java View File

@@ -10,7 +10,6 @@ public interface WxMpMessageMatcher {
/**
* 消息是否匹配某种模式
* @param message
* @return
*/
public boolean match(WxMpXmlMessage message);



+ 0
- 1
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMessageRouter.java View File

@@ -124,7 +124,6 @@ public class WxMpMessageRouter {
/**
* 开始一个新的Route规则
* @return
*/
public WxMpMessageRouterRule rule() {
return new WxMpMessageRouterRule(this);


+ 15
- 59
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMessageRouterRule.java View File

@@ -34,9 +34,9 @@ public class WxMpMessageRouterRule {

private boolean reEnter = false;

private List<WxMpMessageHandler> handlers = new ArrayList<WxMpMessageHandler>();
private List<WxMpMessageHandler> handlers = new ArrayList<>();

private List<WxMpMessageInterceptor> interceptors = new ArrayList<WxMpMessageInterceptor>();
private List<WxMpMessageInterceptor> interceptors = new ArrayList<>();

public WxMpMessageRouterRule(WxMpMessageRouter routerBuilder) {
this.routerBuilder = routerBuilder;
@@ -44,9 +44,6 @@ public class WxMpMessageRouterRule {

/**
* 设置是否异步执行,默认是true
*
* @param async
* @return
*/
public WxMpMessageRouterRule async(boolean async) {
this.async = async;
@@ -55,9 +52,6 @@ public class WxMpMessageRouterRule {

/**
* 如果msgType等于某值
*
* @param msgType
* @return
*/
public WxMpMessageRouterRule msgType(String msgType) {
this.msgType = msgType;
@@ -66,9 +60,6 @@ public class WxMpMessageRouterRule {

/**
* 如果event等于某值
*
* @param event
* @return
*/
public WxMpMessageRouterRule event(String event) {
this.event = event;
@@ -77,9 +68,6 @@ public class WxMpMessageRouterRule {

/**
* 如果eventKey等于某值
*
* @param eventKey
* @return
*/
public WxMpMessageRouterRule eventKey(String eventKey) {
this.eventKey = eventKey;
@@ -88,9 +76,6 @@ public class WxMpMessageRouterRule {

/**
* 如果content等于某值
*
* @param content
* @return
*/
public WxMpMessageRouterRule content(String content) {
this.content = content;
@@ -99,9 +84,6 @@ public class WxMpMessageRouterRule {

/**
* 如果content匹配该正则表达式
*
* @param regex
* @return
*/
public WxMpMessageRouterRule rContent(String regex) {
this.rContent = regex;
@@ -110,9 +92,6 @@ public class WxMpMessageRouterRule {

/**
* 如果fromUser等于某值
*
* @param fromUser
* @return
*/
public WxMpMessageRouterRule fromUser(String fromUser) {
this.fromUser = fromUser;
@@ -121,9 +100,6 @@ public class WxMpMessageRouterRule {

/**
* 如果消息匹配某个matcher,用在用户需要自定义更复杂的匹配规则的时候
*
* @param matcher
* @return
*/
public WxMpMessageRouterRule matcher(WxMpMessageMatcher matcher) {
this.matcher = matcher;
@@ -132,9 +108,6 @@ public class WxMpMessageRouterRule {

/**
* 设置微信消息拦截器
*
* @param interceptor
* @return
*/
public WxMpMessageRouterRule interceptor(WxMpMessageInterceptor interceptor) {
return interceptor(interceptor, (WxMpMessageInterceptor[]) null);
@@ -142,10 +115,6 @@ public class WxMpMessageRouterRule {

/**
* 设置微信消息拦截器
*
* @param interceptor
* @param otherInterceptors
* @return
*/
public WxMpMessageRouterRule interceptor(WxMpMessageInterceptor interceptor, WxMpMessageInterceptor... otherInterceptors) {
this.interceptors.add(interceptor);
@@ -159,9 +128,6 @@ public class WxMpMessageRouterRule {

/**
* 设置微信消息处理器
*
* @param handler
* @return
*/
public WxMpMessageRouterRule handler(WxMpMessageHandler handler) {
return handler(handler, (WxMpMessageHandler[]) null);
@@ -169,10 +135,6 @@ public class WxMpMessageRouterRule {

/**
* 设置微信消息处理器
*
* @param handler
* @param otherHandlers
* @return
*/
public WxMpMessageRouterRule handler(WxMpMessageHandler handler, WxMpMessageHandler... otherHandlers) {
this.handlers.add(handler);
@@ -186,8 +148,6 @@ public class WxMpMessageRouterRule {

/**
* 规则结束,代表如果一个消息匹配该规则,那么它将不再会进入其他规则
*
* @return
*/
public WxMpMessageRouter end() {
this.routerBuilder.getRules().add(this);
@@ -196,8 +156,6 @@ public class WxMpMessageRouterRule {

/**
* 规则结束,但是消息还会进入其他规则
*
* @return
*/
public WxMpMessageRouter next() {
this.reEnter = true;
@@ -207,8 +165,6 @@ public class WxMpMessageRouterRule {
/**
* 将微信自定义的事件修正为不区分大小写,
* 比如框架定义的事件常量为click,但微信传递过来的却是CLICK
* @param wxMessage
* @return
*/
protected boolean test(WxMpXmlMessage wxMessage) {
return
@@ -243,7 +199,7 @@ public class WxMpMessageRouterRule {

try {

Map<String, Object> context = new HashMap<String, Object>();
Map<String, Object> context = new HashMap<>();
// 如果拦截器不通过
for (WxMpMessageInterceptor interceptor : this.interceptors) {
if (!interceptor.intercept(wxMessage, context, wxMpService, sessionManager)) {
@@ -266,11 +222,11 @@ public class WxMpMessageRouterRule {
}

public WxMpMessageRouter getRouterBuilder() {
return routerBuilder;
return this.routerBuilder;
}

public boolean isAsync() {
return async;
return this.async;
}

public void setAsync(boolean async) {
@@ -278,7 +234,7 @@ public class WxMpMessageRouterRule {
}

public String getFromUser() {
return fromUser;
return this.fromUser;
}

public void setFromUser(String fromUser) {
@@ -286,7 +242,7 @@ public class WxMpMessageRouterRule {
}

public String getMsgType() {
return msgType;
return this.msgType;
}

public void setMsgType(String msgType) {
@@ -294,7 +250,7 @@ public class WxMpMessageRouterRule {
}

public String getEvent() {
return event;
return this.event;
}

public void setEvent(String event) {
@@ -302,7 +258,7 @@ public class WxMpMessageRouterRule {
}

public String getEventKey() {
return eventKey;
return this.eventKey;
}

public void setEventKey(String eventKey) {
@@ -310,7 +266,7 @@ public class WxMpMessageRouterRule {
}

public String getContent() {
return content;
return this.content;
}

public void setContent(String content) {
@@ -318,7 +274,7 @@ public class WxMpMessageRouterRule {
}

public String getrContent() {
return rContent;
return this.rContent;
}

public void setrContent(String rContent) {
@@ -326,7 +282,7 @@ public class WxMpMessageRouterRule {
}

public WxMpMessageMatcher getMatcher() {
return matcher;
return this.matcher;
}

public void setMatcher(WxMpMessageMatcher matcher) {
@@ -334,7 +290,7 @@ public class WxMpMessageRouterRule {
}

public boolean isReEnter() {
return reEnter;
return this.reEnter;
}

public void setReEnter(boolean reEnter) {
@@ -342,7 +298,7 @@ public class WxMpMessageRouterRule {
}

public List<WxMpMessageHandler> getHandlers() {
return handlers;
return this.handlers;
}

public void setHandlers(List<WxMpMessageHandler> handlers) {
@@ -350,7 +306,7 @@ public class WxMpMessageRouterRule {
}

public List<WxMpMessageInterceptor> getInterceptors() {
return interceptors;
return this.interceptors;
}

public void setInterceptors(List<WxMpMessageInterceptor> interceptors) {


+ 1
- 118
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpService.java View File

@@ -60,18 +60,12 @@ public interface WxMpService {
* 验证推送过来的消息的正确性
* 详情请见: http://mp.weixin.qq.com/wiki/index.php?title=验证消息真实性
* </pre>
* @param timestamp
* @param nonce
* @param signature
* @return
*/
public boolean checkSignature(String timestamp, String nonce, String signature);

/**
* 获取access_token, 不强制刷新access_token
* @see #getAccessToken(boolean)
* @return
* @throws WxErrorException
*/
public String getAccessToken() throws WxErrorException;

@@ -87,16 +81,12 @@ public interface WxMpService {
* 详情请见: http://mp.weixin.qq.com/wiki/index.php?title=获取access_token
* </pre>
* @param forceRefresh 强制刷新
* @return
* @throws me.chanjar.weixin.common.exception.WxErrorException
*/
public String getAccessToken(boolean forceRefresh) throws WxErrorException;

/**
* 获得jsapi_ticket,不强制刷新jsapi_ticket
* @see #getJsapiTicket(boolean)
* @return
* @throws WxErrorException
*/
public String getJsapiTicket() throws WxErrorException;

@@ -108,8 +98,6 @@ public interface WxMpService {
* 详情请见:http://mp.weixin.qq.com/wiki/7/aaa137b55fb2e0456bf8dd9148dd613f.html#.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
* </pre>
* @param forceRefresh 强制刷新
* @return
* @throws WxErrorException
*/
public String getJsapiTicket(boolean forceRefresh) throws WxErrorException;

@@ -119,8 +107,6 @@ public interface WxMpService {
*
* 详情请见:http://mp.weixin.qq.com/wiki/7/aaa137b55fb2e0456bf8dd9148dd613f.html#.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
* </pre>
* @param url url
* @return
*/
public WxJsapiSignature createJsapiSignature(String url) throws WxErrorException;

@@ -158,8 +144,6 @@ public interface WxMpService {
* </pre>
* @param mediaType 媒体类型, 请看{@link me.chanjar.weixin.common.api.WxConsts}
* @param material 上传的素材, 请看{@link me.chanjar.weixin.mp.bean.WxMpMaterial}
* @return
* @throws WxErrorException
*/
public WxMpMaterialUploadResult materialFileUpload(String mediaType, WxMpMaterial material) throws WxErrorException;

@@ -170,8 +154,6 @@ public interface WxMpService {
* 详情请见: http://mp.weixin.qq.com/wiki/14/7e6c03263063f4813141c3e17dd4350a.html
* </pre>
* @param news 上传的图文消息, 请看{@link me.chanjar.weixin.mp.bean.WxMpMaterialNews}
* @return
* @throws WxErrorException
*/
public WxMpMaterialUploadResult materialNewsUpload(WxMpMaterialNews news) throws WxErrorException;

@@ -182,8 +164,6 @@ public interface WxMpService {
* 详情请见: http://mp.weixin.qq.com/wiki/4/b3546879f07623cb30df9ca0e420a5d0.html
* </pre>
* @param media_id 永久素材的id
* @return
* @throws WxErrorException
*/
public InputStream materialImageOrVoiceDownload(String media_id) throws WxErrorException;

@@ -194,8 +174,6 @@ public interface WxMpService {
* 详情请见: http://mp.weixin.qq.com/wiki/4/b3546879f07623cb30df9ca0e420a5d0.html
* </pre>
* @param media_id 永久素材的id
* @return
* @throws WxErrorException
*/
public WxMpMaterialVideoInfoResult materialVideoInfo(String media_id) throws WxErrorException;

@@ -206,8 +184,6 @@ public interface WxMpService {
* 详情请见: http://mp.weixin.qq.com/wiki/4/b3546879f07623cb30df9ca0e420a5d0.html
* </pre>
* @param media_id 永久素材的id
* @return
* @throws WxErrorException
*/
public WxMpMaterialNews materialNewsInfo(String media_id) throws WxErrorException;

@@ -218,8 +194,6 @@ public interface WxMpService {
* 详情请见: http://mp.weixin.qq.com/wiki/4/19a59cba020d506e767360ca1be29450.html
* </pre>
* @param wxMpMaterialArticleUpdate 用来更新图文素材的bean, 请看{@link me.chanjar.weixin.mp.bean.WxMpMaterialArticleUpdate}
* @return
* @throws WxErrorException
*/
public boolean materialNewsUpdate(WxMpMaterialArticleUpdate wxMpMaterialArticleUpdate) throws WxErrorException;

@@ -230,8 +204,6 @@ public interface WxMpService {
* 详情请见: http://mp.weixin.qq.com/wiki/5/e66f61c303db51a6c0f90f46b15af5f5.html
* </pre>
* @param media_id 永久素材的id
* @return
* @throws WxErrorException
*/
public boolean materialDelete(String media_id) throws WxErrorException;

@@ -241,8 +213,6 @@ public interface WxMpService {
*
* 详情请见: http://mp.weixin.qq.com/wiki/16/8cc64f8c189674b421bee3ed403993b8.html
* </pre>
* @return
* @throws WxErrorException
*/
public WxMpMaterialCountResult materialCount() throws WxErrorException;

@@ -254,8 +224,6 @@ public interface WxMpService {
* </pre>
* @param offset 从全部素材的该偏移位置开始返回,0表示从第一个素材 返回
* @param count 返回素材的数量,取值在1到20之间
* @return
* @throws WxErrorException
*/
public WxMpMaterialNewsBatchGetResult materialNewsBatchGet(int offset, int count) throws WxErrorException;

@@ -268,8 +236,6 @@ public interface WxMpService {
* @param type 媒体类型, 请看{@link me.chanjar.weixin.common.api.WxConsts}
* @param offset 从全部素材的该偏移位置开始返回,0表示从第一个素材 返回
* @param count 返回素材的数量,取值在1到20之间
* @return
* @throws WxErrorException
*/
public WxMpMaterialFileBatchGetResult materialFileBatchGet(String type, int offset, int count) throws WxErrorException;

@@ -300,8 +266,6 @@ public interface WxMpService {
* 发送客服消息
* 详情请见: http://mp.weixin.qq.com/wiki/index.php?title=发送客服消息
* </pre>
* @param message
* @throws WxErrorException
*/
public void customMessageSend(WxMpCustomMessage message) throws WxErrorException;

@@ -323,8 +287,6 @@ public interface WxMpService {
* 上传群发用的视频,上传后才能群发视频消息
* 详情请见: http://mp.weixin.qq.com/wiki/index.php?title=高级群发接口
* </pre>
* @return
* @throws WxErrorException
* @see #massGroupMessageSend(me.chanjar.weixin.mp.bean.WxMpMassGroupMessage)
* @see #massOpenIdsMessageSend(me.chanjar.weixin.mp.bean.WxMpMassOpenIdsMessage)
*/
@@ -337,9 +299,6 @@ public interface WxMpService {
* 如果发送视频消息,必须先使用 {@link #massVideoUpload(me.chanjar.weixin.mp.bean.WxMpMassVideo)} 获得media_id,然后再发送
* 详情请见: http://mp.weixin.qq.com/wiki/index.php?title=高级群发接口
* </pre>
* @param message
* @throws WxErrorException
* @return
*/
public WxMpMassSendResult massGroupMessageSend(WxMpMassGroupMessage message) throws WxErrorException;

@@ -350,9 +309,6 @@ public interface WxMpService {
* 如果发送视频消息,必须先使用 {@link #massVideoUpload(me.chanjar.weixin.mp.bean.WxMpMassVideo)} 获得media_id,然后再发送
* 详情请见: http://mp.weixin.qq.com/wiki/index.php?title=高级群发接口
* </pre>
* @param message
* @return
* @throws WxErrorException
*/
public WxMpMassSendResult massOpenIdsMessageSend(WxMpMassOpenIdsMessage message) throws WxErrorException;

@@ -363,8 +319,6 @@ public interface WxMpService {
* 如果要创建个性化菜单,请设置matchrule属性
* 详情请见:http://mp.weixin.qq.com/wiki/0/c48ccd12b69ae023159b4bfaa7c39c20.html
* </pre>
* @param menu
* @throws WxErrorException
*/
public void menuCreate(WxMenu menu) throws WxErrorException;

@@ -373,7 +327,6 @@ public interface WxMpService {
* 自定义菜单删除接口
* 详情请见: http://mp.weixin.qq.com/wiki/index.php?title=自定义菜单删除接口
* </pre>
* @throws WxErrorException
*/
public void menuDelete() throws WxErrorException;

@@ -383,7 +336,6 @@ public interface WxMpService {
* 详情请见: http://mp.weixin.qq.com/wiki/0/c48ccd12b69ae023159b4bfaa7c39c20.html
* </pre>
* @param menuid
* @throws WxErrorException
*/
public void menuDelete(String menuid) throws WxErrorException;

@@ -392,8 +344,6 @@ public interface WxMpService {
* 自定义菜单查询接口
* 详情请见: http://mp.weixin.qq.com/wiki/index.php?title=自定义菜单查询接口
* </pre>
* @return
* @throws WxErrorException
*/
public WxMenu menuGet() throws WxErrorException;

@@ -403,7 +353,6 @@ public interface WxMpService {
* 详情请见: http://mp.weixin.qq.com/wiki/0/c48ccd12b69ae023159b4bfaa7c39c20.html
* </pre>
* @param userid 可以是粉丝的OpenID,也可以是粉丝的微信号。
* @throws WxErrorException
*/
public WxMenu menuTryMatch(String userid) throws WxErrorException;

@@ -414,7 +363,6 @@ public interface WxMpService {
* 详情请见: http://mp.weixin.qq.com/wiki/index.php?title=分组管理接口
* </pre>
* @param name 分组名字(30个字符以内)
* @throws WxErrorException
*/
public WxMpGroup groupCreate(String name) throws WxErrorException;

@@ -424,7 +372,6 @@ public interface WxMpService {
* 详情请见: http://mp.weixin.qq.com/wiki/index.php?title=分组管理接口
* </pre>
* @return
* @throws WxErrorException
*/
public List<WxMpGroup> groupGet() throws WxErrorException;

@@ -434,7 +381,6 @@ public interface WxMpService {
* 详情请见: http://mp.weixin.qq.com/wiki/index.php?title=分组管理接口
* </pre>
* @param openid 微信用户的openid
* @throws WxErrorException
*/
public long userGetGroup(String openid) throws WxErrorException;

@@ -446,7 +392,6 @@ public interface WxMpService {
* 如果id为0(未分组),1(黑名单),2(星标组),或者不存在的id,微信会返回系统繁忙的错误
* </pre>
* @param group 要更新的group,group的id,name必须设置
* @throws WxErrorException
*/
public void groupUpdate(WxMpGroup group) throws WxErrorException;

@@ -459,7 +404,6 @@ public interface WxMpService {
* </pre>
* @param openid 用户openid
* @param to_groupid 移动到的分组id
* @throws WxErrorException
*/
public void userUpdateGroup(String openid, long to_groupid) throws WxErrorException;

@@ -470,7 +414,6 @@ public interface WxMpService {
* </pre>
* @param openid 用户openid
* @param remark 备注名
* @throws WxErrorException
*/
public void userUpdateRemark(String openid, String remark) throws WxErrorException;

@@ -481,8 +424,6 @@ public interface WxMpService {
* </pre>
* @param openid 用户openid
* @param lang 语言,zh_CN 简体(默认),zh_TW 繁体,en 英语
* @return
* @throws WxErrorException
*/
public WxMpUser userInfo(String openid, String lang) throws WxErrorException;

@@ -492,8 +433,6 @@ public interface WxMpService {
* 详情请见: http://mp.weixin.qq.com/wiki/index.php?title=获取关注者列表
* </pre>
* @param next_openid 可选,第一个拉取的OPENID,null为从头开始拉取
* @return
* @throws WxErrorException
*/
public WxMpUserList userList(String next_openid) throws WxErrorException;

@@ -504,8 +443,6 @@ public interface WxMpService {
* </pre>
* @param scene_id 参数。
* @param expire_seconds 过期秒数,默认60秒,最小60秒,最大1800秒
* @return
* @throws WxErrorException
*/
public WxMpQrCodeTicket qrCodeCreateTmpTicket(int scene_id, Integer expire_seconds) throws WxErrorException;

@@ -515,8 +452,6 @@ public interface WxMpService {
* 详情请见: <a href="http://mp.weixin.qq.com/wiki/18/167e7d94df85d8389df6c94a7a8f78ba.html">生成带参数的二维码</a>
* </pre>
* @param scene_id 参数。永久二维码时最大值为100000(目前参数只支持1--100000)
* @return
* @throws WxErrorException
*/
public WxMpQrCodeTicket qrCodeCreateLastTicket(int scene_id) throws WxErrorException;

@@ -527,8 +462,6 @@ public interface WxMpService {
* </pre>
*
* @param scene_str 参数。字符串类型长度现在为1到64
* @return
* @throws WxErrorException
*/
public WxMpQrCodeTicket qrCodeCreateLastTicket(String scene_str) throws WxErrorException;

@@ -538,8 +471,6 @@ public interface WxMpService {
* 详情请见: <a href="http://mp.weixin.qq.com/wiki/18/167e7d94df85d8389df6c94a7a8f78ba.html">生成带参数的二维码</a>
* </pre>
* @param ticket 二维码ticket
* @return
* @throws WxErrorException
*/
public File qrCodePicture(WxMpQrCodeTicket ticket) throws WxErrorException;

@@ -550,8 +481,6 @@ public interface WxMpService {
* </pre>
* @param ticket 二维码ticket
* @param needShortUrl 是否需要压缩的二维码地址
* @return
* @throws WxErrorException
*/
public String qrCodePictureUrl(String ticket, boolean needShortUrl) throws WxErrorException;
/**
@@ -560,8 +489,6 @@ public interface WxMpService {
* 详情请见: <a href="http://mp.weixin.qq.com/wiki/18/167e7d94df85d8389df6c94a7a8f78ba.html">生成带参数的二维码</a>
* </pre>
* @param ticket 二维码ticket
* @return
* @throws WxErrorException
*/
public String qrCodePictureUrl(String ticket) throws WxErrorException;

@@ -571,8 +498,6 @@ public interface WxMpService {
* 详情请见: http://mp.weixin.qq.com/wiki/index.php?title=长链接转短链接接口
* </pre>
* @param long_url
* @return
* @throws WxErrorException
*/
public String shortUrl(String long_url) throws WxErrorException;

@@ -592,9 +517,6 @@ public interface WxMpService {
* 语义查询接口
* 详情请见:http://mp.weixin.qq.com/wiki/index.php?title=语义理解
* </pre>
* @param semanticQuery
* @return
* @throws WxErrorException
*/
WxMpSemanticQueryResult semanticQuery(WxMpSemanticQuery semanticQuery) throws WxErrorException;

@@ -621,13 +543,12 @@ public interface WxMpService {
* @return url
*/
public String oauth2buildAuthorizationUrl(String redirectURI, String scope, String state);

/**
* <pre>
* 用code换取oauth2的access token
* 详情请见: http://mp.weixin.qq.com/wiki/index.php?title=网页授权获取用户基本信息
* </pre>
* @param code
* @return
*/
public WxMpOAuth2AccessToken oauth2getAccessToken(String code) throws WxErrorException;

@@ -635,8 +556,6 @@ public interface WxMpService {
* <pre>
* 刷新oauth2的access token
* </pre>
* @param refreshToken
* @return
*/
public WxMpOAuth2AccessToken oauth2refreshAccessToken(String refreshToken) throws WxErrorException;

@@ -663,8 +582,6 @@ public interface WxMpService {
* 获取微信服务器IP地址
* http://mp.weixin.qq.com/wiki/0/2ad4b6bfd29f30f71d39616c2a0fcedc.html
* </pre>
* @return
* @throws WxErrorException
*/
String[] getCallbackIP() throws WxErrorException;

@@ -675,8 +592,6 @@ public interface WxMpService {
* </pre>
* @param beginDate 最大时间跨度7天
* @param endDate endDate不能早于begingDate
* @return
* @throws WxErrorException
*/
List<WxMpUserSummary> getUserSummary(Date beginDate, Date endDate) throws WxErrorException;

@@ -687,26 +602,16 @@ public interface WxMpService {
* </pre>
* @param beginDate 最大时间跨度7天
* @param endDate endDate不能早于begingDate
* @return
* @throws WxErrorException
*/
List<WxMpUserCumulate> getUserCumulate(Date beginDate, Date endDate) throws WxErrorException;

/**
* 当本Service没有实现某个API的时候,可以用这个,针对所有微信API中的GET请求
* @param url
* @param queryParam
* @return
* @throws WxErrorException
*/
String get(String url, String queryParam) throws WxErrorException;

/**
* 当本Service没有实现某个API的时候,可以用这个,针对所有微信API中的POST请求
* @param url
* @param postData
* @return
* @throws WxErrorException
*/
String post(String url, String postData) throws WxErrorException;

@@ -716,19 +621,11 @@ public interface WxMpService {
* 比{@link #get}和{@link #post}方法更灵活,可以自己构造RequestExecutor用来处理不同的参数和不同的返回类型。
* 可以参考,{@link me.chanjar.weixin.common.util.http.MediaUploadRequestExecutor}的实现方法
* </pre>
* @param executor
* @param uri
* @param data
* @param <T>
* @param <E>
* @return
* @throws WxErrorException
*/
public <T, E> T execute(RequestExecutor<T, E> executor, String uri, E data) throws WxErrorException;

/**
* 注入 {@link WxMpConfigStorage} 的实现
* @param wxConfigProvider
*/
public void setWxMpConfigStorage(WxMpConfigStorage wxConfigProvider);

@@ -737,7 +634,6 @@ public interface WxMpService {
* 设置当微信系统响应系统繁忙时,要等待多少 retrySleepMillis(ms) * 2^(重试次数 - 1) 再发起重试
* 默认:1000ms
* </pre>
* @param retrySleepMillis
*/
void setRetrySleepMillis(int retrySleepMillis);

@@ -746,7 +642,6 @@ public interface WxMpService {
* 设置当微信系统响应系统繁忙时,最大重试次数
* 默认:5次
* </pre>
* @param maxRetryTimes
*/
void setMaxRetryTimes(int maxRetryTimes);

@@ -760,7 +655,6 @@ public interface WxMpService {
* @param tradeType 交易类型 JSAPI,NATIVE,APP,WAP
* @param ip 发起支付的客户端IP
* @param notifyUrl 通知地址
* @return
* @deprecated Use me.chanjar.weixin.mp.api.WxMpService.getPrepayId(Map<String, String>) instead
*/
@Deprecated
@@ -772,7 +666,6 @@ public interface WxMpService {
*
* @param parameters
* All required/optional parameters for weixin payment
* @return
* @throws IllegalArgumentException
*/
WxMpPrepayIdResult getPrepayId(Map<String, String> parameters);
@@ -782,8 +675,6 @@ public interface WxMpService {
* 详见http://mp.weixin.qq.com/wiki/7/aaa137b55fb2e0456bf8dd9148dd613f.html#.E5.8F.91.E8.B5.B7.E4.B8.80.E4.B8.AA.E5.BE.AE.E4.BF.A1.E6.94.AF.E4.BB.98.E8.AF.B7.E6.B1.82
* @param parameters
* the required or optional parameters
* @return
* @throws WxErrorException
*/
Map<String, String> getPayInfo(Map<String, String> parameters) throws WxErrorException;
@@ -797,8 +688,6 @@ public interface WxMpService {
* @param body 商品描述
* @param ip 发起支付的客户端IP
* @param notifyUrl 通知地址
* @return
* @throws WxErrorException
* @deprecated Use me.chanjar.weixin.mp.api.WxMpService.getPayInfo(Map<String, String>) instead
*/
@Deprecated
@@ -814,8 +703,6 @@ public interface WxMpService {
* @param body 商品描述
* @param ip 发起支付的客户端IP
* @param notifyUrl 通知地址
* @return
* @throws WxErrorException
* @deprecated Use me.chanjar.weixin.mp.api.WxMpService.getPayInfo(Map<String, String>) instead
*/
@Deprecated
@@ -833,7 +720,6 @@ public interface WxMpService {
* 读取支付结果通知
* 详见http://pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=9_7
* @param xmlData
* @return
*/
WxMpPayCallback getJSSDKCallbackData(String xmlData);

@@ -858,7 +744,6 @@ public interface WxMpService {
* </pre>
* @param kvm
* @param signature
* @return
*/
public boolean checkJSSDKCallbackDataSignature(Map<String, String> kvm, String signature);

@@ -882,8 +767,6 @@ public interface WxMpService {
* <partnerKey></partnerKey>商户平台设置的API密钥
*
* @param parameters
* @return
* @throws WxErrorException
*/
public WxRedpackResult sendRedpack(Map<String, String> parameters) throws WxErrorException;



+ 0
- 5
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpCustomMessage.java View File

@@ -140,7 +140,6 @@ public class WxMpCustomMessage implements Serializable {
/**
* 获得文本消息builder
* @return
*/
public static TextBuilder TEXT() {
return new TextBuilder();
@@ -148,7 +147,6 @@ public class WxMpCustomMessage implements Serializable {

/**
* 获得图片消息builder
* @return
*/
public static ImageBuilder IMAGE() {
return new ImageBuilder();
@@ -164,7 +162,6 @@ public class WxMpCustomMessage implements Serializable {
/**
* 获得视频消息builder
* @return
*/
public static VideoBuilder VIDEO() {
return new VideoBuilder();
@@ -172,7 +169,6 @@ public class WxMpCustomMessage implements Serializable {
/**
* 获得音乐消息builder
* @return
*/
public static MusicBuilder MUSIC() {
return new MusicBuilder();
@@ -180,7 +176,6 @@ public class WxMpCustomMessage implements Serializable {
/**
* 获得图文消息builder
* @return
*/
public static NewsBuilder NEWS() {
return new NewsBuilder();


+ 6
- 6
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpMassOpenIdsMessage.java View File

@@ -12,8 +12,9 @@ import java.util.List;
* @author chanjarster
*/
public class WxMpMassOpenIdsMessage implements Serializable {
private static final long serialVersionUID = -8022910911104788999L;
private List<String> toUsers = new ArrayList<String>();
private List<String> toUsers = new ArrayList<>();
private String msgType;
private String content;
private String mediaId;
@@ -23,7 +24,7 @@ public class WxMpMassOpenIdsMessage implements Serializable {
}
public String getMsgType() {
return msgType;
return this.msgType;
}

/**
@@ -43,7 +44,7 @@ public class WxMpMassOpenIdsMessage implements Serializable {
}

public String getContent() {
return content;
return this.content;
}

public void setContent(String content) {
@@ -51,7 +52,7 @@ public class WxMpMassOpenIdsMessage implements Serializable {
}

public String getMediaId() {
return mediaId;
return this.mediaId;
}

public void setMediaId(String mediaId) {
@@ -64,10 +65,9 @@ public class WxMpMassOpenIdsMessage implements Serializable {

/**
* OpenId列表,最多支持10,000个
* @return
*/
public List<String> getToUsers() {
return toUsers;
return this.toUsers;
}

/**


+ 0
- 4
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpXmlMessage.java View File

@@ -237,7 +237,6 @@ public class WxMpXmlMessage implements Serializable {
* {@link me.chanjar.weixin.common.api.WxConsts#XML_MSG_EVENT}
* </pre>
*
* @return
*/
public String getMsgType() {
return this.msgType;
@@ -444,7 +443,6 @@ public class WxMpXmlMessage implements Serializable {
* @param timestamp
* @param nonce
* @param msgSignature
* @return
*/
public static WxMpXmlMessage fromEncryptedXml(String encryptedXml,
WxMpConfigStorage wxMpConfigStorage, String timestamp, String nonce,
@@ -620,7 +618,6 @@ public class WxMpXmlMessage implements Serializable {

/**
* 扫描类型,一般是qrcode
* @return
*/
public String getScanType() {

@@ -633,7 +630,6 @@ public class WxMpXmlMessage implements Serializable {

/**
* 扫描结果,即二维码对应的字符串信息
* @return
*/
public String getScanResult() {
return this.scanResult;


+ 0
- 8
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpXmlOutMessage.java View File

@@ -68,7 +68,6 @@ public abstract class WxMpXmlOutMessage implements Serializable {

/**
* 转换成加密的xml格式
* @return
*/
public String toEncryptedXml(WxMpConfigStorage wxMpConfigStorage) {
String plainXml = toXml();
@@ -78,7 +77,6 @@ public abstract class WxMpXmlOutMessage implements Serializable {

/**
* 获得文本消息builder
* @return
*/
public static TextBuilder TEXT() {
return new TextBuilder();
@@ -86,7 +84,6 @@ public abstract class WxMpXmlOutMessage implements Serializable {

/**
* 获得图片消息builder
* @return
*/
public static ImageBuilder IMAGE() {
return new ImageBuilder();
@@ -94,7 +91,6 @@ public abstract class WxMpXmlOutMessage implements Serializable {

/**
* 获得语音消息builder
* @return
*/
public static VoiceBuilder VOICE() {
return new VoiceBuilder();
@@ -102,7 +98,6 @@ public abstract class WxMpXmlOutMessage implements Serializable {
/**
* 获得视频消息builder
* @return
*/
public static VideoBuilder VIDEO() {
return new VideoBuilder();
@@ -110,7 +105,6 @@ public abstract class WxMpXmlOutMessage implements Serializable {
/**
* 获得音乐消息builder
* @return
*/
public static MusicBuilder MUSIC() {
return new MusicBuilder();
@@ -118,7 +112,6 @@ public abstract class WxMpXmlOutMessage implements Serializable {
/**
* 获得图文消息builder
* @return
*/
public static NewsBuilder NEWS() {
return new NewsBuilder();
@@ -126,7 +119,6 @@ public abstract class WxMpXmlOutMessage implements Serializable {
/**
* 获得客服消息builder
* @return
*/
public static TransferCustomerServiceBuilder TRANSFER_CUSTOMER_SERVICE() {
return new TransferCustomerServiceBuilder();


+ 0
- 1
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/kefu/result/WxMpKfInfo.java View File

@@ -55,7 +55,6 @@ public class WxMpKfInfo implements Serializable {

/**
* accepted_case 客服当前正在接待的会话数
* @return
*/
@Expose
@SerializedName("accepted_case")


Loading…
Cancel
Save