规范package，为发布到maven central repository做准备

src/test/java/me/chanjar/weixin/api/ApiTestModule.java

@@ -1,4 +1,4 @@
-package chanjarster.weixin.api;
+package me.chanjar.weixin.api;
 
 import java.io.InputStream;
 
@@ -7,7 +7,9 @@ import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlRootElement;
 
-import chanjarster.weixin.util.xml.XmlTransformer;
+import me.chanjar.weixin.api.WxInMemoryConfigStorage;
+import me.chanjar.weixin.api.WxServiceImpl;
+import me.chanjar.weixin.util.xml.XmlTransformer;
 
 import com.google.inject.Binder;
 import com.google.inject.Module;

src/test/java/me/chanjar/weixin/api/WxBaseAPITest.java

@@ -1,11 +1,11 @@
-package chanjarster.weixin.api;
+package me.chanjar.weixin.api;
 
 import org.apache.commons.lang3.StringUtils;
 import org.testng.Assert;
 import org.testng.annotations.Guice;
 import org.testng.annotations.Test;
 
-import chanjarster.weixin.exception.WxErrorException;
+import me.chanjar.weixin.exception.WxErrorException;
 
 import com.google.inject.Inject;
 

src/test/java/me/chanjar/weixin/api/WxCustomMessageAPITest.java

@@ -1,11 +1,10 @@
-package chanjarster.weixin.api;
+package me.chanjar.weixin.api;
 
 import org.testng.annotations.Guice;
 import org.testng.annotations.Test;
 
-import chanjarster.weixin.api.ApiTestModule.WxXmlConfigStorage;
-import chanjarster.weixin.bean.WxCustomMessage;
-import chanjarster.weixin.exception.WxErrorException;
+import me.chanjar.weixin.bean.WxCustomMessage;
+import me.chanjar.weixin.exception.WxErrorException;
 
 import com.google.inject.Inject;
 
