重构bean和builder的包结构

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMessageHandler.java

@@ -2,8 +2,8 @@ package me.chanjar.weixin.mp.api;
 
 import me.chanjar.weixin.common.exception.WxErrorException;
 import me.chanjar.weixin.common.session.WxSessionManager;
-import me.chanjar.weixin.mp.bean.WxMpXmlMessage;
-import me.chanjar.weixin.mp.bean.WxMpXmlOutMessage;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage;
 
 import java.util.Map;
 

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMessageInterceptor.java

@@ -2,7 +2,7 @@ package me.chanjar.weixin.mp.api;
 
 import me.chanjar.weixin.common.exception.WxErrorException;
 import me.chanjar.weixin.common.session.WxSessionManager;
-import me.chanjar.weixin.mp.bean.WxMpXmlMessage;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage;
 
 import java.util.Map;
 

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMessageMatcher.java

@@ -1,6 +1,6 @@
 package me.chanjar.weixin.mp.api;
 
-import me.chanjar.weixin.mp.bean.WxMpXmlMessage;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage;
 
 /**
  * 消息匹配器，用在消息路由的时候

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMessageRouter.java

@@ -1,230 +1,230 @@
-package me.chanjar.weixin.mp.api;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import me.chanjar.weixin.common.api.WxErrorExceptionHandler;
-import me.chanjar.weixin.common.api.WxMessageDuplicateChecker;
-import me.chanjar.weixin.common.api.WxMessageInMemoryDuplicateChecker;
-import me.chanjar.weixin.common.session.InternalSession;
-import me.chanjar.weixin.common.session.InternalSessionManager;
-import me.chanjar.weixin.common.session.StandardSessionManager;
-import me.chanjar.weixin.common.session.WxSessionManager;
-import me.chanjar.weixin.common.util.LogExceptionHandler;
-import me.chanjar.weixin.mp.bean.WxMpXmlMessage;
-import me.chanjar.weixin.mp.bean.WxMpXmlOutMessage;
-
-/**
- * <pre>
- * 微信消息路由器，通过代码化的配置，把来自微信的消息交给handler处理
- * 
- * 说明：
- * 1. 配置路由规则时要按照从细到粗的原则，否则可能消息可能会被提前处理
- * 2. 默认情况下消息只会被处理一次，除非使用 {@link WxMpMessageRouterRule#next()}
- * 3. 规则的结束必须用{@link WxMpMessageRouterRule#end()}或者{@link WxMpMessageRouterRule#next()}，否则不会生效
- * 
- * 使用方法：
- * WxMpMessageRouter router = new WxMpMessageRouter();
- * router
- *   .rule()
- *       .msgType("MSG_TYPE").event("EVENT").eventKey("EVENT_KEY").content("CONTENT")
- *       .interceptor(interceptor, ...).handler(handler, ...)
- *   .end()
- *   .rule()
- *       // 另外一个匹配规则
- *   .end()
- * ;
- * 
- * // 将WxXmlMessage交给消息路由器
- * router.route(message);
- * 
- * </pre>
- * @author Daniel Qian
- *
- */
-public class WxMpMessageRouter {
-
-  protected final Logger log = LoggerFactory.getLogger(WxMpMessageRouter.class);
-
-  private static final int DEFAULT_THREAD_POOL_SIZE = 100;
-
-  private final List<WxMpMessageRouterRule> rules = new ArrayList<>();
-
-  private final WxMpService wxMpService;
-
-  private ExecutorService executorService;
-
-  private WxMessageDuplicateChecker messageDuplicateChecker;
-
-  private WxSessionManager sessionManager;
-
-  private WxErrorExceptionHandler exceptionHandler;
-
-  public WxMpMessageRouter(WxMpService wxMpService) {
-    this.wxMpService = wxMpService;
-    this.executorService = Executors.newFixedThreadPool(DEFAULT_THREAD_POOL_SIZE);
-    this.messageDuplicateChecker = new WxMessageInMemoryDuplicateChecker();
-    this.sessionManager = new StandardSessionManager();
-    this.exceptionHandler = new LogExceptionHandler();
-  }
-
-  /**
-   * <pre>
-   * 设置自定义的 {@link ExecutorService}
-   * 如果不调用该方法，默认使用 Executors.newFixedThreadPool(100)
-   * </pre>
-   * @param executorService
-   */
-  public void setExecutorService(ExecutorService executorService) {
-    this.executorService = executorService;
-  }
-
-  /**
-   * <pre>
-   * 设置自定义的 {@link me.chanjar.weixin.common.api.WxMessageDuplicateChecker}
-   * 如果不调用该方法，默认使用 {@link me.chanjar.weixin.common.api.WxMessageInMemoryDuplicateChecker}
-   * </pre>
-   * @param messageDuplicateChecker
-   */
-  public void setMessageDuplicateChecker(WxMessageDuplicateChecker messageDuplicateChecker) {
-    this.messageDuplicateChecker = messageDuplicateChecker;
-  }
-
-  /**
-   * <pre>
-   * 设置自定义的{@link me.chanjar.weixin.common.session.WxSessionManager}
-   * 如果不调用该方法，默认使用 {@link me.chanjar.weixin.common.session.StandardSessionManager}
-   * </pre>
-   * @param sessionManager
-   */
-  public void setSessionManager(WxSessionManager sessionManager) {
-    this.sessionManager = sessionManager;
-  }
-
-  /**
-   * <pre>
-   * 设置自定义的{@link me.chanjar.weixin.common.api.WxErrorExceptionHandler}
-   * 如果不调用该方法，默认使用 {@link me.chanjar.weixin.common.util.LogExceptionHandler}
-   * </pre>
-   * @param exceptionHandler
-   */
-  public void setExceptionHandler(WxErrorExceptionHandler exceptionHandler) {
-    this.exceptionHandler = exceptionHandler;
-  }
-
-  List<WxMpMessageRouterRule> getRules() {
-    return this.rules;
-  }
-
-  /**
-   * 开始一个新的Route规则
-   */
-  public WxMpMessageRouterRule rule() {
-    return new WxMpMessageRouterRule(this);
-  }
-
-  /**
-   * 处理微信消息
-   * @param wxMessage
-   */
-  public WxMpXmlOutMessage route(final WxMpXmlMessage wxMessage) {
-    if (isDuplicateMessage(wxMessage)) {
-      // 如果是重复消息，那么就不做处理
-      return null;
-    }
-
-    final List<WxMpMessageRouterRule> matchRules = new ArrayList<>();
-    // 收集匹配的规则
-    for (final WxMpMessageRouterRule rule : this.rules) {
-      if (rule.test(wxMessage)) {
-        matchRules.add(rule);
-        if(!rule.isReEnter()) {
-          break;
-        }
-      }
-    }
-
-    if (matchRules.size() == 0) {
-      return null;
-    }
-
-    WxMpXmlOutMessage res = null;
-    final List<Future<?>> futures = new ArrayList<>();
-    for (final WxMpMessageRouterRule rule : matchRules) {
-      // 返回最后一个非异步的rule的执行结果
-      if(rule.isAsync()) {
-        futures.add(
-            this.executorService.submit(new Runnable() {
-              @Override
-              public void run() {
-                rule.service(wxMessage, WxMpMessageRouter.this.wxMpService, WxMpMessageRouter.this.sessionManager, WxMpMessageRouter.this.exceptionHandler);
-              }
-            })
-        );
-      } else {
-        res = rule.service(wxMessage, this.wxMpService, this.sessionManager, this.exceptionHandler);
-        // 在同步操作结束，session访问结束
-        this.log.debug("End session access: async=false, sessionId={}", wxMessage.getFromUser());
-        sessionEndAccess(wxMessage);
-      }
-    }
-
-    if (futures.size() > 0) {
-      this.executorService.submit(new Runnable() {
-        @Override
-        public void run() {
-          for (Future<?> future : futures) {
-            try {
-              future.get();
-              WxMpMessageRouter.this.log.debug("End session access: async=true, sessionId={}", wxMessage.getFromUser());
-              // 异步操作结束，session访问结束
-              sessionEndAccess(wxMessage);
-            } catch (InterruptedException e) {
-              WxMpMessageRouter.this.log.error("Error happened when wait task finish", e);
-            } catch (ExecutionException e) {
-              WxMpMessageRouter.this.log.error("Error happened when wait task finish", e);
-            }
-          }
-        }
-      });
-    }
-    return res;
-  }
-
-  protected boolean isDuplicateMessage(WxMpXmlMessage wxMessage) {
-
-    StringBuffer messageId = new StringBuffer();
-    if (wxMessage.getMsgId() == null) {
-      messageId.append(wxMessage.getCreateTime())
-        .append("-").append(wxMessage.getFromUser())
-        .append("-").append(wxMessage.getEventKey() == null ? "" : wxMessage.getEventKey())
-        .append("-").append(wxMessage.getEvent() == null ? "" : wxMessage.getEvent())
-      ;
-    } else {
-      messageId.append(wxMessage.getMsgId());
-    }
-
-    return this.messageDuplicateChecker.isDuplicate(messageId.toString());
-
-  }
-
-  /**
-   * 对session的访问结束
-   * @param wxMessage
-   */
-  protected void sessionEndAccess(WxMpXmlMessage wxMessage) {
-
-    InternalSession session = ((InternalSessionManager)this.sessionManager).findSession(wxMessage.getFromUser());
-    if (session != null) {
-      session.endAccess();
-    }
-
-  }
-}
+package me.chanjar.weixin.mp.api;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import me.chanjar.weixin.common.api.WxErrorExceptionHandler;
+import me.chanjar.weixin.common.api.WxMessageDuplicateChecker;
+import me.chanjar.weixin.common.api.WxMessageInMemoryDuplicateChecker;
+import me.chanjar.weixin.common.session.InternalSession;
+import me.chanjar.weixin.common.session.InternalSessionManager;
+import me.chanjar.weixin.common.session.StandardSessionManager;
+import me.chanjar.weixin.common.session.WxSessionManager;
+import me.chanjar.weixin.common.util.LogExceptionHandler;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage;
+
+/**
+ * <pre>
+ * 微信消息路由器，通过代码化的配置，把来自微信的消息交给handler处理
+ *
+ * 说明：
+ * 1. 配置路由规则时要按照从细到粗的原则，否则可能消息可能会被提前处理
+ * 2. 默认情况下消息只会被处理一次，除非使用 {@link WxMpMessageRouterRule#next()}
+ * 3. 规则的结束必须用{@link WxMpMessageRouterRule#end()}或者{@link WxMpMessageRouterRule#next()}，否则不会生效
+ *
+ * 使用方法：
+ * WxMpMessageRouter router = new WxMpMessageRouter();
+ * router
+ *   .rule()
+ *       .msgType("MSG_TYPE").event("EVENT").eventKey("EVENT_KEY").content("CONTENT")
+ *       .interceptor(interceptor, ...).handler(handler, ...)
+ *   .end()
+ *   .rule()
+ *       // 另外一个匹配规则
+ *   .end()
+ * ;
+ *
+ * // 将WxXmlMessage交给消息路由器
+ * router.route(message);
+ *
+ * </pre>
+ * @author Daniel Qian
+ *
+ */
+public class WxMpMessageRouter {
+
+  protected final Logger log = LoggerFactory.getLogger(WxMpMessageRouter.class);
+
+  private static final int DEFAULT_THREAD_POOL_SIZE = 100;
+
+  private final List<WxMpMessageRouterRule> rules = new ArrayList<>();
+
+  private final WxMpService wxMpService;
+
+  private ExecutorService executorService;
+
+  private WxMessageDuplicateChecker messageDuplicateChecker;
+
+  private WxSessionManager sessionManager;
+
+  private WxErrorExceptionHandler exceptionHandler;
+
+  public WxMpMessageRouter(WxMpService wxMpService) {
+    this.wxMpService = wxMpService;
+    this.executorService = Executors.newFixedThreadPool(DEFAULT_THREAD_POOL_SIZE);
+    this.messageDuplicateChecker = new WxMessageInMemoryDuplicateChecker();
+    this.sessionManager = new StandardSessionManager();
+    this.exceptionHandler = new LogExceptionHandler();
+  }
+
+  /**
+   * <pre>
+   * 设置自定义的 {@link ExecutorService}
+   * 如果不调用该方法，默认使用 Executors.newFixedThreadPool(100)
+   * </pre>
+   * @param executorService
+   */
+  public void setExecutorService(ExecutorService executorService) {
+    this.executorService = executorService;
+  }
+
+  /**
+   * <pre>
+   * 设置自定义的 {@link me.chanjar.weixin.common.api.WxMessageDuplicateChecker}
+   * 如果不调用该方法，默认使用 {@link me.chanjar.weixin.common.api.WxMessageInMemoryDuplicateChecker}
+   * </pre>
+   * @param messageDuplicateChecker
+   */
+  public void setMessageDuplicateChecker(WxMessageDuplicateChecker messageDuplicateChecker) {
+    this.messageDuplicateChecker = messageDuplicateChecker;
+  }
+
+  /**
+   * <pre>
+   * 设置自定义的{@link me.chanjar.weixin.common.session.WxSessionManager}
+   * 如果不调用该方法，默认使用 {@link me.chanjar.weixin.common.session.StandardSessionManager}
+   * </pre>
+   * @param sessionManager
+   */
+  public void setSessionManager(WxSessionManager sessionManager) {
+    this.sessionManager = sessionManager;
+  }
+
+  /**
+   * <pre>
+   * 设置自定义的{@link me.chanjar.weixin.common.api.WxErrorExceptionHandler}
+   * 如果不调用该方法，默认使用 {@link me.chanjar.weixin.common.util.LogExceptionHandler}
+   * </pre>
+   * @param exceptionHandler
+   */
+  public void setExceptionHandler(WxErrorExceptionHandler exceptionHandler) {
+    this.exceptionHandler = exceptionHandler;
+  }
+
+  List<WxMpMessageRouterRule> getRules() {
+    return this.rules;
+  }
+
+  /**
+   * 开始一个新的Route规则
+   */
+  public WxMpMessageRouterRule rule() {
+    return new WxMpMessageRouterRule(this);
+  }
+
+  /**
+   * 处理微信消息
+   * @param wxMessage
+   */
+  public WxMpXmlOutMessage route(final WxMpXmlMessage wxMessage) {
+    if (isDuplicateMessage(wxMessage)) {
+      // 如果是重复消息，那么就不做处理
+      return null;
+    }
+
+    final List<WxMpMessageRouterRule> matchRules = new ArrayList<>();
+    // 收集匹配的规则
+    for (final WxMpMessageRouterRule rule : this.rules) {
+      if (rule.test(wxMessage)) {
+        matchRules.add(rule);
+        if(!rule.isReEnter()) {
+          break;
+        }
+      }
+    }
+
+    if (matchRules.size() == 0) {
+      return null;
+    }
+
+    WxMpXmlOutMessage res = null;
+    final List<Future<?>> futures = new ArrayList<>();
+    for (final WxMpMessageRouterRule rule : matchRules) {
+      // 返回最后一个非异步的rule的执行结果
+      if(rule.isAsync()) {
+        futures.add(
+            this.executorService.submit(new Runnable() {
+              @Override
+              public void run() {
+                rule.service(wxMessage, WxMpMessageRouter.this.wxMpService, WxMpMessageRouter.this.sessionManager, WxMpMessageRouter.this.exceptionHandler);
+              }
+            })
+        );
+      } else {
+        res = rule.service(wxMessage, this.wxMpService, this.sessionManager, this.exceptionHandler);
+        // 在同步操作结束，session访问结束
+        this.log.debug("End session access: async=false, sessionId={}", wxMessage.getFromUser());
+        sessionEndAccess(wxMessage);
+      }
+    }
+
+    if (futures.size() > 0) {
+      this.executorService.submit(new Runnable() {
+        @Override
+        public void run() {
+          for (Future<?> future : futures) {
+            try {
+              future.get();
+              WxMpMessageRouter.this.log.debug("End session access: async=true, sessionId={}", wxMessage.getFromUser());
+              // 异步操作结束，session访问结束
+              sessionEndAccess(wxMessage);
+            } catch (InterruptedException e) {
+              WxMpMessageRouter.this.log.error("Error happened when wait task finish", e);
+            } catch (ExecutionException e) {
+              WxMpMessageRouter.this.log.error("Error happened when wait task finish", e);
+            }
+          }
+        }
+      });
+    }
+    return res;
+  }
+
+  protected boolean isDuplicateMessage(WxMpXmlMessage wxMessage) {
+
+    StringBuffer messageId = new StringBuffer();
+    if (wxMessage.getMsgId() == null) {
+      messageId.append(wxMessage.getCreateTime())
+        .append("-").append(wxMessage.getFromUser())
+        .append("-").append(wxMessage.getEventKey() == null ? "" : wxMessage.getEventKey())
+        .append("-").append(wxMessage.getEvent() == null ? "" : wxMessage.getEvent())
+      ;
+    } else {
+      messageId.append(wxMessage.getMsgId());
+    }
+
+    return this.messageDuplicateChecker.isDuplicate(messageId.toString());
+
+  }
+
+  /**
+   * 对session的访问结束
+   * @param wxMessage
+   */
+  protected void sessionEndAccess(WxMpXmlMessage wxMessage) {
+
+    InternalSession session = ((InternalSessionManager)this.sessionManager).findSession(wxMessage.getFromUser());
+    if (session != null) {
+      session.endAccess();
+    }
+
+  }
+}

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMessageRouterRule.java

