diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/api/README.md b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/api/README.md index 5da8af2f..0c579159 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/api/README.md +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/api/README.md @@ -2,4 +2,6 @@ * CouponApi `优惠券API` -* PayApi `微信支付API` \ No newline at end of file +* PayApi `微信支付API` + +* CustomsApi `报关接口` \ No newline at end of file diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/model/Button.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/model/Button.java index 53081055..a3549f1c 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/model/Button.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/model/Button.java @@ -2,6 +2,7 @@ package com.foxinmy.weixin4j.model; import java.io.Serializable; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import com.alibaba.fastjson.annotation.JSONField; @@ -61,7 +62,20 @@ public class Button implements Serializable { } /** - * 创建一个菜单 + * 创建一个菜单(一级菜单) + * + * @param name + * 菜单显示的名称 + * @param subButtons + * 二级菜单 + */ + public Button(String name, Button... subButtons) { + this.name = name; + this.subs = Arrays.asList(subButtons); + } + + /** + * 创建一个菜单(二级菜单) * * @param name * 菜单显示的名称 diff --git a/weixin4j-base/src/test/java/com/foxinmy/weixin4j/base/test/PayTest.java b/weixin4j-base/src/test/java/com/foxinmy/weixin4j/base/test/PayTest.java index 0b5db16a..c420f56e 100644 --- a/weixin4j-base/src/test/java/com/foxinmy/weixin4j/base/test/PayTest.java +++ b/weixin4j-base/src/test/java/com/foxinmy/weixin4j/base/test/PayTest.java @@ -42,7 +42,7 @@ public class PayTest { protected final static WeixinPayProxy PAY; static { - ACCOUNT = new WeixinPayAccount("wx4ab8f8de58159a57", "GATFzDwbQdbbci3QEQxX2rUBvwTrsMiZ", "1290664601"); + ACCOUNT = new WeixinPayAccount("appid", "paysignkey", "mchid"); SIGNATURE = new WeixinPaymentSignature(ACCOUNT.getPaySignKey()); PAY = new WeixinPayProxy(new Weixin4jSettings(ACCOUNT)); } diff --git a/weixin4j-example/src/main/java/com/foximy/weixin4j/example/server/handler/HelloMessageHandler.java b/weixin4j-example/src/main/java/com/foximy/weixin4j/example/server/handler/HelloMessageHandler.java index 9a753f67..7ffd080e 100644 --- a/weixin4j-example/src/main/java/com/foximy/weixin4j/example/server/handler/HelloMessageHandler.java +++ b/weixin4j-example/src/main/java/com/foximy/weixin4j/example/server/handler/HelloMessageHandler.java @@ -1,5 +1,7 @@ package com.foximy.weixin4j.example.server.handler; +import org.springframework.stereotype.Component; + import com.foxinmy.weixin4j.exception.WeixinException; import com.foxinmy.weixin4j.handler.MessageHandlerAdapter; import com.foxinmy.weixin4j.message.TextMessage; @@ -16,6 +18,7 @@ import com.foxinmy.weixin4j.response.WeixinResponse; * @since JDK 1.7 * @see */ +@Component public class HelloMessageHandler extends MessageHandlerAdapter { @Override public boolean canHandle0(WeixinRequest request, TextMessage message) diff --git a/weixin4j-example/src/main/java/com/foximy/weixin4j/example/server/handler/SubscribeMessageHandler.java b/weixin4j-example/src/main/java/com/foximy/weixin4j/example/server/handler/SubscribeMessageHandler.java index e1e5e501..bd3b2411 100644 --- a/weixin4j-example/src/main/java/com/foximy/weixin4j/example/server/handler/SubscribeMessageHandler.java +++ b/weixin4j-example/src/main/java/com/foximy/weixin4j/example/server/handler/SubscribeMessageHandler.java @@ -1,5 +1,7 @@ package com.foximy.weixin4j.example.server.handler; +import org.springframework.stereotype.Component; + import com.foxinmy.weixin4j.exception.WeixinException; import com.foxinmy.weixin4j.handler.MessageHandlerAdapter; import com.foxinmy.weixin4j.mp.event.ScribeEventMessage; @@ -16,6 +18,7 @@ import com.foxinmy.weixin4j.response.WeixinResponse; * @since JDK 1.7 * @see */ +@Component public class SubscribeMessageHandler extends MessageHandlerAdapter { diff --git a/weixin4j-example/src/main/java/com/foximy/weixin4j/example/server/handler/TextMessageHandler.java b/weixin4j-example/src/main/java/com/foximy/weixin4j/example/server/handler/TextMessageHandler.java index c2479610..6b435f00 100644 --- a/weixin4j-example/src/main/java/com/foximy/weixin4j/example/server/handler/TextMessageHandler.java +++ b/weixin4j-example/src/main/java/com/foximy/weixin4j/example/server/handler/TextMessageHandler.java @@ -1,5 +1,7 @@ package com.foximy.weixin4j.example.server.handler; +import org.springframework.stereotype.Component; + import com.foxinmy.weixin4j.exception.WeixinException; import com.foxinmy.weixin4j.handler.MessageHandlerAdapter; import com.foxinmy.weixin4j.message.TextMessage; @@ -16,6 +18,7 @@ import com.foxinmy.weixin4j.response.WeixinResponse; * @since JDK 1.7 * @see */ +@Component public class TextMessageHandler extends MessageHandlerAdapter { @Override diff --git a/weixin4j-example/src/main/java/com/foximy/weixin4j/example/server/handler/VoiceMessageHandler.java b/weixin4j-example/src/main/java/com/foximy/weixin4j/example/server/handler/VoiceMessageHandler.java index b6888a04..59707431 100644 --- a/weixin4j-example/src/main/java/com/foximy/weixin4j/example/server/handler/VoiceMessageHandler.java +++ b/weixin4j-example/src/main/java/com/foximy/weixin4j/example/server/handler/VoiceMessageHandler.java @@ -1,5 +1,7 @@ package com.foximy.weixin4j.example.server.handler; +import org.springframework.stereotype.Component; + import com.foxinmy.weixin4j.exception.WeixinException; import com.foxinmy.weixin4j.handler.MessageHandlerAdapter; import com.foxinmy.weixin4j.message.VoiceMessage; @@ -16,6 +18,7 @@ import com.foxinmy.weixin4j.response.WeixinResponse; * @since JDK 1.7 * @see */ +@Component public class VoiceMessageHandler extends MessageHandlerAdapter { @Override diff --git a/weixin4j-example/src/main/resources/spring-bean.xml b/weixin4j-example/src/main/resources/spring-bean.xml index 9a0a5f98..65f8d54f 100644 --- a/weixin4j-example/src/main/resources/spring-bean.xml +++ b/weixin4j-example/src/main/resources/spring-bean.xml @@ -1,12 +1,9 @@ @@ -99,4 +96,8 @@ value="com.foximy.weixin4j.example.server.handler" /> + + + + \ No newline at end of file