lsm/weixin-java-tools
1
0
Fork 0
mirror of https://gitee.com/binary/weixin-java-tools.git synced 2025-09-23 12:33:48 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Daniel Qian
2014-10-14 16:23:00 +08:00
parent fef9f82b23
commit e9cb1b79de
94 changed files with 466 additions and 449 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -18,3 +18,4 @@ target
src/test/resources/test-config.xml src/test/resources/test-config.xml
sw-pom.xml sw-pom.xml
*.iml

8
pom.xml
View File

@@ -3,11 +3,13 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>chanjarster.weixin</groupId> <groupId>me.chanjar</groupId>
<artifactId>weixin-java-tools</artifactId> <artifactId>weixin-java-tools</artifactId>
<version>1.0.0-SNAPSHOT</version> <version>1.0.0</version>
<name>WeiXin Java Toolset</name> <name>WeiXin Java Tools</name>
<url>https://github.com/chanjarster/weixin-java</url> <url>https://github.com/chanjarster/weixin-java</url>
<description>用于开发微信公众号的Java工具</description>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<downloadJavadocs>true</downloadJavadocs> <downloadJavadocs>true</downloadJavadocs>

4
src/main/java/chanjarster/weixin/api/WxConfigStorage.java → src/main/java/me/chanjar/weixin/api/WxConfigStorage.java
View File