@@ -22,7 +21,7 @@ public class WxCustomMessageAPITest {
   protected WxServiceImpl wxService;
 
   public void testSendCustomMessage() throws WxErrorException {
-    WxXmlConfigStorage configStorage = (WxXmlConfigStorage) wxService.wxConfigStorage;
+    ApiTestModule.WxXmlConfigStorage configStorage = (ApiTestModule.WxXmlConfigStorage) wxService.wxConfigStorage;
     WxCustomMessage message = new WxCustomMessage();
     message.setMsgtype(WxConsts.CUSTOM_MSG_TEXT);
     message.setTouser(configStorage.getOpenId());

src/test/java/me/chanjar/weixin/api/WxGroupAPITest.java

@@ -1,4 +1,4 @@
-package chanjarster.weixin.api;
+package me.chanjar.weixin.api;
 
 import java.util.List;
 
@@ -6,8 +6,8 @@ import org.testng.Assert;
 import org.testng.annotations.Guice;
 import org.testng.annotations.Test;
 
-import chanjarster.weixin.bean.WxGroup;
-import chanjarster.weixin.exception.WxErrorException;
+import me.chanjar.weixin.bean.WxGroup;
+import me.chanjar.weixin.exception.WxErrorException;
 
 import com.google.inject.Inject;
 

src/test/java/me/chanjar/weixin/api/WxMassMessageAPITest.java

@@ -1,4 +1,4 @@
-package chanjarster.weixin.api;
+package me.chanjar.weixin.api;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -8,16 +8,16 @@ import org.testng.annotations.DataProvider;
 import org.testng.annotations.Guice;
 import org.testng.annotations.Test;
 
-import chanjarster.weixin.api.ApiTestModule.WxXmlConfigStorage;
-import chanjarster.weixin.bean.WxMassGroupMessage;
-import chanjarster.weixin.bean.WxMassNews;
-import chanjarster.weixin.bean.WxMassNews.WxMassNewsArticle;
-import chanjarster.weixin.bean.WxMassOpenIdsMessage;
-import chanjarster.weixin.bean.WxMassVideo;
-import chanjarster.weixin.bean.result.WxMassSendResult;
-import chanjarster.weixin.bean.result.WxMassUploadResult;
-import chanjarster.weixin.bean.result.WxMediaUploadResult;
-import chanjarster.weixin.exception.WxErrorException;
+import me.chanjar.weixin.api.ApiTestModule.WxXmlConfigStorage;
+import me.chanjar.weixin.bean.WxMassGroupMessage;
+import me.chanjar.weixin.bean.WxMassNews;
+import me.chanjar.weixin.bean.WxMassNews.WxMassNewsArticle;
+import me.chanjar.weixin.bean.WxMassOpenIdsMessage;
+import me.chanjar.weixin.bean.WxMassVideo;
+import me.chanjar.weixin.bean.result.WxMassSendResult;
+import me.chanjar.weixin.bean.result.WxMassUploadResult;
+import me.chanjar.weixin.bean.result.WxMediaUploadResult;
+import me.chanjar.weixin.exception.WxErrorException;
 
 import com.google.inject.Inject;
 

src/test/java/me/chanjar/weixin/api/WxMediaAPITest.java

@@ -1,4 +1,4 @@
-package chanjarster.weixin.api;
+package me.chanjar.weixin.api;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -10,8 +10,8 @@ import org.testng.annotations.DataProvider;
 import org.testng.annotations.Guice;
 import org.testng.annotations.Test;
 
-import chanjarster.weixin.bean.result.WxMediaUploadResult;
-import chanjarster.weixin.exception.WxErrorException;
+import me.chanjar.weixin.bean.result.WxMediaUploadResult;
+import me.chanjar.weixin.exception.WxErrorException;
 
 import com.google.inject.Inject;
 

src/test/java/me/chanjar/weixin/api/WxMenuAPITest.java

@@ -1,4 +1,4 @@
-package chanjarster.weixin.api;
+package me.chanjar.weixin.api;
 
 import javax.xml.bind.JAXBException;
 
@@ -9,9 +9,9 @@ import org.testng.annotations.Test;
 
 import com.google.inject.Inject;
 
-import chanjarster.weixin.bean.WxMenu;
-import chanjarster.weixin.bean.WxMenu.WxMenuButton;
-import chanjarster.weixin.exception.WxErrorException;
+import me.chanjar.weixin.bean.WxMenu;
+import me.chanjar.weixin.bean.WxMenu.WxMenuButton;
+import me.chanjar.weixin.exception.WxErrorException;
 
 /**
  * 测试菜单

src/test/java/me/chanjar/weixin/api/WxMessageRouterTest.java

@@ -1,13 +1,16 @@
-package chanjarster.weixin.api;
+package me.chanjar.weixin.api;
 
 import java.util.Map;
 
+import me.chanjar.weixin.api.WxConsts;
+import me.chanjar.weixin.api.WxMessageHandler;
+import me.chanjar.weixin.api.WxMessageRouter;
 import org.testng.Assert;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
-import chanjarster.weixin.bean.WxXmlMessage;
-import chanjarster.weixin.bean.WxXmlOutMessage;
+import me.chanjar.weixin.bean.WxXmlMessage;
+import me.chanjar.weixin.bean.WxXmlOutMessage;
 
 /**
  * 测试消息路由器

src/test/java/me/chanjar/weixin/api/WxQrCodeAPITest.java

@@ -1,4 +1,4 @@
-package chanjarster.weixin.api;
+package me.chanjar.weixin.api;
 
 import java.io.File;
 
@@ -6,8 +6,8 @@ import org.testng.Assert;
 import org.testng.annotations.Guice;
 import org.testng.annotations.Test;
 
-import chanjarster.weixin.bean.result.WxQrCodeTicket;
-import chanjarster.weixin.exception.WxErrorException;
+import me.chanjar.weixin.bean.result.WxQrCodeTicket;
+import me.chanjar.weixin.exception.WxErrorException;
 
 import com.google.inject.Inject;
 

src/test/java/me/chanjar/weixin/api/WxShortUrlAPITest.java

@@ -1,10 +1,10 @@
-package chanjarster.weixin.api;
+package me.chanjar.weixin.api;
 
 import org.testng.Assert;
 import org.testng.annotations.Guice;
 import org.testng.annotations.Test;
 
-import chanjarster.weixin.exception.WxErrorException;
+import me.chanjar.weixin.exception.WxErrorException;
 
 import com.google.inject.Inject;
 

src/test/java/me/chanjar/weixin/api/WxUserAPITest.java

@@ -1,13 +1,13 @@
-package chanjarster.weixin.api;
+package me.chanjar.weixin.api;
 
 import org.testng.Assert;
 import org.testng.annotations.Guice;
 import org.testng.annotations.Test;
 
-import chanjarster.weixin.api.ApiTestModule.WxXmlConfigStorage;
-import chanjarster.weixin.bean.result.WxUser;
-import chanjarster.weixin.bean.result.WxUserList;
-import chanjarster.weixin.exception.WxErrorException;
+import me.chanjar.weixin.api.ApiTestModule.WxXmlConfigStorage;
+import me.chanjar.weixin.bean.result.WxUser;
+import me.chanjar.weixin.bean.result.WxUserList;
+import me.chanjar.weixin.exception.WxErrorException;
 
 import com.google.inject.Inject;
 

src/test/java/me/chanjar/weixin/bean/WxAccessTokenTest.java

@@ -1,5 +1,6 @@
-package chanjarster.weixin.bean;
+package me.chanjar.weixin.bean;
 
+import me.chanjar.weixin.bean.WxAccessToken;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 

src/test/java/me/chanjar/weixin/bean/WxCustomMessageTest.java

@@ -1,10 +1,11 @@
-package chanjarster.weixin.bean;
+package me.chanjar.weixin.bean;
 
+import me.chanjar.weixin.bean.WxCustomMessage;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-import chanjarster.weixin.api.WxConsts;
-import chanjarster.weixin.bean.WxCustomMessage.WxArticle;
+import me.chanjar.weixin.api.WxConsts;
+import me.chanjar.weixin.bean.WxCustomMessage.WxArticle;
 
 @Test
 public class WxCustomMessageTest {

src/test/java/me/chanjar/weixin/bean/WxErrorTest.java

@@ -1,9 +1,9 @@
-package chanjarster.weixin.bean;
+package me.chanjar.weixin.bean;
 
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-import chanjarster.weixin.bean.result.WxError;
+import me.chanjar.weixin.bean.result.WxError;
 
 @Test
 public class WxErrorTest {

src/test/java/me/chanjar/weixin/bean/WxMenuTest.java

@@ -1,10 +1,11 @@
-package chanjarster.weixin.bean;
+package me.chanjar.weixin.bean;
 
+import me.chanjar.weixin.bean.WxMenu;
 import org.testng.Assert;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
-import chanjarster.weixin.bean.WxMenu.WxMenuButton;
+import me.chanjar.weixin.bean.WxMenu.WxMenuButton;
 
 @Test
 public class WxMenuTest {

src/test/java/me/chanjar/weixin/bean/WxXmlMessageTest.java

@@ -1,9 +1,10 @@
-package chanjarster.weixin.bean;
+package me.chanjar.weixin.bean;
 
+import me.chanjar.weixin.bean.WxXmlMessage;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-import chanjarster.weixin.api.WxConsts;
+import me.chanjar.weixin.api.WxConsts;
 
 @Test
 public class WxXmlMessageTest {

src/test/java/me/chanjar/weixin/bean/WxXmlOutIMusicMessageTest.java

@@ -1,5 +1,7 @@
-package chanjarster.weixin.bean;
+package me.chanjar.weixin.bean;
 
+import me.chanjar.weixin.bean.WxXmlOutMessage;
+import me.chanjar.weixin.bean.WxXmlOutMusicMessage;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 

src/test/java/me/chanjar/weixin/bean/WxXmlOutINewsMessageTest.java

@@ -1,5 +1,7 @@
-package chanjarster.weixin.bean;
+package me.chanjar.weixin.bean;
 
+import me.chanjar.weixin.bean.WxXmlOutMessage;
+import me.chanjar.weixin.bean.WxXmlOutMewsMessage;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 

src/test/java/me/chanjar/weixin/bean/WxXmlOutIVideoMessageTest.java

@@ -1,5 +1,7 @@
-package chanjarster.weixin.bean;
+package me.chanjar.weixin.bean;
 
+import me.chanjar.weixin.bean.WxXmlOutMessage;
+import me.chanjar.weixin.bean.WxXmlOutVideoMessage;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 

src/test/java/me/chanjar/weixin/bean/WxXmlOutIVoiceMessageTest.java

@@ -1,5 +1,7 @@
-package chanjarster.weixin.bean;
+package me.chanjar.weixin.bean;
 
+import me.chanjar.weixin.bean.WxXmlOutMessage;
+import me.chanjar.weixin.bean.WxXmlOutVoiceMessage;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 

src/test/java/me/chanjar/weixin/bean/WxXmlOutImageMessageTest.java

@@ -1,5 +1,7 @@
-package chanjarster.weixin.bean;
+package me.chanjar.weixin.bean;
 
+import me.chanjar.weixin.bean.WxXmlOutImageMessage;
+import me.chanjar.weixin.bean.WxXmlOutMessage;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 

src/test/java/me/chanjar/weixin/bean/WxXmlOutTextMessageTest.java

@@ -1,5 +1,7 @@
-package chanjarster.weixin.bean;
+package me.chanjar.weixin.bean;
 
+import me.chanjar.weixin.bean.WxXmlOutMessage;
+import me.chanjar.weixin.bean.WxXmlOutTextMessage;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 

src/test/resources/test-config.sample.xml

@@ -1,8 +1,8 @@
 <xml>
-  <appId></appId>
-  <secret></secret>
-   <token></token>
-  <accessToken></accessToken>
-  <expiresIn></expiresIn>
-  <openId></openId>
-</xml>
+    <appId></appId>
+    <secret></secret>
+    <token></token>
+    <accessToken></accessToken>
+    <expiresIn></expiresIn>
+    <openId></openId>
+</xml>

src/test/resources/testng.xml

@@ -3,32 +3,32 @@
 <suite name="Weixin-java-tool-suite" verbose="1">
 	<test name="API_Test">
 		<classes>
-			<class name="chanjarster.weixin.api.WxBaseAPITest" />
-			<class name="chanjarster.weixin.api.WxCustomMessageAPITest" />
-			<class name="chanjarster.weixin.api.WxMenuAPITest" />
-			<class name="chanjarster.weixin.api.WxGroupAPITest" />
-			<class name="chanjarster.weixin.api.WxMassMessageAPITest" />
-			<class name="chanjarster.weixin.api.WxMediaAPITest" />
-			<class name="chanjarster.weixin.api.WxUserAPITest" />
-			<class name="chanjarster.weixin.api.WxQrCodeAPITest" />
-			<class name="chanjarster.weixin.api.WxShortUrlAPITest" />
-			<class name="chanjarster.weixin.api.WxMessageRouterTest" />
+			<class name="me.chanjar.weixin.api.WxBaseAPITest" />
+			<class name="me.chanjar.weixin.api.WxCustomMessageAPITest" />
+			<class name="me.chanjar.weixin.api.WxMenuAPITest" />
+			<class name="me.chanjar.weixin.api.WxGroupAPITest" />
+			<class name="me.chanjar.weixin.api.WxMassMessageAPITest" />
+			<class name="me.chanjar.weixin.api.WxMediaAPITest" />
+			<class name="me.chanjar.weixin.api.WxUserAPITest" />
+			<class name="me.chanjar.weixin.api.WxQrCodeAPITest" />
+			<class name="me.chanjar.weixin.api.WxShortUrlAPITest" />
+			<class name="me.chanjar.weixin.api.WxMessageRouterTest" />
 		</classes>
 	</test>
 
 	<test name="Bean_Test">
 		<classes>
-			<class name="chanjarster.weixin.bean.WxAccessTokenTest" />
-			<class name="chanjarster.weixin.bean.WxCustomMessageTest" />
-			<class name="chanjarster.weixin.bean.WxErrorTest" />
-			<class name="chanjarster.weixin.bean.WxMenuTest" />
-			<class name="chanjarster.weixin.bean.WxXmlMessageTest" />
-			<class name="chanjarster.weixin.bean.WxXmlOutImageMessageTest" />
-			<class name="chanjarster.weixin.bean.WxXmlOutIMusicMessageTest" />
-			<class name="chanjarster.weixin.bean.WxXmlOutINewsMessageTest" />
-			<class name="chanjarster.weixin.bean.WxXmlOutIVideoMessageTest" />
-			<class name="chanjarster.weixin.bean.WxXmlOutIVoiceMessageTest" />
-			<class name="chanjarster.weixin.bean.WxXmlOutTextMessageTest" />
+			<class name="me.chanjar.weixin.bean.WxAccessTokenTest" />
+			<class name="me.chanjar.weixin.bean.WxCustomMessageTest" />
+			<class name="me.chanjar.weixin.bean.WxErrorTest" />
+			<class name="me.chanjar.weixin.bean.WxMenuTest" />
+			<class name="me.chanjar.weixin.bean.WxXmlMessageTest" />
+			<class name="me.chanjar.weixin.bean.WxXmlOutImageMessageTest" />
+			<class name="me.chanjar.weixin.bean.WxXmlOutIMusicMessageTest" />
+			<class name="me.chanjar.weixin.bean.WxXmlOutINewsMessageTest" />
+			<class name="me.chanjar.weixin.bean.WxXmlOutIVideoMessageTest" />
+			<class name="me.chanjar.weixin.bean.WxXmlOutIVoiceMessageTest" />
+			<class name="me.chanjar.weixin.bean.WxXmlOutTextMessageTest" />
 		</classes>
 	</test>
-</suite>
+</suite>