@@ -3,8 +3,8 @@ package me.chanjar.weixin.mp.api;
 import me.chanjar.weixin.common.exception.WxErrorException;
 import me.chanjar.weixin.common.session.WxSessionManager;
 import me.chanjar.weixin.common.api.WxErrorExceptionHandler;
-import me.chanjar.weixin.mp.bean.WxMpXmlMessage;
-import me.chanjar.weixin.mp.bean.WxMpXmlOutMessage;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage;
 
 import java.util.ArrayList;
 import java.util.HashMap;

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/kefu/WxMpKefuMessage.java

@@ -4,14 +4,14 @@ import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
-import me.chanjar.weixin.mp.bean.custombuilder.ImageBuilder;
-import me.chanjar.weixin.mp.bean.custombuilder.MpNewsBuilder;
-import me.chanjar.weixin.mp.bean.custombuilder.MusicBuilder;
-import me.chanjar.weixin.mp.bean.custombuilder.NewsBuilder;
-import me.chanjar.weixin.mp.bean.custombuilder.TextBuilder;
-import me.chanjar.weixin.mp.bean.custombuilder.VideoBuilder;
-import me.chanjar.weixin.mp.bean.custombuilder.VoiceBuilder;
-import me.chanjar.weixin.mp.bean.custombuilder.WxCardBuilder;
+import me.chanjar.weixin.mp.builder.kefu.ImageBuilder;
+import me.chanjar.weixin.mp.builder.kefu.MpNewsBuilder;
+import me.chanjar.weixin.mp.builder.kefu.MusicBuilder;
+import me.chanjar.weixin.mp.builder.kefu.NewsBuilder;
+import me.chanjar.weixin.mp.builder.kefu.TextBuilder;
+import me.chanjar.weixin.mp.builder.kefu.VideoBuilder;
+import me.chanjar.weixin.mp.builder.kefu.VoiceBuilder;
+import me.chanjar.weixin.mp.builder.kefu.WxCardBuilder;
 import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
 
 /**

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlMessage.java

@@ -1,4 +1,14 @@
-package me.chanjar.weixin.mp.bean;
+package me.chanjar.weixin.mp.bean.message;
+
+import com.thoughtworks.xstream.annotations.XStreamAlias;
+import com.thoughtworks.xstream.annotations.XStreamConverter;
+import me.chanjar.weixin.common.util.xml.XStreamCDataConverter;
+import me.chanjar.weixin.mp.api.WxMpConfigStorage;
+import me.chanjar.weixin.mp.util.crypto.WxMpCryptUtil;
+import me.chanjar.weixin.mp.util.xml.XStreamTransformer;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -6,18 +16,6 @@ import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-import com.thoughtworks.xstream.annotations.XStreamAlias;
-import com.thoughtworks.xstream.annotations.XStreamConverter;
-
-import me.chanjar.weixin.common.util.xml.XStreamCDataConverter;
-import me.chanjar.weixin.mp.api.WxMpConfigStorage;
-import me.chanjar.weixin.mp.util.crypto.WxMpCryptUtil;
-import me.chanjar.weixin.mp.util.xml.XStreamTransformer;
-
 /**
  * <pre>
  * 微信推送过来的消息，xml格式

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlOutImageMessage.java

@@ -1,4 +1,4 @@
-package me.chanjar.weixin.mp.bean;
+package me.chanjar.weixin.mp.bean.message;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import com.thoughtworks.xstream.annotations.XStreamConverter;
@@ -9,7 +9,7 @@ import me.chanjar.weixin.common.util.xml.XStreamMediaIdConverter;
 public class WxMpXmlOutImageMessage extends WxMpXmlOutMessage {
 
   /**
-   * 
+   *
    */
   private static final long serialVersionUID = -2684778597067990723L;
   @XStreamAlias("Image")

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlOutMessage.java

