diff --git a/CHANGE.md b/CHANGE.md index c8374def..c7fac4f6 100644 --- a/CHANGE.md +++ b/CHANGE.md @@ -491,4 +491,8 @@ + weixin4j-[mp|qy]:version upgrade to 1.6.3 - + weixin4j-server:version upgrade to 1.1.3 \ No newline at end of file + + weixin4j-server:version upgrade to 1.1.3 + +* 2015-11-20 + + + weixin4j-qy:新增客服消息 \ No newline at end of file diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/weixin/error.xml b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/weixin/error.xml index 397bb7e4..b6111df5 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/weixin/error.xml +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/weixin/error.xml @@ -638,6 +638,10 @@ too many group now, no need to add new 组数量过多 + + 45022 + 应用名字长度不合法,合法长度为2-16个字 + 45024 账号数量超过上限 @@ -1058,6 +1062,70 @@ 86222 不允许消息服务访问的API + + 86304 + 不合法的消息类型 + + + 86305 + 客服服务未启用 + + + 86306 + 缺少发送人 + + + 86307 + 缺少发送人类型 + + + 86308 + 缺少发送人id + + + 86309 + 缺少接收人 + + + 86310 + 缺少接收人类型 + + + 86311 + 缺少接收人id + + + 86312 + 缺少消息类型 + + + 86313 + 缺少客服,发送人或接收人类型,必须有一个为kf + + + 86314 + 客服不唯一,发送人或接收人类型,必须只有一个为kf + + + 86315 + 不合法的发送人类型 + + + 86316 + 不合法的发送人id。Userid不存在、openid不存在、kf不存在 + + + 86317 + 不合法的接收人类型 + + + 86318 + 不合法的接收人id。Userid不存在、openid不存在、kf不存在 + + + 86319 + 不合法的客服,kf不在客服列表中 + 90001 未开通摇一摇周边 diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/Order.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/Order.java index c51729e1..e88ad51a 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/Order.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/Order.java @@ -34,7 +34,7 @@ public class Order extends ApiResult { /** * 交易状态 * - * @see com.foxinmy.weixin4j.mp.type.TradeState + * @see com.foxinmy.weixin4j.type.TradeState */ @XmlElement(name = "trade_state") @JSONField(name = "trade_state") @@ -54,7 +54,7 @@ public class Order extends ApiResult { /** * 交易类型 * - * @see com.foxinmy.weixin4j.mp.type.TradeType + * @see com.foxinmy.weixin4j.type.TradeType */ @XmlElement(name = "trade_type") @JSONField(name = "trade_type") diff --git a/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/MenuTest.java b/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/MenuTest.java index 7635dc08..9ea35ba9 100644 --- a/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/MenuTest.java +++ b/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/MenuTest.java @@ -34,20 +34,12 @@ public class MenuTest extends TokenTest { @Test public void create() throws WeixinException { btnList = new ArrayList