@@ -1,6 +1,6 @@
package chanjarster.weixin.api; package me.chanjar.weixin.api;
import chanjarster.weixin.bean.WxAccessToken; import me.chanjar.weixin.bean.WxAccessToken;
/** /**
* 微信客户端配置存储 * 微信客户端配置存储

2
src/main/java/chanjarster/weixin/api/WxConsts.java → src/main/java/me/chanjar/weixin/api/WxConsts.java
View File

@@ -1,4 +1,4 @@
package chanjarster.weixin.api; package me.chanjar.weixin.api;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;

4
src/main/java/chanjarster/weixin/api/WxInMemoryConfigStorage.java → src/main/java/me/chanjar/weixin/api/WxInMemoryConfigStorage.java
View File

@@ -1,6 +1,6 @@
package chanjarster.weixin.api; package me.chanjar.weixin.api;
import chanjarster.weixin.bean.WxAccessToken; import me.chanjar.weixin.bean.WxAccessToken;
/** /**
* 基于内存的微信配置provider，在实际生产环境中应该将这些配置持久化 * 基于内存的微信配置provider，在实际生产环境中应该将这些配置持久化

6
src/main/java/chanjarster/weixin/api/WxMessageHandler.java → src/main/java/me/chanjar/weixin/api/WxMessageHandler.java
View File

@@ -1,9 +1,9 @@
package chanjarster.weixin.api; package me.chanjar.weixin.api;
import java.util.Map; import java.util.Map;
import chanjarster.weixin.bean.WxXmlMessage; import me.chanjar.weixin.bean.WxXmlMessage;
import chanjarster.weixin.bean.WxXmlOutMessage; import me.chanjar.weixin.bean.WxXmlOutMessage;
/** /**
* 处理微信推送消息的处理器接口 * 处理微信推送消息的处理器接口

4
src/main/java/chanjarster/weixin/api/WxMessageInterceptor.java → src/main/java/me/chanjar/weixin/api/WxMessageInterceptor.java
View File

@@ -1,8 +1,8 @@
package chanjarster.weixin.api; package me.chanjar.weixin.api;
import java.util.Map; import java.util.Map;
import chanjarster.weixin.bean.WxXmlMessage; import me.chanjar.weixin.bean.WxXmlMessage;
/** /**

6
src/main/java/chanjarster/weixin/api/WxMessageRouter.java → src/main/java/me/chanjar/weixin/api/WxMessageRouter.java
View File

@@ -1,4 +1,4 @@
package chanjarster.weixin.api; package me.chanjar.weixin.api;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
@@ -8,8 +8,8 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import chanjarster.weixin.bean.WxXmlMessage; import me.chanjar.weixin.bean.WxXmlMessage;
import chanjarster.weixin.bean.WxXmlOutMessage; import me.chanjar.weixin.bean.WxXmlOutMessage;
/** /**
* <pre> * <pre>

30
src/main/java/chanjarster/weixin/api/WxService.java → src/main/java/me/chanjar/weixin/api/WxService.java
View File

@@ -1,24 +1,24 @@
package chanjarster.weixin.api; package me.chanjar.weixin.api;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.util.List; import java.util.List;
import chanjarster.weixin.bean.WxCustomMessage; import me.chanjar.weixin.bean.WxCustomMessage;
import chanjarster.weixin.bean.WxGroup; import me.chanjar.weixin.bean.WxGroup;
import chanjarster.weixin.bean.WxMassGroupMessage; import me.chanjar.weixin.bean.WxMassGroupMessage;
import chanjarster.weixin.bean.WxMassNews; import me.chanjar.weixin.bean.WxMassNews;
import chanjarster.weixin.bean.WxMassOpenIdsMessage; import me.chanjar.weixin.bean.WxMassOpenIdsMessage;
import chanjarster.weixin.bean.WxMassVideo; import me.chanjar.weixin.bean.WxMassVideo;
import chanjarster.weixin.bean.WxMenu; import me.chanjar.weixin.bean.WxMenu;
import chanjarster.weixin.bean.result.WxMassSendResult; import me.chanjar.weixin.bean.result.WxMassSendResult;
import chanjarster.weixin.bean.result.WxMassUploadResult; import me.chanjar.weixin.bean.result.WxMassUploadResult;
import chanjarster.weixin.bean.result.WxMediaUploadResult; import me.chanjar.weixin.bean.result.WxMediaUploadResult;
import chanjarster.weixin.bean.result.WxQrCodeTicket; import me.chanjar.weixin.bean.result.WxQrCodeTicket;
import chanjarster.weixin.bean.result.WxUser; import me.chanjar.weixin.bean.result.WxUser;
import chanjarster.weixin.bean.result.WxUserList; import me.chanjar.weixin.bean.result.WxUserList;
import chanjarster.weixin.exception.WxErrorException; import me.chanjar.weixin.exception.WxErrorException;
/** /**
* 微信API的Service * 微信API的Service

52
src/main/java/chanjarster/weixin/api/WxServiceImpl.java → src/main/java/me/chanjar/weixin/api/WxServiceImpl.java
View File

@@ -1,4 +1,4 @@
package chanjarster.weixin.api; package me.chanjar.weixin.api;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
@@ -10,6 +10,8 @@ import java.util.List;
import java.util.UUID; import java.util.UUID;
import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicBoolean;
import me.chanjar.weixin.bean.WxCustomMessage;
import me.chanjar.weixin.util.json.GsonHelper;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.http.client.ClientProtocolException; import org.apache.http.client.ClientProtocolException;
import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.CloseableHttpResponse;
@@ -18,31 +20,29 @@ import org.apache.http.impl.client.BasicResponseHandler;
import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients; import org.apache.http.impl.client.HttpClients;
import chanjarster.weixin.bean.WxAccessToken; import me.chanjar.weixin.bean.WxAccessToken;
import chanjarster.weixin.bean.WxCustomMessage; import me.chanjar.weixin.bean.WxGroup;
import chanjarster.weixin.bean.WxGroup; import me.chanjar.weixin.bean.WxMassGroupMessage;
import chanjarster.weixin.bean.WxMassGroupMessage; import me.chanjar.weixin.bean.WxMassNews;
import chanjarster.weixin.bean.WxMassNews; import me.chanjar.weixin.bean.WxMassOpenIdsMessage;
import chanjarster.weixin.bean.WxMassOpenIdsMessage; import me.chanjar.weixin.bean.WxMassVideo;
import chanjarster.weixin.bean.WxMassVideo; import me.chanjar.weixin.bean.WxMenu;
import chanjarster.weixin.bean.WxMenu; import me.chanjar.weixin.bean.result.WxError;
import chanjarster.weixin.bean.result.WxError; import me.chanjar.weixin.bean.result.WxMassSendResult;
import chanjarster.weixin.bean.result.WxMassSendResult; import me.chanjar.weixin.bean.result.WxMassUploadResult;
import chanjarster.weixin.bean.result.WxMassUploadResult; import me.chanjar.weixin.bean.result.WxMediaUploadResult;
import chanjarster.weixin.bean.result.WxMediaUploadResult; import me.chanjar.weixin.bean.result.WxQrCodeTicket;
import chanjarster.weixin.bean.result.WxQrCodeTicket; import me.chanjar.weixin.bean.result.WxUser;
import chanjarster.weixin.bean.result.WxUser; import me.chanjar.weixin.bean.result.WxUserList;
import chanjarster.weixin.bean.result.WxUserList; import me.chanjar.weixin.exception.WxErrorException;
import chanjarster.weixin.exception.WxErrorException; import me.chanjar.weixin.util.fs.FileUtils;
import chanjarster.weixin.util.fs.FileUtils; import me.chanjar.weixin.util.http.MediaDownloadRequestExecutor;
import chanjarster.weixin.util.http.MediaDownloadRequestExecutor; import me.chanjar.weixin.util.http.MediaUploadRequestExecutor;
import chanjarster.weixin.util.http.MediaUploadRequestExecutor; import me.chanjar.weixin.util.http.QrCodeRequestExecutor;
import chanjarster.weixin.util.http.QrCodeRequestExecutor; import me.chanjar.weixin.util.http.RequestExecutor;
import chanjarster.weixin.util.http.RequestExecutor; import me.chanjar.weixin.util.http.SimpleGetRequestExecutor;
import chanjarster.weixin.util.http.SimpleGetRequestExecutor; import me.chanjar.weixin.util.http.SimplePostRequestExecutor;
import chanjarster.weixin.util.http.SimplePostRequestExecutor; import me.chanjar.weixin.util.json.WxGsonBuilder;
import chanjarster.weixin.util.json.GsonHelper;
import chanjarster.weixin.util.json.WxGsonBuilder;
import com.google.gson.JsonElement; import com.google.gson.JsonElement;
import com.google.gson.JsonObject; import com.google.gson.JsonObject;

4
src/main/java/chanjarster/weixin/bean/WxAccessToken.java → src/main/java/me/chanjar/weixin/bean/WxAccessToken.java
View File

@@ -1,6 +1,6 @@
package chanjarster.weixin.bean; package me.chanjar.weixin.bean;
import chanjarster.weixin.util.json.WxGsonBuilder; import me.chanjar.weixin.util.json.WxGsonBuilder;
public class WxAccessToken { public class WxAccessToken {

18
src/main/java/chanjarster/weixin/bean/WxCustomMessage.java → src/main/java/me/chanjar/weixin/bean/WxCustomMessage.java
View File

@@ -1,16 +1,16 @@
package chanjarster.weixin.bean; package me.chanjar.weixin.bean;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import chanjarster.weixin.api.WxConsts; import me.chanjar.weixin.api.WxConsts;
import chanjarster.weixin.bean.custombuilder.ImageBuilder; import me.chanjar.weixin.bean.custombuilder.ImageBuilder;
import chanjarster.weixin.bean.custombuilder.MusicBuilder; import me.chanjar.weixin.bean.custombuilder.MusicBuilder;
import chanjarster.weixin.bean.custombuilder.NewsBuilder; import me.chanjar.weixin.bean.custombuilder.NewsBuilder;
import chanjarster.weixin.bean.custombuilder.TextBuilder; import me.chanjar.weixin.bean.custombuilder.TextBuilder;
import chanjarster.weixin.bean.custombuilder.VideoBuilder; import me.chanjar.weixin.bean.custombuilder.VideoBuilder;
import chanjarster.weixin.bean.custombuilder.VoiceBuilder; import me.chanjar.weixin.bean.custombuilder.VoiceBuilder;
import chanjarster.weixin.util.json.WxGsonBuilder; import me.chanjar.weixin.util.json.WxGsonBuilder;
/** /**
* 客服消息 * 客服消息

4
src/main/java/chanjarster/weixin/bean/WxGroup.java → src/main/java/me/chanjar/weixin/bean/WxGroup.java
View File

@@ -1,6 +1,6 @@
package chanjarster.weixin.bean; package me.chanjar.weixin.bean;
import chanjarster.weixin.util.json.WxGsonBuilder; import me.chanjar.weixin.util.json.WxGsonBuilder;
/** /**
* 微信用户分组 * 微信用户分组

6
src/main/java/chanjarster/weixin/bean/WxMassGroupMessage.java → src/main/java/me/chanjar/weixin/bean/WxMassGroupMessage.java
View File

@@ -1,7 +1,7 @@
package chanjarster.weixin.bean; package me.chanjar.weixin.bean;
import chanjarster.weixin.api.WxConsts; import me.chanjar.weixin.api.WxConsts;
import chanjarster.weixin.util.json.WxGsonBuilder; import me.chanjar.weixin.util.json.WxGsonBuilder;
/** /**
* 分组群发的消息 * 分组群发的消息

4
src/main/java/chanjarster/weixin/bean/WxMassNews.java → src/main/java/me/chanjar/weixin/bean/WxMassNews.java
View File

@@ -1,9 +1,9 @@
package chanjarster.weixin.bean; package me.chanjar.weixin.bean;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import chanjarster.weixin.util.json.WxGsonBuilder; import me.chanjar.weixin.util.json.WxGsonBuilder;
/** /**
* 群发时用到的图文消息素材 * 群发时用到的图文消息素材

15
src/main/java/chanjarster/weixin/bean/WxMassOpenIdsMessage.java → src/main/java/me/chanjar/weixin/bean/WxMassOpenIdsMessage.java
View File

@@ -1,10 +1,9 @@
package chanjarster.weixin.bean; package me.chanjar.weixin.bean;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import chanjarster.weixin.api.WxConsts; import me.chanjar.weixin.util.json.WxGsonBuilder;
import chanjarster.weixin.util.json.WxGsonBuilder;
/** /**
* OpenId列表群发的消息 * OpenId列表群发的消息
@@ -29,11 +28,11 @@ public class WxMassOpenIdsMessage {
/** /**
* <pre> * <pre>
* 请使用 * 请使用
* {@link WxConsts#MASS_MSG_IMAGE} * {@link me.chanjar.weixin.api.WxConsts#MASS_MSG_IMAGE}
* {@link WxConsts#MASS_MSG_NEWS} * {@link me.chanjar.weixin.api.WxConsts#MASS_MSG_NEWS}
* {@link WxConsts#MASS_MSG_TEXT} * {@link me.chanjar.weixin.api.WxConsts#MASS_MSG_TEXT}
* {@link WxConsts#MASS_MSG_VIDEO} * {@link me.chanjar.weixin.api.WxConsts#MASS_MSG_VIDEO}
* {@link WxConsts#MASS_MSG_VOICE} * {@link me.chanjar.weixin.api.WxConsts#MASS_MSG_VOICE}
* 如果msgtype和media_id不匹配的话，会返回系统繁忙的错误 * 如果msgtype和media_id不匹配的话，会返回系统繁忙的错误
* </pre> * </pre>
* @param msgtype * @param msgtype

4
src/main/java/chanjarster/weixin/bean/WxMassVideo.java → src/main/java/me/chanjar/weixin/bean/WxMassVideo.java
View File

@@ -1,6 +1,6 @@
package chanjarster.weixin.bean; package me.chanjar.weixin.bean;
import chanjarster.weixin.util.json.WxGsonBuilder; import me.chanjar.weixin.util.json.WxGsonBuilder;
/** /**
* 群发时用到的视频素材 * 群发时用到的视频素材

4
src/main/java/chanjarster/weixin/bean/WxMenu.java → src/main/java/me/chanjar/weixin/bean/WxMenu.java
View File

@@ -1,11 +1,11 @@
package chanjarster.weixin.bean; package me.chanjar.weixin.bean;
import java.io.InputStream; import java.io.InputStream;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import chanjarster.weixin.util.json.WxGsonBuilder; import me.chanjar.weixin.util.json.WxGsonBuilder;
/** /**
* 公众号菜单 * 公众号菜单

8
src/main/java/chanjarster/weixin/bean/WxXmlMessage.java → src/main/java/me/chanjar/weixin/bean/WxXmlMessage.java
View File

@@ -1,4 +1,4 @@
package chanjarster.weixin.bean; package me.chanjar.weixin.bean;
import java.io.InputStream; import java.io.InputStream;
@@ -9,9 +9,9 @@ import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import chanjarster.weixin.api.WxConsts; import me.chanjar.weixin.api.WxConsts;
import chanjarster.weixin.util.xml.AdapterCDATA; import me.chanjar.weixin.util.xml.AdapterCDATA;
import chanjarster.weixin.util.xml.XmlTransformer; import me.chanjar.weixin.util.xml.XmlTransformer;
/** /**
* <pre> * <pre>

6
src/main/java/chanjarster/weixin/bean/WxXmlOutImageMessage.java → src/main/java/me/chanjar/weixin/bean/WxXmlOutImageMessage.java
View File

@@ -1,4 +1,4 @@
package chanjarster.weixin.bean; package me.chanjar.weixin.bean;
import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAccessorType;
@@ -6,8 +6,8 @@ import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import chanjarster.weixin.api.WxConsts; import me.chanjar.weixin.api.WxConsts;
import chanjarster.weixin.util.xml.MediaIdMarshaller; import me.chanjar.weixin.util.xml.MediaIdMarshaller;
@XmlRootElement(name = "xml") @XmlRootElement(name = "xml")
@XmlAccessorType(XmlAccessType.FIELD) @XmlAccessorType(XmlAccessType.FIELD)

18
src/main/java/chanjarster/weixin/bean/WxXmlOutMessage.java → src/main/java/me/chanjar/weixin/bean/WxXmlOutMessage.java
View File

@@ -1,4 +1,4 @@
package chanjarster.weixin.bean; package me.chanjar.weixin.bean;
import javax.xml.bind.JAXBException; import javax.xml.bind.JAXBException;
import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessType;
@@ -7,14 +7,14 @@ import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import chanjarster.weixin.bean.outxmlbuilder.ImageBuilder; import me.chanjar.weixin.bean.outxmlbuilder.ImageBuilder;
import chanjarster.weixin.bean.outxmlbuilder.MusicBuilder; import me.chanjar.weixin.bean.outxmlbuilder.MusicBuilder;
import chanjarster.weixin.bean.outxmlbuilder.NewsBuilder; import me.chanjar.weixin.bean.outxmlbuilder.NewsBuilder;
import chanjarster.weixin.bean.outxmlbuilder.TextBuilder; import me.chanjar.weixin.bean.outxmlbuilder.TextBuilder;
import chanjarster.weixin.bean.outxmlbuilder.VideoBuilder; import me.chanjar.weixin.bean.outxmlbuilder.VideoBuilder;
import chanjarster.weixin.bean.outxmlbuilder.VoiceBuilder; import me.chanjar.weixin.bean.outxmlbuilder.VoiceBuilder;
import chanjarster.weixin.util.xml.AdapterCDATA; import me.chanjar.weixin.util.xml.AdapterCDATA;
import chanjarster.weixin.util.xml.XmlTransformer; import me.chanjar.weixin.util.xml.XmlTransformer;
@XmlRootElement(name = "xml") @XmlRootElement(name = "xml")
@XmlAccessorType(XmlAccessType.FIELD) @XmlAccessorType(XmlAccessType.FIELD)

6
src/main/java/chanjarster/weixin/bean/WxXmlOutMewsMessage.java → src/main/java/me/chanjar/weixin/bean/WxXmlOutMewsMessage.java
View File

@@ -1,4 +1,4 @@
package chanjarster.weixin.bean; package me.chanjar.weixin.bean;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@@ -10,8 +10,8 @@ import javax.xml.bind.annotation.XmlElementWrapper;
import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import chanjarster.weixin.api.WxConsts; import me.chanjar.weixin.api.WxConsts;
import chanjarster.weixin.util.xml.AdapterCDATA; import me.chanjar.weixin.util.xml.AdapterCDATA;
@XmlRootElement(name = "xml") @XmlRootElement(name = "xml")
@XmlAccessorType(XmlAccessType.FIELD) @XmlAccessorType(XmlAccessType.FIELD)

6
src/main/java/chanjarster/weixin/bean/WxXmlOutMusicMessage.java → src/main/java/me/chanjar/weixin/bean/WxXmlOutMusicMessage.java
View File

@@ -1,4 +1,4 @@
package chanjarster.weixin.bean; package me.chanjar.weixin.bean;
import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAccessorType;
@@ -6,8 +6,8 @@ import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import chanjarster.weixin.api.WxConsts; import me.chanjar.weixin.api.WxConsts;
import chanjarster.weixin.util.xml.AdapterCDATA; import me.chanjar.weixin.util.xml.AdapterCDATA;
@XmlRootElement(name = "xml") @XmlRootElement(name = "xml")
@XmlAccessorType(XmlAccessType.FIELD) @XmlAccessorType(XmlAccessType.FIELD)

6
src/main/java/chanjarster/weixin/bean/WxXmlOutTextMessage.java → src/main/java/me/chanjar/weixin/bean/WxXmlOutTextMessage.java
View File

@@ -1,4 +1,4 @@
package chanjarster.weixin.bean; package me.chanjar.weixin.bean;
import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAccessorType;
@@ -6,8 +6,8 @@ import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import chanjarster.weixin.api.WxConsts; import me.chanjar.weixin.api.WxConsts;
import chanjarster.weixin.util.xml.AdapterCDATA; import me.chanjar.weixin.util.xml.AdapterCDATA;
@XmlRootElement(name = "xml") @XmlRootElement(name = "xml")
@XmlAccessorType(XmlAccessType.FIELD) @XmlAccessorType(XmlAccessType.FIELD)

6
src/main/java/chanjarster/weixin/bean/WxXmlOutVideoMessage.java → src/main/java/me/chanjar/weixin/bean/WxXmlOutVideoMessage.java
View File

@@ -1,4 +1,4 @@
package chanjarster.weixin.bean; package me.chanjar.weixin.bean;
import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAccessorType;
@@ -6,8 +6,8 @@ import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import chanjarster.weixin.api.WxConsts; import me.chanjar.weixin.api.WxConsts;
import chanjarster.weixin.util.xml.AdapterCDATA; import me.chanjar.weixin.util.xml.AdapterCDATA;
@XmlRootElement(name = "xml") @XmlRootElement(name = "xml")
@XmlAccessorType(XmlAccessType.FIELD) @XmlAccessorType(XmlAccessType.FIELD)

6
src/main/java/chanjarster/weixin/bean/WxXmlOutVoiceMessage.java → src/main/java/me/chanjar/weixin/bean/WxXmlOutVoiceMessage.java
View File

@@ -1,4 +1,4 @@
package chanjarster.weixin.bean; package me.chanjar.weixin.bean;
import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAccessorType;
@@ -6,8 +6,8 @@ import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import chanjarster.weixin.api.WxConsts; import me.chanjar.weixin.api.WxConsts;
import chanjarster.weixin.util.xml.MediaIdMarshaller; import me.chanjar.weixin.util.xml.MediaIdMarshaller;
@XmlRootElement(name = "xml") @XmlRootElement(name = "xml")
@XmlAccessorType(XmlAccessType.FIELD) @XmlAccessorType(XmlAccessType.FIELD)

4
src/main/java/chanjarster/weixin/bean/custombuilder/BaseBuilder.java → src/main/java/me/chanjar/weixin/bean/custombuilder/BaseBuilder.java
View File

@@ -1,6 +1,6 @@
package chanjarster.weixin.bean.custombuilder; package me.chanjar.weixin.bean.custombuilder;
import chanjarster.weixin.bean.WxCustomMessage; import me.chanjar.weixin.bean.WxCustomMessage;
public class BaseBuilder<T> { public class BaseBuilder<T> {
protected String msgtype; protected String msgtype;

6
src/main/java/chanjarster/weixin/bean/custombuilder/ImageBuilder.java → src/main/java/me/chanjar/weixin/bean/custombuilder/ImageBuilder.java
View File

@@ -1,7 +1,7 @@
package chanjarster.weixin.bean.custombuilder; package me.chanjar.weixin.bean.custombuilder;
import chanjarster.weixin.api.WxConsts; import me.chanjar.weixin.api.WxConsts;
import chanjarster.weixin.bean.WxCustomMessage; import me.chanjar.weixin.bean.WxCustomMessage;
/** /**
* 获得消息builder * 获得消息builder

6
src/main/java/chanjarster/weixin/bean/custombuilder/MusicBuilder.java → src/main/java/me/chanjar/weixin/bean/custombuilder/MusicBuilder.java
View File

@@ -1,7 +1,7 @@
package chanjarster.weixin.bean.custombuilder; package me.chanjar.weixin.bean.custombuilder;
import chanjarster.weixin.api.WxConsts; import me.chanjar.weixin.api.WxConsts;
import chanjarster.weixin.bean.WxCustomMessage; import me.chanjar.weixin.bean.WxCustomMessage;
/** /**
* 音乐消息builder * 音乐消息builder

9
src/main/java/chanjarster/weixin/bean/custombuilder/NewsBuilder.java → src/main/java/me/chanjar/weixin/bean/custombuilder/NewsBuilder.java
View File

@@ -1,11 +1,10 @@
package chanjarster.weixin.bean.custombuilder; package me.chanjar.weixin.bean.custombuilder;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import chanjarster.weixin.api.WxConsts; import me.chanjar.weixin.api.WxConsts;
import chanjarster.weixin.bean.WxCustomMessage; import me.chanjar.weixin.bean.WxCustomMessage;
import chanjarster.weixin.bean.WxCustomMessage.WxArticle;
/** /**
* 图文消息builder * 图文消息builder
@@ -18,7 +17,7 @@ import chanjarster.weixin.bean.WxCustomMessage.WxArticle;
*/ */
public final class NewsBuilder extends BaseBuilder<NewsBuilder> { public final class NewsBuilder extends BaseBuilder<NewsBuilder> {
private List<WxArticle> articles = new ArrayList<WxArticle>(); private List<WxCustomMessage.WxArticle> articles = new ArrayList<WxCustomMessage.WxArticle>();
public NewsBuilder() { public NewsBuilder() {
this.msgtype = WxConsts.CUSTOM_MSG_NEWS; this.msgtype = WxConsts.CUSTOM_MSG_NEWS;

6
src/main/java/chanjarster/weixin/bean/custombuilder/TextBuilder.java → src/main/java/me/chanjar/weixin/bean/custombuilder/TextBuilder.java
View File

@@ -1,7 +1,7 @@
package chanjarster.weixin.bean.custombuilder; package me.chanjar.weixin.bean.custombuilder;
import chanjarster.weixin.api.WxConsts; import me.chanjar.weixin.api.WxConsts;
import chanjarster.weixin.bean.WxCustomMessage; import me.chanjar.weixin.bean.WxCustomMessage;
/** /**
* 文本消息builder * 文本消息builder

6
src/main/java/chanjarster/weixin/bean/custombuilder/VideoBuilder.java → src/main/java/me/chanjar/weixin/bean/custombuilder/VideoBuilder.java
View File

@@ -1,7 +1,7 @@
package chanjarster.weixin.bean.custombuilder; package me.chanjar.weixin.bean.custombuilder;
import chanjarster.weixin.api.WxConsts; import me.chanjar.weixin.api.WxConsts;
import chanjarster.weixin.bean.WxCustomMessage; import me.chanjar.weixin.bean.WxCustomMessage;
/** /**
* 视频消息builder * 视频消息builder

6
src/main/java/chanjarster/weixin/bean/custombuilder/VoiceBuilder.java → src/main/java/me/chanjar/weixin/bean/custombuilder/VoiceBuilder.java
View File

@@ -1,7 +1,7 @@
package chanjarster.weixin.bean.custombuilder; package me.chanjar.weixin.bean.custombuilder;
import chanjarster.weixin.api.WxConsts; import me.chanjar.weixin.api.WxConsts;
import chanjarster.weixin.bean.WxCustomMessage; import me.chanjar.weixin.bean.WxCustomMessage;
/** /**
* 语音消息builder * 语音消息builder

4
src/main/java/chanjarster/weixin/bean/outxmlbuilder/BaseBuilder.java → src/main/java/me/chanjar/weixin/bean/outxmlbuilder/BaseBuilder.java
View File

@@ -1,6 +1,6 @@
package chanjarster.weixin.bean.outxmlbuilder; package me.chanjar.weixin.bean.outxmlbuilder;
import chanjarster.weixin.bean.WxXmlOutMessage; import me.chanjar.weixin.bean.WxXmlOutMessage;
public abstract class BaseBuilder<BuilderType, ValueType> { public abstract class BaseBuilder<BuilderType, ValueType> {

4
src/main/java/chanjarster/weixin/bean/outxmlbuilder/ImageBuilder.java → src/main/java/me/chanjar/weixin/bean/outxmlbuilder/ImageBuilder.java
View File

@@ -1,6 +1,6 @@
package chanjarster.weixin.bean.outxmlbuilder; package me.chanjar.weixin.bean.outxmlbuilder;
import chanjarster.weixin.bean.WxXmlOutImageMessage; import me.chanjar.weixin.bean.WxXmlOutImageMessage;
/** /**
* 图片消息builder * 图片消息builder

4
src/main/java/chanjarster/weixin/bean/outxmlbuilder/MusicBuilder.java → src/main/java/me/chanjar/weixin/bean/outxmlbuilder/MusicBuilder.java
View File

@@ -1,6 +1,6 @@
package chanjarster.weixin.bean.outxmlbuilder; package me.chanjar.weixin.bean.outxmlbuilder;
import chanjarster.weixin.bean.WxXmlOutMusicMessage; import me.chanjar.weixin.bean.WxXmlOutMusicMessage;
/** /**
* 音乐消息builder * 音乐消息builder

6
src/main/java/chanjarster/weixin/bean/outxmlbuilder/NewsBuilder.java → src/main/java/me/chanjar/weixin/bean/outxmlbuilder/NewsBuilder.java
View File

@@ -1,10 +1,10 @@
package chanjarster.weixin.bean.outxmlbuilder; package me.chanjar.weixin.bean.outxmlbuilder;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import chanjarster.weixin.bean.WxXmlOutMewsMessage; import me.chanjar.weixin.bean.WxXmlOutMewsMessage;
import chanjarster.weixin.bean.WxXmlOutMewsMessage.Item; import me.chanjar.weixin.bean.WxXmlOutMewsMessage.Item;
/** /**
* 图文消息builder * 图文消息builder

4
src/main/java/chanjarster/weixin/bean/outxmlbuilder/TextBuilder.java → src/main/java/me/chanjar/weixin/bean/outxmlbuilder/TextBuilder.java
View File

@@ -1,6 +1,6 @@
package chanjarster.weixin.bean.outxmlbuilder; package me.chanjar.weixin.bean.outxmlbuilder;
import chanjarster.weixin.bean.WxXmlOutTextMessage; import me.chanjar.weixin.bean.WxXmlOutTextMessage;
/** /**
* 文本消息builder * 文本消息builder

4
src/main/java/chanjarster/weixin/bean/outxmlbuilder/VideoBuilder.java → src/main/java/me/chanjar/weixin/bean/outxmlbuilder/VideoBuilder.java
View File

@@ -1,6 +1,6 @@
package chanjarster.weixin.bean.outxmlbuilder; package me.chanjar.weixin.bean.outxmlbuilder;
import chanjarster.weixin.bean.WxXmlOutVideoMessage; import me.chanjar.weixin.bean.WxXmlOutVideoMessage;
/** /**
* 视频消息builder * 视频消息builder

4
src/main/java/chanjarster/weixin/bean/outxmlbuilder/VoiceBuilder.java → src/main/java/me/chanjar/weixin/bean/outxmlbuilder/VoiceBuilder.java
View File

@@ -1,6 +1,6 @@
package chanjarster.weixin.bean.outxmlbuilder; package me.chanjar.weixin.bean.outxmlbuilder;
import chanjarster.weixin.bean.WxXmlOutVoiceMessage; import me.chanjar.weixin.bean.WxXmlOutVoiceMessage;
/** /**
* 语音消息builder * 语音消息builder

4
src/main/java/chanjarster/weixin/bean/result/WxError.java → src/main/java/me/chanjar/weixin/bean/result/WxError.java
View File

@@ -1,9 +1,9 @@
package chanjarster.weixin.bean.result; package me.chanjar.weixin.bean.result;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import chanjarster.weixin.util.json.WxGsonBuilder; import me.chanjar.weixin.util.json.WxGsonBuilder;
/** /**
* 微信错误码说明 * 微信错误码说明

4
src/main/java/chanjarster/weixin/bean/result/WxMassSendResult.java → src/main/java/me/chanjar/weixin/bean/result/WxMassSendResult.java
View File

@@ -1,6 +1,6 @@
package chanjarster.weixin.bean.result; package me.chanjar.weixin.bean.result;
import chanjarster.weixin.util.json.WxGsonBuilder; import me.chanjar.weixin.util.json.WxGsonBuilder;
/** /**
* <pre> * <pre>

4
src/main/java/chanjarster/weixin/bean/result/WxMassUploadResult.java → src/main/java/me/chanjar/weixin/bean/result/WxMassUploadResult.java
View File

@@ -1,6 +1,6 @@
package chanjarster.weixin.bean.result; package me.chanjar.weixin.bean.result;
import chanjarster.weixin.util.json.WxGsonBuilder; import me.chanjar.weixin.util.json.WxGsonBuilder;
/** /**
* <pre> * <pre>

4
src/main/java/chanjarster/weixin/bean/result/WxMediaUploadResult.java → src/main/java/me/chanjar/weixin/bean/result/WxMediaUploadResult.java
View File

@@ -1,6 +1,6 @@
package chanjarster.weixin.bean.result; package me.chanjar.weixin.bean.result;
import chanjarster.weixin.util.json.WxGsonBuilder; import me.chanjar.weixin.util.json.WxGsonBuilder;
public class WxMediaUploadResult { public class WxMediaUploadResult {

4
src/main/java/chanjarster/weixin/bean/result/WxQrCodeTicket.java → src/main/java/me/chanjar/weixin/bean/result/WxQrCodeTicket.java
View File

@@ -1,6 +1,6 @@
package chanjarster.weixin.bean.result; package me.chanjar.weixin.bean.result;
import chanjarster.weixin.util.json.WxGsonBuilder; import me.chanjar.weixin.util.json.WxGsonBuilder;
/** /**
* 换取二维码的Ticket * 换取二维码的Ticket

4
src/main/java/chanjarster/weixin/bean/result/WxUser.java → src/main/java/me/chanjar/weixin/bean/result/WxUser.java
View File

@@ -1,6 +1,6 @@
package chanjarster.weixin.bean.result; package me.chanjar.weixin.bean.result;
import chanjarster.weixin.util.json.WxGsonBuilder; import me.chanjar.weixin.util.json.WxGsonBuilder;
/** /**
* 微信用户信息 * 微信用户信息

4
src/main/java/chanjarster/weixin/bean/result/WxUserList.java → src/main/java/me/chanjar/weixin/bean/result/WxUserList.java
View File

@@ -1,9 +1,9 @@
package chanjarster.weixin.bean.result; package me.chanjar.weixin.bean.result;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import chanjarster.weixin.util.json.WxGsonBuilder; import me.chanjar.weixin.util.json.WxGsonBuilder;
/** /**

4
src/main/java/chanjarster/weixin/exception/WxErrorException.java → src/main/java/me/chanjar/weixin/exception/WxErrorException.java
View File

@@ -1,6 +1,6 @@
package chanjarster.weixin.exception; package me.chanjar.weixin.exception;
import chanjarster.weixin.bean.result.WxError; import me.chanjar.weixin.bean.result.WxError;
public class WxErrorException extends Exception { public class WxErrorException extends Exception {

2
src/main/java/chanjarster/weixin/util/fs/FileUtils.java → src/main/java/me/chanjar/weixin/util/fs/FileUtils.java
View File

@@ -1,4 +1,4 @@
package chanjarster.weixin.util.fs; package me.chanjar.weixin.util.fs;
import java.io.File; import java.io.File;
import java.io.FileOutputStream; import java.io.FileOutputStream;

2
src/main/java/chanjarster/weixin/util/http/InputStreamResponseHandler.java → src/main/java/me/chanjar/weixin/util/http/InputStreamResponseHandler.java
View File

@@ -1,4 +1,4 @@
package chanjarster.weixin.util.http; package me.chanjar.weixin.util.http;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;

8
src/main/java/chanjarster/weixin/util/http/MediaDownloadRequestExecutor.java → src/main/java/me/chanjar/weixin/util/http/MediaDownloadRequestExecutor.java
View File

@@ -1,4 +1,4 @@
package chanjarster.weixin.util.http; package me.chanjar.weixin.util.http;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
@@ -13,9 +13,9 @@ import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpGet; import org.apache.http.client.methods.HttpGet;
import org.apache.http.entity.ContentType; import org.apache.http.entity.ContentType;
import chanjarster.weixin.bean.result.WxError; import me.chanjar.weixin.bean.result.WxError;
import chanjarster.weixin.exception.WxErrorException; import me.chanjar.weixin.exception.WxErrorException;
import chanjarster.weixin.util.fs.FileUtils; import me.chanjar.weixin.util.fs.FileUtils;
/** /**
* 下载媒体文件请求执行器，请求的参数是String, 返回的结果是File * 下载媒体文件请求执行器，请求的参数是String, 返回的结果是File

8
src/main/java/chanjarster/weixin/util/http/MediaUploadRequestExecutor.java → src/main/java/me/chanjar/weixin/util/http/MediaUploadRequestExecutor.java
View File

@@ -1,4 +1,4 @@
package chanjarster.weixin.util.http; package me.chanjar.weixin.util.http;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
@@ -10,9 +10,9 @@ import org.apache.http.client.methods.HttpPost;
import org.apache.http.entity.ContentType; import org.apache.http.entity.ContentType;
import org.apache.http.entity.mime.MultipartEntityBuilder; import org.apache.http.entity.mime.MultipartEntityBuilder;
import chanjarster.weixin.bean.result.WxError; import me.chanjar.weixin.bean.result.WxError;
import chanjarster.weixin.bean.result.WxMediaUploadResult; import me.chanjar.weixin.bean.result.WxMediaUploadResult;
import chanjarster.weixin.exception.WxErrorException; import me.chanjar.weixin.exception.WxErrorException;
/** /**
* 上传媒体文件请求执行器，请求的参数是File, 返回的结果是String * 上传媒体文件请求执行器，请求的参数是File, 返回的结果是String

10
src/main/java/chanjarster/weixin/util/http/QrCodeRequestExecutor.java → src/main/java/me/chanjar/weixin/util/http/QrCodeRequestExecutor.java
View File

@@ -1,4 +1,4 @@
package chanjarster.weixin.util.http; package me.chanjar.weixin.util.http;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
@@ -12,10 +12,10 @@ import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpGet; import org.apache.http.client.methods.HttpGet;
import org.apache.http.entity.ContentType; import org.apache.http.entity.ContentType;
import chanjarster.weixin.bean.result.WxError; import me.chanjar.weixin.bean.result.WxError;
import chanjarster.weixin.bean.result.WxQrCodeTicket; import me.chanjar.weixin.bean.result.WxQrCodeTicket;
import chanjarster.weixin.exception.WxErrorException; import me.chanjar.weixin.exception.WxErrorException;
import chanjarster.weixin.util.fs.FileUtils; import me.chanjar.weixin.util.fs.FileUtils;
/** /**
* 获得QrCode图片 请求执行器 * 获得QrCode图片 请求执行器

4
src/main/java/chanjarster/weixin/util/http/RequestExecutor.java → src/main/java/me/chanjar/weixin/util/http/RequestExecutor.java
View File

@@ -1,4 +1,4 @@
package chanjarster.weixin.util.http; package me.chanjar.weixin.util.http;
import java.io.IOException; import java.io.IOException;
@@ -6,7 +6,7 @@ import org.apache.http.client.ClientProtocolException;
import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients; import org.apache.http.impl.client.HttpClients;
import chanjarster.weixin.exception.WxErrorException; import me.chanjar.weixin.exception.WxErrorException;
/** /**
* http请求执行器 * http请求执行器

6
src/main/java/chanjarster/weixin/util/http/SimpleGetRequestExecutor.java → src/main/java/me/chanjar/weixin/util/http/SimpleGetRequestExecutor.java
View File

@@ -1,4 +1,4 @@
package chanjarster.weixin.util.http; package me.chanjar.weixin.util.http;
import java.io.IOException; import java.io.IOException;
@@ -6,8 +6,8 @@ import org.apache.http.client.ClientProtocolException;
import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpGet; import org.apache.http.client.methods.HttpGet;
import chanjarster.weixin.bean.result.WxError; import me.chanjar.weixin.bean.result.WxError;
import chanjarster.weixin.exception.WxErrorException; import me.chanjar.weixin.exception.WxErrorException;
/** /**
* 简单的GET请求执行器，请求的参数是String, 返回的结果也是String * 简单的GET请求执行器，请求的参数是String, 返回的结果也是String

7
src/main/java/chanjarster/weixin/util/http/SimplePostRequestExecutor.java → src/main/java/me/chanjar/weixin/util/http/SimplePostRequestExecutor.java
View File

@@ -1,16 +1,15 @@
package chanjarster.weixin.util.http; package me.chanjar.weixin.util.http;
import java.io.IOException; import java.io.IOException;
import me.chanjar.weixin.bean.result.WxError;
import me.chanjar.weixin.exception.WxErrorException;
import org.apache.http.Consts; import org.apache.http.Consts;
import org.apache.http.client.ClientProtocolException; import org.apache.http.client.ClientProtocolException;
import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpPost; import org.apache.http.client.methods.HttpPost;
import org.apache.http.entity.StringEntity; import org.apache.http.entity.StringEntity;
import chanjarster.weixin.bean.result.WxError;
import chanjarster.weixin.exception.WxErrorException;
/** /**
* 简单的POST请求执行器，请求的参数是String, 返回的结果也是String * 简单的POST请求执行器，请求的参数是String, 返回的结果也是String
* @author chanjarster * @author chanjarster

2
src/main/java/chanjarster/weixin/util/http/Utf8ResponseHandler.java → src/main/java/me/chanjar/weixin/util/http/Utf8ResponseHandler.java
View File

@@ -1,4 +1,4 @@
package chanjarster.weixin.util.http; package me.chanjar.weixin.util.http;
import java.io.IOException; import java.io.IOException;

2
src/main/java/chanjarster/weixin/util/json/GsonHelper.java → src/main/java/me/chanjar/weixin/util/json/GsonHelper.java
View File

@@ -6,7 +6,7 @@
* arose from modification of the original source, or other redistribution of this source * arose from modification of the original source, or other redistribution of this source
* is not permitted without written permission of the KINGSTAR MEDIA SOLUTIONS LTD. * is not permitted without written permission of the KINGSTAR MEDIA SOLUTIONS LTD.
*/ */
package chanjarster.weixin.util.json; package me.chanjar.weixin.util.json;
import com.google.gson.JsonElement; import com.google.gson.JsonElement;

9
src/main/java/chanjarster/weixin/util/json/WxCustomMessageGsonAdapter.java → src/main/java/me/chanjar/weixin/util/json/WxCustomMessageGsonAdapter.java
View File

@@ -6,13 +6,12 @@
* arose from modification of the original source, or other redistribution of this source * arose from modification of the original source, or other redistribution of this source
* is not permitted without written permission of the KINGSTAR MEDIA SOLUTIONS LTD. * is not permitted without written permission of the KINGSTAR MEDIA SOLUTIONS LTD.
*/ */
package chanjarster.weixin.util.json; package me.chanjar.weixin.util.json;
import java.lang.reflect.Type; import java.lang.reflect.Type;
import chanjarster.weixin.api.WxConsts; import me.chanjar.weixin.api.WxConsts;
import chanjarster.weixin.bean.WxCustomMessage; import me.chanjar.weixin.bean.WxCustomMessage;
import chanjarster.weixin.bean.WxCustomMessage.WxArticle;
import com.google.gson.JsonArray; import com.google.gson.JsonArray;
import com.google.gson.JsonElement; import com.google.gson.JsonElement;
@@ -71,7 +70,7 @@ public class WxCustomMessageGsonAdapter implements JsonSerializer<WxCustomMessag
if (WxConsts.CUSTOM_MSG_NEWS.equals(message.getMsgtype())) { if (WxConsts.CUSTOM_MSG_NEWS.equals(message.getMsgtype())) {
JsonArray articleJsonArray = new JsonArray(); JsonArray articleJsonArray = new JsonArray();
for (WxArticle article : message.getArticles()) { for (WxCustomMessage.WxArticle article : message.getArticles()) {
JsonObject articleJson = new JsonObject(); JsonObject articleJson = new JsonObject();
articleJson.addProperty("title", article.getTitle()); articleJson.addProperty("title", article.getTitle());
articleJson.addProperty("description", article.getDescription()); articleJson.addProperty("description", article.getDescription());

4
src/main/java/chanjarster/weixin/util/json/WxGroupGsonAdapter.java → src/main/java/me/chanjar/weixin/util/json/WxGroupGsonAdapter.java
View File

@@ -6,11 +6,11 @@
* arose from modification of the original source, or other redistribution of this source * arose from modification of the original source, or other redistribution of this source
* is not permitted without written permission of the KINGSTAR MEDIA SOLUTIONS LTD. * is not permitted without written permission of the KINGSTAR MEDIA SOLUTIONS LTD.
*/ */
package chanjarster.weixin.util.json; package me.chanjar.weixin.util.json;
import java.lang.reflect.Type; import java.lang.reflect.Type;
import chanjarster.weixin.bean.WxGroup; import me.chanjar.weixin.bean.WxGroup;
import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonDeserializationContext;
import com.google.gson.JsonDeserializer; import com.google.gson.JsonDeserializer;

18
src/main/java/chanjarster/weixin/util/json/WxGsonBuilder.java → src/main/java/me/chanjar/weixin/util/json/WxGsonBuilder.java
View File

@@ -1,13 +1,13 @@
package chanjarster.weixin.util.json; package me.chanjar.weixin.util.json;
import chanjarster.weixin.bean.WxCustomMessage; import me.chanjar.weixin.bean.WxCustomMessage;
import chanjarster.weixin.bean.WxGroup; import me.chanjar.weixin.bean.WxGroup;
import chanjarster.weixin.bean.WxMassGroupMessage; import me.chanjar.weixin.bean.WxMassGroupMessage;
import chanjarster.weixin.bean.WxMassNews; import me.chanjar.weixin.bean.WxMassNews;
import chanjarster.weixin.bean.WxMassOpenIdsMessage; import me.chanjar.weixin.bean.WxMassOpenIdsMessage;
import chanjarster.weixin.bean.WxMenu; import me.chanjar.weixin.bean.WxMenu;
import chanjarster.weixin.bean.result.WxUser; import me.chanjar.weixin.bean.result.WxUser;
import chanjarster.weixin.bean.result.WxUserList; import me.chanjar.weixin.bean.result.WxUserList;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.google.gson.GsonBuilder; import com.google.gson.GsonBuilder;

6
src/main/java/chanjarster/weixin/util/json/WxMassMessageGsonAdapter.java → src/main/java/me/chanjar/weixin/util/json/WxMassMessageGsonAdapter.java
View File

@@ -6,12 +6,12 @@
* arose from modification of the original source, or other redistribution of this source * arose from modification of the original source, or other redistribution of this source
* is not permitted without written permission of the KINGSTAR MEDIA SOLUTIONS LTD. * is not permitted without written permission of the KINGSTAR MEDIA SOLUTIONS LTD.
*/ */
package chanjarster.weixin.util.json; package me.chanjar.weixin.util.json;
import java.lang.reflect.Type; import java.lang.reflect.Type;
import chanjarster.weixin.api.WxConsts; import me.chanjar.weixin.api.WxConsts;
import chanjarster.weixin.bean.WxMassGroupMessage; import me.chanjar.weixin.bean.WxMassGroupMessage;
import com.google.gson.JsonElement; import com.google.gson.JsonElement;
import com.google.gson.JsonObject; import com.google.gson.JsonObject;

7
src/main/java/chanjarster/weixin/util/json/WxMassNewsGsonAdapter.java → src/main/java/me/chanjar/weixin/util/json/WxMassNewsGsonAdapter.java
View File

@@ -6,12 +6,11 @@
* arose from modification of the original source, or other redistribution of this source * arose from modification of the original source, or other redistribution of this source
* is not permitted without written permission of the KINGSTAR MEDIA SOLUTIONS LTD. * is not permitted without written permission of the KINGSTAR MEDIA SOLUTIONS LTD.
*/ */
package chanjarster.weixin.util.json; package me.chanjar.weixin.util.json;
import java.lang.reflect.Type; import java.lang.reflect.Type;
import chanjarster.weixin.bean.WxMassNews; import me.chanjar.weixin.bean.WxMassNews;
import chanjarster.weixin.bean.WxMassNews.WxMassNewsArticle;
import com.google.gson.JsonArray; import com.google.gson.JsonArray;
import com.google.gson.JsonElement; import com.google.gson.JsonElement;
@@ -30,7 +29,7 @@ public class WxMassNewsGsonAdapter implements JsonSerializer<WxMassNews> {
JsonObject newsJson = new JsonObject(); JsonObject newsJson = new JsonObject();
JsonArray articleJsonArray = new JsonArray(); JsonArray articleJsonArray = new JsonArray();
for (WxMassNewsArticle article : message.getArticles()) { for (WxMassNews.WxMassNewsArticle article : message.getArticles()) {
JsonObject articleJson = new JsonObject(); JsonObject articleJson = new JsonObject();
articleJson.addProperty("thumb_media_id", article.getThumb_media_id()); articleJson.addProperty("thumb_media_id", article.getThumb_media_id());
articleJson.addProperty("title", article.getTitle()); articleJson.addProperty("title", article.getTitle());

6
src/main/java/chanjarster/weixin/util/json/WxMassOpenIdsMessageGsonAdapter.java → src/main/java/me/chanjar/weixin/util/json/WxMassOpenIdsMessageGsonAdapter.java
View File

@@ -6,12 +6,12 @@
* arose from modification of the original source, or other redistribution of this source * arose from modification of the original source, or other redistribution of this source
* is not permitted without written permission of the KINGSTAR MEDIA SOLUTIONS LTD. * is not permitted without written permission of the KINGSTAR MEDIA SOLUTIONS LTD.
*/ */
package chanjarster.weixin.util.json; package me.chanjar.weixin.util.json;
import java.lang.reflect.Type; import java.lang.reflect.Type;
import chanjarster.weixin.api.WxConsts; import me.chanjar.weixin.api.WxConsts;
import chanjarster.weixin.bean.WxMassOpenIdsMessage; import me.chanjar.weixin.bean.WxMassOpenIdsMessage;
import com.google.gson.JsonArray; import com.google.gson.JsonArray;
import com.google.gson.JsonElement; import com.google.gson.JsonElement;

17
src/main/java/chanjarster/weixin/util/json/WxMenuGsonAdapter.java → src/main/java/me/chanjar/weixin/util/json/WxMenuGsonAdapter.java
View File

@@ -6,12 +6,11 @@
* arose from modification of the original source, or other redistribution of this source * arose from modification of the original source, or other redistribution of this source
* is not permitted without written permission of the KINGSTAR MEDIA SOLUTIONS LTD. * is not permitted without written permission of the KINGSTAR MEDIA SOLUTIONS LTD.
*/ */
package chanjarster.weixin.util.json; package me.chanjar.weixin.util.json;
import java.lang.reflect.Type; import java.lang.reflect.Type;
import chanjarster.weixin.bean.WxMenu; import me.chanjar.weixin.bean.WxMenu;
import chanjarster.weixin.bean.WxMenu.WxMenuButton;
import com.google.gson.JsonArray; import com.google.gson.JsonArray;
import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonDeserializationContext;
@@ -33,7 +32,7 @@ public class WxMenuGsonAdapter implements JsonSerializer<WxMenu>, JsonDeserializ
JsonObject json = new JsonObject(); JsonObject json = new JsonObject();
JsonArray buttonArray = new JsonArray(); JsonArray buttonArray = new JsonArray();
for (WxMenuButton button : menu.getButton()) { for (WxMenu.WxMenuButton button : menu.getButton()) {
JsonObject buttonJson = convertToJson(button); JsonObject buttonJson = convertToJson(button);
buttonArray.add(buttonJson); buttonArray.add(buttonJson);
} }
@@ -42,7 +41,7 @@ public class WxMenuGsonAdapter implements JsonSerializer<WxMenu>, JsonDeserializ
return json; return json;
} }
protected JsonObject convertToJson(WxMenuButton button) { protected JsonObject convertToJson(WxMenu.WxMenuButton button) {
JsonObject buttonJson = new JsonObject(); JsonObject buttonJson = new JsonObject();
buttonJson.addProperty("type", button.getType()); buttonJson.addProperty("type", button.getType());
buttonJson.addProperty("name", button.getName()); buttonJson.addProperty("name", button.getName());
@@ -50,7 +49,7 @@ public class WxMenuGsonAdapter implements JsonSerializer<WxMenu>, JsonDeserializ
buttonJson.addProperty("url", button.getUrl()); buttonJson.addProperty("url", button.getUrl());
if (button.getSub_button() != null && button.getSub_button().size() > 0) { if (button.getSub_button() != null && button.getSub_button().size() > 0) {
JsonArray buttonArray = new JsonArray(); JsonArray buttonArray = new JsonArray();
for (WxMenuButton sub_button : button.getSub_button()) { for (WxMenu.WxMenuButton sub_button : button.getSub_button()) {
buttonArray.add(convertToJson(sub_button)); buttonArray.add(convertToJson(sub_button));
} }
buttonJson.add("sub_button", buttonArray); buttonJson.add("sub_button", buttonArray);
@@ -69,7 +68,7 @@ public class WxMenuGsonAdapter implements JsonSerializer<WxMenu>, JsonDeserializ
JsonArray buttonsJson = menuJson.get("button").getAsJsonArray(); JsonArray buttonsJson = menuJson.get("button").getAsJsonArray();
for (int i = 0; i < buttonsJson.size(); i++) { for (int i = 0; i < buttonsJson.size(); i++) {
JsonObject buttonJson = buttonsJson.get(i).getAsJsonObject(); JsonObject buttonJson = buttonsJson.get(i).getAsJsonObject();
WxMenuButton button = convertFromJson(buttonJson); WxMenu.WxMenuButton button = convertFromJson(buttonJson);
menu.getButton().add(button); menu.getButton().add(button);
if (buttonJson.get("sub_button") == null || buttonJson.get("sub_button").isJsonNull()) { if (buttonJson.get("sub_button") == null || buttonJson.get("sub_button").isJsonNull()) {
continue; continue;
@@ -83,8 +82,8 @@ public class WxMenuGsonAdapter implements JsonSerializer<WxMenu>, JsonDeserializ
return menu; return menu;
} }
protected WxMenuButton convertFromJson(JsonObject json) { protected WxMenu.WxMenuButton convertFromJson(JsonObject json) {
WxMenuButton button = new WxMenuButton(); WxMenu.WxMenuButton button = new WxMenu.WxMenuButton();
button.setName(GsonHelper.getString(json, "name")); button.setName(GsonHelper.getString(json, "name"));
button.setKey(GsonHelper.getString(json, "key")); button.setKey(GsonHelper.getString(json, "key"));
button.setUrl(GsonHelper.getString(json, "url")); button.setUrl(GsonHelper.getString(json, "url"));

4
src/main/java/chanjarster/weixin/util/json/WxUserGsonAdapter.java → src/main/java/me/chanjar/weixin/util/json/WxUserGsonAdapter.java
View File

@@ -6,11 +6,11 @@
* arose from modification of the original source, or other redistribution of this source * arose from modification of the original source, or other redistribution of this source
* is not permitted without written permission of the KINGSTAR MEDIA SOLUTIONS LTD. * is not permitted without written permission of the KINGSTAR MEDIA SOLUTIONS LTD.
*/ */
package chanjarster.weixin.util.json; package me.chanjar.weixin.util.json;
import java.lang.reflect.Type; import java.lang.reflect.Type;
import chanjarster.weixin.bean.result.WxUser; import me.chanjar.weixin.bean.result.WxUser;
import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonDeserializationContext;
import com.google.gson.JsonDeserializer; import com.google.gson.JsonDeserializer;

4
src/main/java/chanjarster/weixin/util/json/WxUserListGsonAdapter.java → src/main/java/me/chanjar/weixin/util/json/WxUserListGsonAdapter.java
View File

@@ -6,11 +6,11 @@
* arose from modification of the original source, or other redistribution of this source * arose from modification of the original source, or other redistribution of this source
* is not permitted without written permission of the KINGSTAR MEDIA SOLUTIONS LTD. * is not permitted without written permission of the KINGSTAR MEDIA SOLUTIONS LTD.
*/ */
package chanjarster.weixin.util.json; package me.chanjar.weixin.util.json;
import java.lang.reflect.Type; import java.lang.reflect.Type;
import chanjarster.weixin.bean.result.WxUserList; import me.chanjar.weixin.bean.result.WxUserList;
import com.google.gson.JsonArray; import com.google.gson.JsonArray;
import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonDeserializationContext;

2
src/main/java/chanjarster/weixin/util/xml/AdapterCDATA.java → src/main/java/me/chanjar/weixin/util/xml/AdapterCDATA.java
View File

@@ -1,4 +1,4 @@
package chanjarster.weixin.util.xml; package me.chanjar.weixin.util.xml;
import javax.xml.bind.annotation.adapters.XmlAdapter; import javax.xml.bind.annotation.adapters.XmlAdapter;

2
src/main/java/chanjarster/weixin/util/xml/MediaIdMarshaller.java → src/main/java/me/chanjar/weixin/util/xml/MediaIdMarshaller.java
View File

@@ -1,4 +1,4 @@
package chanjarster.weixin.util.xml; package me.chanjar.weixin.util.xml;
import javax.xml.bind.annotation.adapters.XmlAdapter; import javax.xml.bind.annotation.adapters.XmlAdapter;

2
src/main/java/chanjarster/weixin/util/xml/XmlTransformer.java → src/main/java/me/chanjar/weixin/util/xml/XmlTransformer.java
View File

@@ -1,4 +1,4 @@
package chanjarster.weixin.util.xml; package me.chanjar.weixin.util.xml;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;

6
src/test/java/chanjarster/weixin/api/ApiTestModule.java → src/test/java/me/chanjar/weixin/api/ApiTestModule.java
View File

@@ -1,4 +1,4 @@
package chanjarster.weixin.api; package me.chanjar.weixin.api;
import java.io.InputStream; 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.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement; 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.Binder;
import com.google.inject.Module; import com.google.inject.Module;

4
src/test/java/chanjarster/weixin/api/WxBaseAPITest.java → src/test/java/me/chanjar/weixin/api/WxBaseAPITest.java
View File

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

9
src/test/java/chanjarster/weixin/api/WxCustomMessageAPITest.java → src/test/java/me/chanjar/weixin/api/WxCustomMessageAPITest.java
View File

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

6
src/test/java/chanjarster/weixin/api/WxGroupAPITest.java → src/test/java/me/chanjar/weixin/api/WxGroupAPITest.java
View File

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

22
src/test/java/chanjarster/weixin/api/WxMassMessageAPITest.java → src/test/java/me/chanjar/weixin/api/WxMassMessageAPITest.java
View File

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

6
src/test/java/chanjarster/weixin/api/WxMediaAPITest.java → src/test/java/me/chanjar/weixin/api/WxMediaAPITest.java
View File

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

8
src/test/java/chanjarster/weixin/api/WxMenuAPITest.java → src/test/java/me/chanjar/weixin/api/WxMenuAPITest.java
View File

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

9
src/test/java/chanjarster/weixin/api/WxMessageRouterTest.java → src/test/java/me/chanjar/weixin/api/WxMessageRouterTest.java
View File

@@ -1,13 +1,16 @@
package chanjarster.weixin.api; package me.chanjar.weixin.api;
import java.util.Map; 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.Assert;
import org.testng.annotations.DataProvider; import org.testng.annotations.DataProvider;
import org.testng.annotations.Test; import org.testng.annotations.Test;
import chanjarster.weixin.bean.WxXmlMessage; import me.chanjar.weixin.bean.WxXmlMessage;
import chanjarster.weixin.bean.WxXmlOutMessage; import me.chanjar.weixin.bean.WxXmlOutMessage;
/** /**
* 测试消息路由器 * 测试消息路由器

6
src/test/java/chanjarster/weixin/api/WxQrCodeAPITest.java → src/test/java/me/chanjar/weixin/api/WxQrCodeAPITest.java
View File

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

4
src/test/java/chanjarster/weixin/api/WxShortUrlAPITest.java → src/test/java/me/chanjar/weixin/api/WxShortUrlAPITest.java
View File

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

10
src/test/java/chanjarster/weixin/api/WxUserAPITest.java → src/test/java/me/chanjar/weixin/api/WxUserAPITest.java
View File

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

3
src/test/java/chanjarster/weixin/bean/WxAccessTokenTest.java → src/test/java/me/chanjar/weixin/bean/WxAccessTokenTest.java
View File

@@ -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.Assert;
import org.testng.annotations.Test; import org.testng.annotations.Test;

7
src/test/java/chanjarster/weixin/bean/WxCustomMessageTest.java → src/test/java/me/chanjar/weixin/bean/WxCustomMessageTest.java
View File

@@ -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.Assert;
import org.testng.annotations.Test; import org.testng.annotations.Test;
import chanjarster.weixin.api.WxConsts; import me.chanjar.weixin.api.WxConsts;
import chanjarster.weixin.bean.WxCustomMessage.WxArticle; import me.chanjar.weixin.bean.WxCustomMessage.WxArticle;
@Test @Test
public class WxCustomMessageTest { public class WxCustomMessageTest {

4
src/test/java/chanjarster/weixin/bean/WxErrorTest.java → src/test/java/me/chanjar/weixin/bean/WxErrorTest.java
View File

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

5
src/test/java/chanjarster/weixin/bean/WxMenuTest.java → src/test/java/me/chanjar/weixin/bean/WxMenuTest.java
View File

@@ -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.Assert;
import org.testng.annotations.DataProvider; import org.testng.annotations.DataProvider;
import org.testng.annotations.Test; import org.testng.annotations.Test;
import chanjarster.weixin.bean.WxMenu.WxMenuButton; import me.chanjar.weixin.bean.WxMenu.WxMenuButton;
@Test @Test
public class WxMenuTest { public class WxMenuTest {

5
src/test/java/chanjarster/weixin/bean/WxXmlMessageTest.java → src/test/java/me/chanjar/weixin/bean/WxXmlMessageTest.java
View File

@@ -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.Assert;
import org.testng.annotations.Test; import org.testng.annotations.Test;
import chanjarster.weixin.api.WxConsts; import me.chanjar.weixin.api.WxConsts;
@Test @Test
public class WxXmlMessageTest { public class WxXmlMessageTest {

4
src/test/java/chanjarster/weixin/bean/WxXmlOutIMusicMessageTest.java → src/test/java/me/chanjar/weixin/bean/WxXmlOutIMusicMessageTest.java
View File

@@ -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.Assert;
import org.testng.annotations.Test; import org.testng.annotations.Test;

4
src/test/java/chanjarster/weixin/bean/WxXmlOutINewsMessageTest.java → src/test/java/me/chanjar/weixin/bean/WxXmlOutINewsMessageTest.java
View File

@@ -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.Assert;
import org.testng.annotations.Test; import org.testng.annotations.Test;

4
src/test/java/chanjarster/weixin/bean/WxXmlOutIVideoMessageTest.java → src/test/java/me/chanjar/weixin/bean/WxXmlOutIVideoMessageTest.java
View File

@@ -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.Assert;
import org.testng.annotations.Test; import org.testng.annotations.Test;

4
src/test/java/chanjarster/weixin/bean/WxXmlOutIVoiceMessageTest.java → src/test/java/me/chanjar/weixin/bean/WxXmlOutIVoiceMessageTest.java
View File

@@ -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.Assert;
import org.testng.annotations.Test; import org.testng.annotations.Test;

4
src/test/java/chanjarster/weixin/bean/WxXmlOutImageMessageTest.java → src/test/java/me/chanjar/weixin/bean/WxXmlOutImageMessageTest.java
View File

@@ -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.Assert;
import org.testng.annotations.Test; import org.testng.annotations.Test;

4
src/test/java/chanjarster/weixin/bean/WxXmlOutTextMessageTest.java → src/test/java/me/chanjar/weixin/bean/WxXmlOutTextMessageTest.java
View File

@@ -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.Assert;
import org.testng.annotations.Test; import org.testng.annotations.Test;

42
src/test/resources/testng.xml
View File

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