@@ -1,10 +1,10 @@
-package me.chanjar.weixin.mp.bean;
+package me.chanjar.weixin.mp.bean.message;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import com.thoughtworks.xstream.annotations.XStreamConverter;
 import me.chanjar.weixin.common.util.xml.XStreamCDataConverter;
 import me.chanjar.weixin.mp.api.WxMpConfigStorage;
-import me.chanjar.weixin.mp.bean.outxmlbuilder.*;
+import me.chanjar.weixin.mp.builder.outxml.*;
 import me.chanjar.weixin.mp.util.crypto.WxMpCryptUtil;
 import me.chanjar.weixin.mp.util.xml.XStreamTransformer;
 
@@ -18,14 +18,14 @@ public abstract class WxMpXmlOutMessage implements Serializable {
   @XStreamAlias("ToUserName")
   @XStreamConverter(value=XStreamCDataConverter.class)
   protected String toUserName;
-  
+
   @XStreamAlias("FromUserName")
   @XStreamConverter(value=XStreamCDataConverter.class)
   protected String fromUserName;
-  
+
   @XStreamAlias("CreateTime")
   protected Long createTime;
-  
+
   @XStreamAlias("MsgType")
   @XStreamConverter(value=XStreamCDataConverter.class)
   protected String msgType;
@@ -61,7 +61,7 @@ public abstract class WxMpXmlOutMessage implements Serializable {
   public void setMsgType(String msgType) {
     this.msgType = msgType;
   }
-  
+
   public String toXml() {
     return XStreamTransformer.toXml((Class<WxMpXmlOutMessage>) this.getClass(), this);
   }
@@ -95,28 +95,28 @@ public abstract class WxMpXmlOutMessage implements Serializable {
   public static VoiceBuilder VOICE() {
     return new VoiceBuilder();
   }
-  
+
   /**
    * 获得视频消息builder
    */
   public static VideoBuilder VIDEO() {
     return new VideoBuilder();
   }
-  
+
   /**
    * 获得音乐消息builder
    */
   public static MusicBuilder MUSIC() {
     return new MusicBuilder();
   }
-  
+
   /**
    * 获得图文消息builder
    */
   public static NewsBuilder NEWS() {
     return new NewsBuilder();
   }
-  
+
   /**
    * 获得客服消息builder
    */

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlOutMusicMessage.java

@@ -1,4 +1,4 @@
-package me.chanjar.weixin.mp.bean;
+package me.chanjar.weixin.mp.bean.message;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import com.thoughtworks.xstream.annotations.XStreamConverter;
@@ -9,7 +9,7 @@ import me.chanjar.weixin.common.util.xml.XStreamCDataConverter;
 public class WxMpXmlOutMusicMessage extends WxMpXmlOutMessage {
 
   /**
-   * 
+   *
    */
   private static final long serialVersionUID = -4159937804975448945L;
   @XStreamAlias("Music")
@@ -34,7 +34,7 @@ public class WxMpXmlOutMusicMessage extends WxMpXmlOutMessage {
   public void setDescription(String description) {
     this.music.setDescription(description);
   }
-  
+
   public String getThumbMediaId() {
     return this.music.getThumbMediaId();
   }
@@ -58,10 +58,10 @@ public class WxMpXmlOutMusicMessage extends WxMpXmlOutMessage {
   public void setHqMusicUrl(String hqMusicUrl) {
     this.music.setHqMusicUrl(hqMusicUrl);
   }
-  
+
   @XStreamAlias("Music")
   public static class Music {
-    
+
     @XStreamAlias("Title")
     @XStreamConverter(value=XStreamCDataConverter.class)
     private String title;
@@ -73,15 +73,15 @@ public class WxMpXmlOutMusicMessage extends WxMpXmlOutMessage {
     @XStreamAlias("ThumbMediaId")
     @XStreamConverter(value=XStreamCDataConverter.class)
     private String thumbMediaId;
-    
+
     @XStreamAlias("MusicUrl")
     @XStreamConverter(value=XStreamCDataConverter.class)
     private String musicUrl;
-    
+
     @XStreamAlias("HQMusicUrl")
     @XStreamConverter(value=XStreamCDataConverter.class)
     private String hqMusicUrl;
-    
+
     public String getTitle() {
       return this.title;
     }
@@ -121,7 +121,7 @@ public class WxMpXmlOutMusicMessage extends WxMpXmlOutMessage {
     public void setHqMusicUrl(String hqMusicUrl) {
       this.hqMusicUrl = hqMusicUrl;
     }
-    
+
   }
 
 }

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlOutNewsMessage.java

@@ -1,4 +1,4 @@
-package me.chanjar.weixin.mp.bean;
+package me.chanjar.weixin.mp.bean.message;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import com.thoughtworks.xstream.annotations.XStreamConverter;
@@ -12,16 +12,16 @@ import java.util.List;
 public class WxMpXmlOutNewsMessage extends WxMpXmlOutMessage {
 
   /**
-   * 
+   *
    */
   private static final long serialVersionUID = -4604402850905714772L;
 
   @XStreamAlias("ArticleCount")
   protected int articleCount;
-  
+
   @XStreamAlias("Articles")
   protected final List<Item> articles = new ArrayList<>();
-  
+
   public WxMpXmlOutNewsMessage() {
     this.msgType = WxConsts.XML_MSG_NEWS;
   }
@@ -34,15 +34,15 @@ public class WxMpXmlOutNewsMessage extends WxMpXmlOutMessage {
     this.articles.add(item);
     this.articleCount = this.articles.size();
   }
-  
+
   public List<Item> getArticles() {
     return this.articles;
   }
-  
-  
+
+
   @XStreamAlias("item")
   public static class Item {
-    
+
     @XStreamAlias("Title")
     @XStreamConverter(value=XStreamCDataConverter.class)
     private String Title;
@@ -54,11 +54,11 @@ public class WxMpXmlOutNewsMessage extends WxMpXmlOutMessage {
     @XStreamAlias("PicUrl")
     @XStreamConverter(value=XStreamCDataConverter.class)
     private String PicUrl;
-    
+
     @XStreamAlias("Url")
     @XStreamConverter(value=XStreamCDataConverter.class)
     private String Url;
-    
+
     public String getTitle() {
       return this.Title;
     }

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlOutTextMessage.java

@@ -1,4 +1,4 @@
-package me.chanjar.weixin.mp.bean;
+package me.chanjar.weixin.mp.bean.message;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import com.thoughtworks.xstream.annotations.XStreamConverter;
@@ -7,9 +7,9 @@ import me.chanjar.weixin.common.util.xml.XStreamCDataConverter;
 
 @XStreamAlias("xml")
 public class WxMpXmlOutTextMessage extends WxMpXmlOutMessage {
-  
+
   /**
-   * 
+   *
    */
   private static final long serialVersionUID = -3972786455288763361L;
   @XStreamAlias("Content")
@@ -19,7 +19,7 @@ public class WxMpXmlOutTextMessage extends WxMpXmlOutMessage {
   public WxMpXmlOutTextMessage() {
     this.msgType = WxConsts.XML_MSG_TEXT;
   }
-  
+
   public String getContent() {
     return this.content;
   }
@@ -28,5 +28,5 @@ public class WxMpXmlOutTextMessage extends WxMpXmlOutMessage {
     this.content = content;
   }
 
-  
+
 }

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlOutTransferKefuMessage.java

@@ -1,4 +1,4 @@
-package me.chanjar.weixin.mp.bean;
+package me.chanjar.weixin.mp.bean.message;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import com.thoughtworks.xstream.annotations.XStreamConverter;

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlOutVideoMessage.java

@@ -1,4 +1,4 @@
-package me.chanjar.weixin.mp.bean;
+package me.chanjar.weixin.mp.bean.message;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import com.thoughtworks.xstream.annotations.XStreamConverter;
@@ -9,7 +9,7 @@ import me.chanjar.weixin.common.util.xml.XStreamCDataConverter;
 public class WxMpXmlOutVideoMessage extends WxMpXmlOutMessage {
 
   /**
-   * 
+   *
    */
   private static final long serialVersionUID = 1745902309380113978L;
   @XStreamAlias("Video")
@@ -42,11 +42,11 @@ public class WxMpXmlOutVideoMessage extends WxMpXmlOutMessage {
   public void setDescription(String description) {
     this.video.setDescription(description);
   }
-  
+
 
   @XStreamAlias("Video")
     public static class Video {
-    
+
     @XStreamAlias("MediaId")
     @XStreamConverter(value=XStreamCDataConverter.class)
     private String mediaId;
@@ -82,7 +82,7 @@ public class WxMpXmlOutVideoMessage extends WxMpXmlOutMessage {
     public void setDescription(String description) {
       this.description = description;
     }
-    
+
   }
 
 }

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlOutVoiceMessage.java

@@ -1,4 +1,4 @@
-package me.chanjar.weixin.mp.bean;
+package me.chanjar.weixin.mp.bean.message;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import com.thoughtworks.xstream.annotations.XStreamConverter;
@@ -9,7 +9,7 @@ import me.chanjar.weixin.common.util.xml.XStreamMediaIdConverter;
 public class WxMpXmlOutVoiceMessage extends WxMpXmlOutMessage {
 
   /**
-   * 
+   *
    */
   private static final long serialVersionUID = 240367390249860551L;
   @XStreamAlias("Voice")

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/builder/kefu/BaseBuilder.java

@@ -1,4 +1,4 @@
-package me.chanjar.weixin.mp.bean.custombuilder;
+package me.chanjar.weixin.mp.builder.kefu;
 
 import me.chanjar.weixin.mp.bean.kefu.WxMpKefuMessage;
 

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/builder/kefu/ImageBuilder.java

@@ -1,4 +1,4 @@
-package me.chanjar.weixin.mp.bean.custombuilder;
+package me.chanjar.weixin.mp.builder.kefu;
 
 import me.chanjar.weixin.common.api.WxConsts;
 import me.chanjar.weixin.mp.bean.kefu.WxMpKefuMessage;

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/builder/kefu/MpNewsBuilder.java

@@ -1,4 +1,4 @@
-package me.chanjar.weixin.mp.bean.custombuilder;
+package me.chanjar.weixin.mp.builder.kefu;
 
 import me.chanjar.weixin.common.api.WxConsts;
 import me.chanjar.weixin.mp.bean.kefu.WxMpKefuMessage;

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/builder/kefu/MusicBuilder.java

@@ -1,4 +1,4 @@
-package me.chanjar.weixin.mp.bean.custombuilder;
+package me.chanjar.weixin.mp.builder.kefu;
 
 import me.chanjar.weixin.common.api.WxConsts;
 import me.chanjar.weixin.mp.bean.kefu.WxMpKefuMessage;

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/builder/kefu/NewsBuilder.java

@@ -1,4 +1,4 @@
-package me.chanjar.weixin.mp.bean.custombuilder;
+package me.chanjar.weixin.mp.builder.kefu;
 
 import me.chanjar.weixin.common.api.WxConsts;
 import me.chanjar.weixin.mp.bean.kefu.WxMpKefuMessage;

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/builder/kefu/TextBuilder.java

@@ -1,4 +1,4 @@
-package me.chanjar.weixin.mp.bean.custombuilder;
+package me.chanjar.weixin.mp.builder.kefu;
 
 import me.chanjar.weixin.common.api.WxConsts;
 import me.chanjar.weixin.mp.bean.kefu.WxMpKefuMessage;

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/builder/kefu/VideoBuilder.java

@@ -1,4 +1,4 @@
-package me.chanjar.weixin.mp.bean.custombuilder;
+package me.chanjar.weixin.mp.builder.kefu;
 
 import me.chanjar.weixin.common.api.WxConsts;
 import me.chanjar.weixin.mp.bean.kefu.WxMpKefuMessage;

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/builder/kefu/VoiceBuilder.java

@@ -1,4 +1,4 @@
-package me.chanjar.weixin.mp.bean.custombuilder;
+package me.chanjar.weixin.mp.builder.kefu;
 
 import me.chanjar.weixin.common.api.WxConsts;
 import me.chanjar.weixin.mp.bean.kefu.WxMpKefuMessage;

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/builder/kefu/WxCardBuilder.java

@@ -1,4 +1,4 @@
-package me.chanjar.weixin.mp.bean.custombuilder;
+package me.chanjar.weixin.mp.builder.kefu;
 
 import me.chanjar.weixin.common.api.WxConsts;
 import me.chanjar.weixin.mp.bean.kefu.WxMpKefuMessage;

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/builder/outxml/BaseBuilder.java

@@ -1,29 +1,29 @@
-package me.chanjar.weixin.mp.bean.outxmlbuilder;
+package me.chanjar.weixin.mp.builder.outxml;
 
-import me.chanjar.weixin.mp.bean.WxMpXmlOutMessage;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage;
 
 public abstract class BaseBuilder<BuilderType, ValueType> {
-  
+
   protected String toUserName;
-  
+
   protected String fromUserName;
-  
+
   public BuilderType toUser(String touser) {
     this.toUserName = touser;
     return (BuilderType) this;
   }
-  
+
   public BuilderType fromUser(String fromusername) {
     this.fromUserName = fromusername;
     return (BuilderType) this;
   }
 
   public abstract ValueType build();
-  
+
   public void setCommon(WxMpXmlOutMessage m) {
     m.setToUserName(this.toUserName);
     m.setFromUserName(this.fromUserName);
     m.setCreateTime(System.currentTimeMillis() / 1000l);
   }
-  
+
 }

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/builder/outxml/ImageBuilder.java

@@ -1,6 +1,6 @@
-package me.chanjar.weixin.mp.bean.outxmlbuilder;
+package me.chanjar.weixin.mp.builder.outxml;
 
-import me.chanjar.weixin.mp.bean.WxMpXmlOutImageMessage;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlOutImageMessage;
 
 /**
  * 图片消息builder
@@ -22,5 +22,5 @@ public final class ImageBuilder extends BaseBuilder<ImageBuilder, WxMpXmlOutImag
     m.setMediaId(this.mediaId);
     return m;
   }
-  
+
 }

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/builder/outxml/MusicBuilder.java

@@ -1,10 +1,10 @@
-package me.chanjar.weixin.mp.bean.outxmlbuilder;
+package me.chanjar.weixin.mp.builder.outxml;
 
-import me.chanjar.weixin.mp.bean.WxMpXmlOutMusicMessage;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMusicMessage;
 
 /**
  * 音乐消息builder
- * 
+ *
  * @author chanjarster
  */
 public final class MusicBuilder extends BaseBuilder<MusicBuilder, WxMpXmlOutMusicMessage> {

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/builder/outxml/NewsBuilder.java

@@ -1,6 +1,6 @@
-package me.chanjar.weixin.mp.bean.outxmlbuilder;
+package me.chanjar.weixin.mp.builder.outxml;
 
-import me.chanjar.weixin.mp.bean.WxMpXmlOutNewsMessage;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlOutNewsMessage;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -12,12 +12,12 @@ import java.util.List;
 public final class NewsBuilder extends BaseBuilder<NewsBuilder, WxMpXmlOutNewsMessage> {
 
   protected final List<WxMpXmlOutNewsMessage.Item> articles = new ArrayList<>();
-  
+
   public NewsBuilder addArticle(WxMpXmlOutNewsMessage.Item item) {
     this.articles.add(item);
     return this;
   }
-  
+
   @Override
   public WxMpXmlOutNewsMessage build() {
     WxMpXmlOutNewsMessage m = new WxMpXmlOutNewsMessage();
@@ -27,5 +27,5 @@ public final class NewsBuilder extends BaseBuilder<NewsBuilder, WxMpXmlOutNewsMe
     setCommon(m);
     return m;
   }
-  
+
 }

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/builder/outxml/TextBuilder.java

@@ -1,6 +1,6 @@
-package me.chanjar.weixin.mp.bean.outxmlbuilder;
+package me.chanjar.weixin.mp.builder.outxml;
 
-import me.chanjar.weixin.mp.bean.WxMpXmlOutTextMessage;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlOutTextMessage;
 
 /**
  * 文本消息builder

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/builder/outxml/TransferCustomerServiceBuilder.java

@@ -1,7 +1,7 @@
-package me.chanjar.weixin.mp.bean.outxmlbuilder;
+package me.chanjar.weixin.mp.builder.outxml;
 
 import me.chanjar.weixin.common.util.StringUtils;
-import me.chanjar.weixin.mp.bean.WxMpXmlOutTransferKefuMessage;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlOutTransferKefuMessage;
 
 /**
  * 客服消息builder

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/builder/outxml/VideoBuilder.java

@@ -1,6 +1,6 @@
-package me.chanjar.weixin.mp.bean.outxmlbuilder;
+package me.chanjar.weixin.mp.builder.outxml;
 
-import me.chanjar.weixin.mp.bean.WxMpXmlOutVideoMessage;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlOutVideoMessage;
 
 /**
  * 视频消息builder
@@ -25,7 +25,7 @@ public final class VideoBuilder extends BaseBuilder<VideoBuilder, WxMpXmlOutVide
     this.mediaId = mediaId;
     return this;
   }
-  
+
   @Override
   public WxMpXmlOutVideoMessage build() {
     WxMpXmlOutVideoMessage m = new WxMpXmlOutVideoMessage();
@@ -35,5 +35,5 @@ public final class VideoBuilder extends BaseBuilder<VideoBuilder, WxMpXmlOutVide
     m.setMediaId(this.mediaId);
     return m;
   }
-  
+
 }

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/builder/outxml/VoiceBuilder.java

@@ -1,6 +1,6 @@
-package me.chanjar.weixin.mp.bean.outxmlbuilder;
+package me.chanjar.weixin.mp.builder.outxml;
 
-import me.chanjar.weixin.mp.bean.WxMpXmlOutVoiceMessage;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlOutVoiceMessage;
 
 /**
  * 语音消息builder
@@ -14,7 +14,7 @@ public final class VoiceBuilder extends BaseBuilder<VoiceBuilder, WxMpXmlOutVoic
     this.mediaId = mediaId;
     return this;
   }
-  
+
   @Override
   public WxMpXmlOutVoiceMessage build() {
     WxMpXmlOutVoiceMessage m = new WxMpXmlOutVoiceMessage();
@@ -22,5 +22,5 @@ public final class VoiceBuilder extends BaseBuilder<VoiceBuilder, WxMpXmlOutVoic
     m.setMediaId(this.mediaId);
     return m;
   }
-  
+
 }

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/xml/XStreamTransformer.java

@@ -7,15 +7,15 @@ import java.util.Map;
 import com.thoughtworks.xstream.XStream;
 
 import me.chanjar.weixin.common.util.xml.XStreamInitializer;
-import me.chanjar.weixin.mp.bean.WxMpXmlMessage;
-import me.chanjar.weixin.mp.bean.WxMpXmlOutImageMessage;
-import me.chanjar.weixin.mp.bean.WxMpXmlOutMessage;
-import me.chanjar.weixin.mp.bean.WxMpXmlOutMusicMessage;
-import me.chanjar.weixin.mp.bean.WxMpXmlOutNewsMessage;
-import me.chanjar.weixin.mp.bean.WxMpXmlOutTextMessage;
-import me.chanjar.weixin.mp.bean.WxMpXmlOutTransferKefuMessage;
-import me.chanjar.weixin.mp.bean.WxMpXmlOutVideoMessage;
-import me.chanjar.weixin.mp.bean.WxMpXmlOutVoiceMessage;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlOutImageMessage;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMusicMessage;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlOutNewsMessage;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlOutTextMessage;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlOutTransferKefuMessage;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlOutVideoMessage;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlOutVoiceMessage;
 
 public class XStreamTransformer {