lsm/weixin-java-tools
1
0
Fork 0
mirror of https://gitee.com/binary/weixin-java-tools.git synced 2026-03-10 00:13:40 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

整理及重构

Browse Source
This commit is contained in:
Daniel Qian
2014-10-22 10:29:47 +08:00
parent 67795a092d
commit a8f5d07ff3
212 changed files with 1701 additions and 3459 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxConfigStorage.java → weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpConfigStorage.java
View File

@@ -1,13 +1,13 @@
package me.chanjar.weixin.mp.api;
import me.chanjar.weixin.mp.bean.WxAccessToken;
import me.chanjar.weixin.common.bean.WxAccessToken;
/**
* 微信客户端配置存储
* @author chanjarster
*
*/
public interface WxConfigStorage {
public interface WxMpConfigStorage {
public void updateAccessToken(WxAccessToken accessToken);

2
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxConsts.java → weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpConsts.java
View File

@@ -3,7 +3,7 @@ package me.chanjar.weixin.mp.api;
import java.util.HashMap;
import java.util.Map;
public class WxConsts {
public class WxMpConsts {
///////////////////////
// 微信推送过来的消息的类型，和发送给微信xml格式消息的消息类型

4
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxInMemoryConfigStorage.java → weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpInMemoryConfigStorage.java
View File

@@ -1,13 +1,13 @@
package me.chanjar.weixin.mp.api;
import me.chanjar.weixin.mp.bean.WxAccessToken;
import me.chanjar.weixin.common.bean.WxAccessToken;
/**
* 基于内存的微信配置provider，在实际生产环境中应该将这些配置持久化
* @author chanjarster
*
*/
public class WxInMemoryConfigStorage implements WxConfigStorage {
public class WxMpInMemoryConfigStorage implements WxMpConfigStorage {
protected String appId;
protected String secret;

10
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMessageHandler.java → weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMessageHandler.java
View File

@@ -1,16 +1,16 @@
package me.chanjar.weixin.mp.api;
import java.util.Map;
import me.chanjar.weixin.mp.bean.WxMpXmlMessage;
import me.chanjar.weixin.mp.bean.WxMpXmlOutMessage;
import me.chanjar.weixin.mp.bean.WxXmlMessage;
import me.chanjar.weixin.mp.bean.WxXmlOutMessage;
import java.util.Map;
/**
* 处理微信推送消息的处理器接口
* @author chanjarster
*
*/
public interface WxMessageHandler {
public interface WxMpMessageHandler {
/**
*
@@ -18,6 +18,6 @@ public interface WxMessageHandler {
* @param context 上下文，如果handler或interceptor之间有信息要传递，可以用这个
* @return xml格式的消息，如果在异步规则里处理的话，可以返回null
*/
public WxXmlOutMessage handle(WxXmlMessage wxMessage, Map<String, Object> context);
public WxMpXmlOutMessage handle(WxMpXmlMessage wxMessage, Map<String, Object> context);
}

8
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMessageInterceptor.java → weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMessageInterceptor.java
View File

@@ -1,15 +1,15 @@
package me.chanjar.weixin.mp.api;
import java.util.Map;
import me.chanjar.weixin.mp.bean.WxMpXmlMessage;
import me.chanjar.weixin.mp.bean.WxXmlMessage;
import java.util.Map;
/**
* 微信消息拦截器，可以用来做验证
* @author qianjia
*
*/
public interface WxMessageInterceptor {
public interface WxMpMessageInterceptor {
/**
* 拦截微信消息
@@ -17,6 +17,6 @@ public interface WxMessageInterceptor {
* @param context 上下文，如果handler或interceptor之间有信息要传递，可以用这个
* @return true代表OK，false代表不OK
*/
public boolean intercept(WxXmlMessage wxMessage, Map<String, Object> context);
public boolean intercept(WxMpXmlMessage wxMessage, Map<String, Object> context);
}

52
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMessageRouter.java → weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMessageRouter.java
View File

@@ -1,5 +1,8 @@
package me.chanjar.weixin.mp.api;
import me.chanjar.weixin.mp.bean.WxMpXmlMessage;
import me.chanjar.weixin.mp.bean.WxMpXmlOutMessage;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -8,9 +11,6 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.regex.Pattern;
import me.chanjar.weixin.mp.bean.WxXmlMessage;
import me.chanjar.weixin.mp.bean.WxXmlOutMessage;
/**
* <pre>
* 微信消息路由器，通过代码化的配置，把来自微信的消息交给handler处理
@@ -21,7 +21,7 @@ import me.chanjar.weixin.mp.bean.WxXmlOutMessage;
* 3. 规则的结束必须用{@link Rule#end()}或者{@link Rule#next()}，否则不会生效
*
* 使用方法：
* WxMessageRouter router = new WxMessageRouter();
* WxMpMessageRouter router = new WxMpMessageRouter();
* router
* .rule()
* .msgType("MSG_TYPE").event("EVENT").eventKey("EVENT_KEY").content("CONTENT")
@@ -39,7 +39,7 @@ import me.chanjar.weixin.mp.bean.WxXmlOutMessage;
* @author qianjia
*
*/
public class WxMessageRouter {
public class WxMpMessageRouter {
private final List<Rule> rules = new ArrayList<Rule>();
@@ -57,7 +57,7 @@ public class WxMessageRouter {
* 处理微信消息
* @param wxMessage
*/
public WxXmlOutMessage route(final WxXmlMessage wxMessage) {
public WxMpXmlOutMessage route(final WxMpXmlMessage wxMessage) {
final List<Rule> matchRules = new ArrayList<Rule>();
// 收集匹配的规则
for (final Rule rule : rules) {
@@ -86,7 +86,7 @@ public class WxMessageRouter {
return null;
}
WxXmlOutMessage res = null;
WxMpXmlOutMessage res = null;
for (final Rule rule : matchRules) {
// 返回最后一个匹配规则的结果
res = rule.service(wxMessage);
@@ -99,7 +99,7 @@ public class WxMessageRouter {
public static class Rule {
private final WxMessageRouter routerBuilder;
private final WxMpMessageRouter routerBuilder;
private boolean async = true;
@@ -115,11 +115,11 @@ public class WxMessageRouter {
private boolean reEnter = false;
private List<WxMessageHandler> handlers = new ArrayList<WxMessageHandler>();
private List<WxMpMessageHandler> handlers = new ArrayList<WxMpMessageHandler>();
private List<WxMessageInterceptor> interceptors = new ArrayList<WxMessageInterceptor>();
private List<WxMpMessageInterceptor> interceptors = new ArrayList<WxMpMessageInterceptor>();
protected Rule(WxMessageRouter routerBuilder) {
protected Rule(WxMpMessageRouter routerBuilder) {
this.routerBuilder = routerBuilder;
}
@@ -188,8 +188,8 @@ public class WxMessageRouter {
* @param interceptor
* @return
*/
public Rule interceptor(WxMessageInterceptor interceptor) {
return interceptor(interceptor, (WxMessageInterceptor[]) null);
public Rule interceptor(WxMpMessageInterceptor interceptor) {
return interceptor(interceptor, (WxMpMessageInterceptor[]) null);
}
/**
@@ -198,10 +198,10 @@ public class WxMessageRouter {
* @param otherInterceptors
* @return
*/
public Rule interceptor(WxMessageInterceptor interceptor, WxMessageInterceptor... otherInterceptors) {
public Rule interceptor(WxMpMessageInterceptor interceptor, WxMpMessageInterceptor... otherInterceptors) {
this.interceptors.add(interceptor);
if (otherInterceptors != null && otherInterceptors.length > 0) {
for (WxMessageInterceptor i : otherInterceptors) {
for (WxMpMessageInterceptor i : otherInterceptors) {
this.interceptors.add(i);
}
}
@@ -213,8 +213,8 @@ public class WxMessageRouter {
* @param handler
* @return
*/
public Rule handler(WxMessageHandler handler) {
return handler(handler, (WxMessageHandler[]) null);
public Rule handler(WxMpMessageHandler handler) {
return handler(handler, (WxMpMessageHandler[]) null);
}
/**
@@ -223,10 +223,10 @@ public class WxMessageRouter {
* @param otherHandlers
* @return
*/
public Rule handler(WxMessageHandler handler, WxMessageHandler... otherHandlers) {
public Rule handler(WxMpMessageHandler handler, WxMpMessageHandler... otherHandlers) {
this.handlers.add(handler);
if (otherHandlers != null && otherHandlers.length > 0) {
for (WxMessageHandler i : otherHandlers) {
for (WxMpMessageHandler i : otherHandlers) {
this.handlers.add(i);
}
}
@@ -237,7 +237,7 @@ public class WxMessageRouter {
* 规则结束，代表如果一个消息匹配该规则，那么它将不再会进入其他规则
* @return
*/
public WxMessageRouter end() {
public WxMpMessageRouter end() {
this.routerBuilder.rules.add(this);
return this.routerBuilder;
}
@@ -246,12 +246,12 @@ public class WxMessageRouter {
* 规则结束，但是消息还会进入其他规则
* @return
*/
public WxMessageRouter next() {
public WxMpMessageRouter next() {
this.reEnter = true;
return end();
}
protected boolean test(WxXmlMessage wxMessage) {
protected boolean test(WxMpXmlMessage wxMessage) {
return
(this.msgType == null || this.msgType.equals(wxMessage.getMsgType()))
&&
@@ -270,18 +270,18 @@ public class WxMessageRouter {
* @param wxMessage
* @return true 代表继续执行别的router，false 代表停止执行别的router
*/
protected WxXmlOutMessage service(WxXmlMessage wxMessage) {
protected WxMpXmlOutMessage service(WxMpXmlMessage wxMessage) {
Map<String, Object> context = new HashMap<String, Object>();
// 如果拦截器不通过
for (WxMessageInterceptor interceptor : this.interceptors) {
for (WxMpMessageInterceptor interceptor : this.interceptors) {
if (!interceptor.intercept(wxMessage, context)) {
return null;
}
}
// 交给handler处理
WxXmlOutMessage res = null;
for (WxMessageHandler handler : this.handlers) {
WxMpXmlOutMessage res = null;
for (WxMpMessageHandler handler : this.handlers) {
// 返回最后handler的结果
res = handler.handle(wxMessage, context);
}

75
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxService.java → weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpService.java
View File

@@ -1,29 +1,20 @@
package me.chanjar.weixin.mp.api;
import me.chanjar.weixin.common.bean.WxMenu;
import me.chanjar.weixin.common.bean.result.WxMediaUploadResult;
import me.chanjar.weixin.mp.bean.*;
import me.chanjar.weixin.mp.bean.result.*;
import me.chanjar.weixin.common.exception.WxErrorException;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.util.List;
import me.chanjar.weixin.mp.bean.WxCustomMessage;
import me.chanjar.weixin.mp.bean.WxGroup;
import me.chanjar.weixin.mp.bean.WxMassGroupMessage;
import me.chanjar.weixin.mp.bean.WxMassNews;
import me.chanjar.weixin.mp.bean.WxMassOpenIdsMessage;
import me.chanjar.weixin.mp.bean.WxMassVideo;
import me.chanjar.weixin.mp.bean.WxMenu;
import me.chanjar.weixin.mp.bean.result.WxMassSendResult;
import me.chanjar.weixin.mp.bean.result.WxMassUploadResult;
import me.chanjar.weixin.mp.bean.result.WxMediaUploadResult;
import me.chanjar.weixin.mp.bean.result.WxQrCodeTicket;
import me.chanjar.weixin.mp.bean.result.WxUser;
import me.chanjar.weixin.mp.bean.result.WxUserList;
import me.chanjar.weixin.mp.exception.WxErrorException;
/**
* 微信API的Service
*/
public interface WxService {
public interface WxMpService {
/**
* <pre>
@@ -48,7 +39,7 @@ public interface WxService {
* 详情请见: http://mp.weixin.qq.com/wiki/index.php?title=获取access_token
* </pre>
* @throws me.chanjar.weixin.mp.exception.WxErrorException
* @throws me.chanjar.weixin.common.exception.WxErrorException
*/
public void accessTokenRefresh() throws WxErrorException;
@@ -64,8 +55,8 @@ public interface WxService {
*
* 详情请见: http://mp.weixin.qq.com/wiki/index.php?title=上传下载多媒体文件
* </pre>
* @param mediaType 媒体类型, 请看{@link WxConsts}
* @param fileType 文件类型，请看{@link WxConsts}
* @param mediaType 媒体类型, 请看{@link WxMpConsts}
* @param fileType 文件类型，请看{@link WxMpConsts}
* @param inputStream 输入流
* @throws WxErrorException
*/
@@ -99,7 +90,7 @@ public interface WxService {
* @param message
* @throws WxErrorException
*/
public void customMessageSend(WxCustomMessage message) throws WxErrorException;
public void customMessageSend(WxMpCustomMessage message) throws WxErrorException;
/**
* <pre>
@@ -109,10 +100,10 @@ public interface WxService {
* </pre>
* @param news
* @throws WxErrorException
* @see #massGroupMessageSend(me.chanjar.weixin.mp.bean.WxMassGroupMessage)
* @see #massOpenIdsMessageSend(me.chanjar.weixin.mp.bean.WxMassOpenIdsMessage)
* @see #massGroupMessageSend(me.chanjar.weixin.mp.bean.WxMpMassGroupMessage)
* @see #massOpenIdsMessageSend(me.chanjar.weixin.mp.bean.WxMpMassOpenIdsMessage)
*/
public WxMassUploadResult massNewsUpload(WxMassNews news) throws WxErrorException;
public WxMpMassUploadResult massNewsUpload(WxMpMassNews news) throws WxErrorException;
/**
* <pre>
@@ -121,36 +112,36 @@ public interface WxService {
* </pre>
* @return
* @throws WxErrorException
* @see #massGroupMessageSend(me.chanjar.weixin.mp.bean.WxMassGroupMessage)
* @see #massOpenIdsMessageSend(me.chanjar.weixin.mp.bean.WxMassOpenIdsMessage)
* @see #massGroupMessageSend(me.chanjar.weixin.mp.bean.WxMpMassGroupMessage)
* @see #massOpenIdsMessageSend(me.chanjar.weixin.mp.bean.WxMpMassOpenIdsMessage)
*/
public WxMassUploadResult massVideoUpload(WxMassVideo video) throws WxErrorException;
public WxMpMassUploadResult massVideoUpload(WxMpMassVideo video) throws WxErrorException;
/**
* <pre>
* 分组群发消息
* 如果发送图文消息，必须先使用 {@link #massNewsUpload(WxMassNews)} 获得media_id，然后再发送
* 如果发送视频消息，必须先使用 {@link #massVideoUpload(WxMassVideo)} 获得media_id，然后再发送
* 如果发送图文消息，必须先使用 {@link #massNewsUpload(me.chanjar.weixin.mp.bean.WxMpMassNews)} 获得media_id，然后再发送
* 如果发送视频消息，必须先使用 {@link #massVideoUpload(me.chanjar.weixin.mp.bean.WxMpMassVideo)} 获得media_id，然后再发送
* 详情请见: http://mp.weixin.qq.com/wiki/index.php?title=高级群发接口
* </pre>
* @param message
* @throws WxErrorException
* @return
*/
public WxMassSendResult massGroupMessageSend(WxMassGroupMessage message) throws WxErrorException;
public WxMpMassSendResult massGroupMessageSend(WxMpMassGroupMessage message) throws WxErrorException;
/**
* <pre>
* 按openId列表群发消息
* 如果发送图文消息，必须先使用 {@link #massNewsUpload(WxMassNews)} 获得media_id，然后再发送
* 如果发送视频消息，必须先使用 {@link #massVideoUpload(WxMassVideo)} 获得media_id，然后再发送
* 如果发送图文消息，必须先使用 {@link #massNewsUpload(me.chanjar.weixin.mp.bean.WxMpMassNews)} 获得media_id，然后再发送
* 如果发送视频消息，必须先使用 {@link #massVideoUpload(me.chanjar.weixin.mp.bean.WxMpMassVideo)} 获得media_id，然后再发送
* 详情请见: http://mp.weixin.qq.com/wiki/index.php?title=高级群发接口
* </pre>
* @param message
* @return
* @throws WxErrorException
*/
public WxMassSendResult massOpenIdsMessageSend(WxMassOpenIdsMessage message) throws WxErrorException;
public WxMpMassSendResult massOpenIdsMessageSend(WxMpMassOpenIdsMessage message) throws WxErrorException;
/**
* <pre>
@@ -190,7 +181,7 @@ public interface WxService {
* @param name 分组名字（30个字符以内）
* @throws WxErrorException
*/
public WxGroup groupCreate(String name) throws WxErrorException;
public WxMpGroup groupCreate(String name) throws WxErrorException;
/**
* <pre>
@@ -200,7 +191,7 @@ public interface WxService {
* @return
* @throws WxErrorException
*/
public List<WxGroup> groupGet() throws WxErrorException;
public List<WxMpGroup> groupGet() throws WxErrorException;
/**
* <pre>
@@ -222,7 +213,7 @@ public interface WxService {
* @param group 要更新的group，group的id,name必须设置
* @throws WxErrorException
*/
public void groupUpdate(WxGroup group) throws WxErrorException;
public void groupUpdate(WxMpGroup group) throws WxErrorException;
/**
* <pre>
@@ -258,7 +249,7 @@ public interface WxService {
* @return
* @throws WxErrorException
*/
public WxUser userInfo(String openid, String lang) throws WxErrorException;
public WxMpUser userInfo(String openid, String lang) throws WxErrorException;
/**
* <pre>
@@ -269,7 +260,7 @@ public interface WxService {
* @return
* @throws WxErrorException
*/
public WxUserList userList(String next_openid) throws WxErrorException;
public WxMpUserList userList(String next_openid) throws WxErrorException;
/**
* <pre>
@@ -281,7 +272,7 @@ public interface WxService {
* @return
* @throws WxErrorException
*/
public WxQrCodeTicket qrCodeCreateTmpTicket(int scene_id, Integer expire_seconds) throws WxErrorException;
public WxMpQrCodeTicket qrCodeCreateTmpTicket(int scene_id, Integer expire_seconds) throws WxErrorException;
/**
* <pre>
@@ -292,7 +283,7 @@ public interface WxService {
* @return
* @throws WxErrorException
*/
public WxQrCodeTicket qrCodeCreateLastTicket(int scene_id) throws WxErrorException;
public WxMpQrCodeTicket qrCodeCreateLastTicket(int scene_id) throws WxErrorException;
/**
* <pre>
@@ -303,7 +294,7 @@ public interface WxService {
* @return
* @throws WxErrorException
*/
public File qrCodePicture(WxQrCodeTicket ticket) throws WxErrorException;
public File qrCodePicture(WxMpQrCodeTicket ticket) throws WxErrorException;
/**
* <pre>
@@ -317,8 +308,8 @@ public interface WxService {
public String shortUrl(String long_url) throws WxErrorException;
/**
* 注入 {@link WxConfigStorage} 的实现
* 注入 {@link WxMpConfigStorage} 的实现
* @param wxConfigProvider
*/
public void setWxConfigStorage(WxConfigStorage wxConfigProvider);
public void setWxMpConfigStorage(WxMpConfigStorage wxConfigProvider);
}

133
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxServiceImpl.java → weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpServiceImpl.java
View File

@@ -1,5 +1,31 @@
package me.chanjar.weixin.mp.api;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.internal.Streams;
import com.google.gson.reflect.TypeToken;
import com.google.gson.stream.JsonReader;
import me.chanjar.weixin.common.bean.WxAccessToken;
import me.chanjar.weixin.common.bean.WxMenu;
import me.chanjar.weixin.common.bean.result.WxError;
import me.chanjar.weixin.common.bean.result.WxMediaUploadResult;
import me.chanjar.weixin.common.exception.WxErrorException;
import me.chanjar.weixin.common.util.crypto.SHA1;
import me.chanjar.weixin.common.util.fs.FileUtils;
import me.chanjar.weixin.common.util.http.*;
import me.chanjar.weixin.common.util.json.GsonHelper;
import me.chanjar.weixin.mp.bean.*;
import me.chanjar.weixin.mp.bean.result.*;
import me.chanjar.weixin.mp.util.http.QrCodeRequestExecutor;
import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
import org.apache.commons.lang3.StringUtils;
import org.apache.http.client.ClientProtocolException;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.impl.client.BasicResponseHandler;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
@@ -8,48 +34,7 @@ import java.util.List;
import java.util.UUID;
import java.util.concurrent.atomic.AtomicBoolean;
import me.chanjar.weixin.mp.bean.WxCustomMessage;
import me.chanjar.weixin.mp.bean.result.WxError;
import me.chanjar.weixin.mp.bean.result.WxMassSendResult;
import me.chanjar.weixin.mp.bean.result.WxMediaUploadResult;
import me.chanjar.weixin.mp.bean.result.WxUserList;
import me.chanjar.weixin.mp.exception.WxErrorException;
import me.chanjar.weixin.mp.util.crypto.SHA1;
import me.chanjar.weixin.mp.util.json.GsonHelper;
import me.chanjar.weixin.mp.util.json.WxGsonBuilder;
import org.apache.commons.lang3.StringUtils;
import org.apache.http.client.ClientProtocolException;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.impl.client.BasicResponseHandler;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients;
import me.chanjar.weixin.mp.bean.WxAccessToken;
import me.chanjar.weixin.mp.bean.WxGroup;
import me.chanjar.weixin.mp.bean.WxMassGroupMessage;
import me.chanjar.weixin.mp.bean.WxMassNews;
import me.chanjar.weixin.mp.bean.WxMassOpenIdsMessage;
import me.chanjar.weixin.mp.bean.WxMassVideo;
import me.chanjar.weixin.mp.bean.WxMenu;
import me.chanjar.weixin.mp.bean.result.WxMassUploadResult;
import me.chanjar.weixin.mp.bean.result.WxQrCodeTicket;
import me.chanjar.weixin.mp.bean.result.WxUser;
import me.chanjar.weixin.mp.util.fs.FileUtils;
import me.chanjar.weixin.mp.util.http.MediaDownloadRequestExecutor;
import me.chanjar.weixin.mp.util.http.MediaUploadRequestExecutor;
import me.chanjar.weixin.mp.util.http.QrCodeRequestExecutor;
import me.chanjar.weixin.mp.util.http.RequestExecutor;
import me.chanjar.weixin.mp.util.http.SimpleGetRequestExecutor;
import me.chanjar.weixin.mp.util.http.SimplePostRequestExecutor;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.internal.Streams;
import com.google.gson.reflect.TypeToken;
import com.google.gson.stream.JsonReader;
public class WxServiceImpl implements WxService {
public class WxMpServiceImpl implements WxMpService {
/**
* 全局的是否正在刷新Access Token的flag
@@ -60,13 +45,13 @@ public class WxServiceImpl implements WxService {
protected static final CloseableHttpClient httpclient = HttpClients.createDefault();
protected WxConfigStorage wxConfigStorage;
protected WxMpConfigStorage wxMpConfigStorage;
protected final ThreadLocal<Integer> retryTimes = new ThreadLocal<Integer>();
public boolean checkSignature(String timestamp, String nonce, String signature) {
try {
return SHA1.gen(wxConfigStorage.getToken(), timestamp, nonce).equals(signature);
return SHA1.gen(wxMpConfigStorage.getToken(), timestamp, nonce).equals(signature);
} catch (Exception e) {
return false;
}
@@ -76,8 +61,8 @@ public class WxServiceImpl implements WxService {
if (!GLOBAL_ACCESS_TOKEN_REFRESH_FLAG.getAndSet(true)) {
try {
String url = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential"
+ "&appid=" + wxConfigStorage.getAppId()
+ "&secret=" + wxConfigStorage.getSecret()
+ "&appid=" + wxMpConfigStorage.getAppId()
+ "&secret=" + wxMpConfigStorage.getSecret()
;
try {
HttpGet httpGet = new HttpGet(url);
@@ -88,7 +73,7 @@ public class WxServiceImpl implements WxService {
throw new WxErrorException(error);
}
WxAccessToken accessToken = WxAccessToken.fromJson(resultContent);
wxConfigStorage.updateAccessToken(accessToken.getAccessToken(), accessToken.getExpiresIn());
wxMpConfigStorage.updateAccessToken(accessToken.getAccessToken(), accessToken.getExpiresIn());
} catch (ClientProtocolException e) {
throw new RuntimeException(e);
} catch (IOException e) {
@@ -109,7 +94,7 @@ public class WxServiceImpl implements WxService {
}
}
public void customMessageSend(WxCustomMessage message) throws WxErrorException {
public void customMessageSend(WxMpCustomMessage message) throws WxErrorException {
String url = "https://api.weixin.qq.com/cgi-bin/message/custom/send";
execute(new SimplePostRequestExecutor(), url, message.toJson());
}
@@ -152,31 +137,31 @@ public class WxServiceImpl implements WxService {
return execute(new MediaDownloadRequestExecutor(), url, "media_id=" + media_id);
}
public WxMassUploadResult massNewsUpload(WxMassNews news) throws WxErrorException {
public WxMpMassUploadResult massNewsUpload(WxMpMassNews news) throws WxErrorException {
String url = "https://api.weixin.qq.com/cgi-bin/media/uploadnews";
String responseContent = execute(new SimplePostRequestExecutor(), url, news.toJson());
return WxMassUploadResult.fromJson(responseContent);
return WxMpMassUploadResult.fromJson(responseContent);
}
public WxMassUploadResult massVideoUpload(WxMassVideo video) throws WxErrorException {
public WxMpMassUploadResult massVideoUpload(WxMpMassVideo video) throws WxErrorException {
String url = "http://file.api.weixin.qq.com/cgi-bin/media/uploadvideo";
String responseContent = execute(new SimplePostRequestExecutor(), url, video.toJson());
return WxMassUploadResult.fromJson(responseContent);
return WxMpMassUploadResult.fromJson(responseContent);
}
public WxMassSendResult massGroupMessageSend(WxMassGroupMessage message) throws WxErrorException {
public WxMpMassSendResult massGroupMessageSend(WxMpMassGroupMessage message) throws WxErrorException {
String url = "https://api.weixin.qq.com/cgi-bin/message/mass/sendall";
String responseContent = execute(new SimplePostRequestExecutor(), url, message.toJson());
return WxMassSendResult.fromJson(responseContent);
return WxMpMassSendResult.fromJson(responseContent);
}
public WxMassSendResult massOpenIdsMessageSend(WxMassOpenIdsMessage message) throws WxErrorException {
public WxMpMassSendResult massOpenIdsMessageSend(WxMpMassOpenIdsMessage message) throws WxErrorException {
String url = "https://api.weixin.qq.com/cgi-bin/message/mass/send";
String responseContent = execute(new SimplePostRequestExecutor(), url, message.toJson());
return WxMassSendResult.fromJson(responseContent);
return WxMpMassSendResult.fromJson(responseContent);
}
public WxGroup groupCreate(String name) throws WxErrorException {
public WxMpGroup groupCreate(String name) throws WxErrorException {
String url = "https://api.weixin.qq.com/cgi-bin/groups/create";
JsonObject json = new JsonObject();
JsonObject groupJson = new JsonObject();
@@ -187,10 +172,10 @@ public class WxServiceImpl implements WxService {
new SimplePostRequestExecutor(),
url,
json.toString());
return WxGroup.fromJson(responseContent);
return WxMpGroup.fromJson(responseContent);
}
public List<WxGroup> groupGet() throws WxErrorException {
public List<WxMpGroup> groupGet() throws WxErrorException {
String url = "https://api.weixin.qq.com/cgi-bin/groups/get";
String responseContent = execute(new SimpleGetRequestExecutor(), url, null);
/*
@@ -198,7 +183,7 @@ public class WxServiceImpl implements WxService {
* 查询时返回的是 { groups : [ { id : ..., name : ..., count : ... }, ... ] }
*/
JsonElement tmpJsonElement = Streams.parse(new JsonReader(new StringReader(responseContent)));
return WxGsonBuilder.INSTANCE.create().fromJson(tmpJsonElement.getAsJsonObject().get("groups"), new TypeToken<List<WxGroup>>(){}.getType());
return WxMpGsonBuilder.INSTANCE.create().fromJson(tmpJsonElement.getAsJsonObject().get("groups"), new TypeToken<List<WxMpGroup>>(){}.getType());
}
public long userGetGroup(String openid) throws WxErrorException {
@@ -210,7 +195,7 @@ public class WxServiceImpl implements WxService {
return GsonHelper.getAsLong(tmpJsonElement.getAsJsonObject().get("groupid"));
}
public void groupUpdate(WxGroup group) throws WxErrorException {
public void groupUpdate(WxMpGroup group) throws WxErrorException {
String url = "https://api.weixin.qq.com/cgi-bin/groups/update";
execute(new SimplePostRequestExecutor(), url, group.toJson());
}
@@ -231,20 +216,20 @@ public class WxServiceImpl implements WxService {
execute(new SimplePostRequestExecutor(), url, json.toString());
}
public WxUser userInfo(String openid, String lang) throws WxErrorException {
public WxMpUser userInfo(String openid, String lang) throws WxErrorException {
String url = "https://api.weixin.qq.com/cgi-bin/user/info";
lang = lang == null ? "zh_CN" : lang;
String responseContent = execute(new SimpleGetRequestExecutor(), url, "openid=" + openid + "&lang=" + lang);
return WxUser.fromJson(responseContent);
return WxMpUser.fromJson(responseContent);
}
public WxUserList userList(String next_openid) throws WxErrorException {
public WxMpUserList userList(String next_openid) throws WxErrorException {
String url = "https://api.weixin.qq.com/cgi-bin/user/get";
String responseContent = execute(new SimpleGetRequestExecutor(), url, next_openid == null ? null : "next_openid=" + next_openid);
return WxUserList.fromJson(responseContent);
return WxMpUserList.fromJson(responseContent);
}
public WxQrCodeTicket qrCodeCreateTmpTicket(int scene_id, Integer expire_seconds) throws WxErrorException {
public WxMpQrCodeTicket qrCodeCreateTmpTicket(int scene_id, Integer expire_seconds) throws WxErrorException {
String url = "https://api.weixin.qq.com/cgi-bin/qrcode/create";
JsonObject json = new JsonObject();
json.addProperty("action_name", "QR_SCENE");
@@ -257,10 +242,10 @@ public class WxServiceImpl implements WxService {
actionInfo.add("scene", scene);
json.add("action_info", actionInfo);
String responseContent = execute(new SimplePostRequestExecutor(), url, json.toString());
return WxQrCodeTicket.fromJson(responseContent);
return WxMpQrCodeTicket.fromJson(responseContent);
}
public WxQrCodeTicket qrCodeCreateLastTicket(int scene_id) throws WxErrorException {
public WxMpQrCodeTicket qrCodeCreateLastTicket(int scene_id) throws WxErrorException {
String url = "https://api.weixin.qq.com/cgi-bin/qrcode/create";
JsonObject json = new JsonObject();
json.addProperty("action_name", "QR_LIMIT_SCENE");
@@ -270,10 +255,10 @@ public class WxServiceImpl implements WxService {
actionInfo.add("scene", scene);
json.add("action_info", actionInfo);
String responseContent = execute(new SimplePostRequestExecutor(), url, json.toString());
return WxQrCodeTicket.fromJson(responseContent);
return WxMpQrCodeTicket.fromJson(responseContent);
}
public File qrCodePicture(WxQrCodeTicket ticket) throws WxErrorException {
public File qrCodePicture(WxMpQrCodeTicket ticket) throws WxErrorException {
String url = "https://mp.weixin.qq.com/cgi-bin/showqrcode";
return execute(new QrCodeRequestExecutor(), url, ticket);
}
@@ -297,10 +282,10 @@ public class WxServiceImpl implements WxService {
* @throws WxErrorException
*/
public <T, E> T execute(RequestExecutor<T, E> executor, String uri, E data) throws WxErrorException {
if (StringUtils.isBlank(wxConfigStorage.getAccessToken())) {
if (StringUtils.isBlank(wxMpConfigStorage.getAccessToken())) {
accessTokenRefresh();
}
String accessToken = wxConfigStorage.getAccessToken();
String accessToken = wxMpConfigStorage.getAccessToken();
String uriWithAccessToken = uri;
uriWithAccessToken += uri.indexOf('?') == -1 ? "?access_token=" + accessToken : "&access_token=" + accessToken;
@@ -350,8 +335,8 @@ public class WxServiceImpl implements WxService {
}
}
public void setWxConfigStorage(WxConfigStorage wxConfigProvider) {
this.wxConfigStorage = wxConfigProvider;
public void setWxMpConfigStorage(WxMpConfigStorage wxConfigProvider) {
this.wxMpConfigStorage = wxConfigProvider;
}
}

31
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxAccessToken.java
View File

@@ -1,31 +0,0 @@
package me.chanjar.weixin.mp.bean;
import me.chanjar.weixin.mp.util.json.WxGsonBuilder;
public class WxAccessToken {
private String accessToken;
private int expiresIn;
public String getAccessToken() {
return accessToken;
}
public void setAccessToken(String accessToken) {
this.accessToken = accessToken;
}
public int getExpiresIn() {
return expiresIn;
}
public void setExpiresIn(int expiresIn) {
this.expiresIn = expiresIn;
}
public static WxAccessToken fromJson(String json) {
return WxGsonBuilder.create().fromJson(json, WxAccessToken.class);
}
}

90
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMenu.java
View File

@@ -1,90 +0,0 @@
package me.chanjar.weixin.mp.bean;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.util.ArrayList;
import java.util.List;
import me.chanjar.weixin.mp.util.json.WxGsonBuilder;
/**
* 公众号菜单
* @author chanjarster
*
*/
public class WxMenu {
private List<WxMenuButton> buttons = new ArrayList<WxMenuButton>();
public List<WxMenuButton> getButtons() {
return buttons;
}
public void setButtons(List<WxMenuButton> buttons) {
this.buttons = buttons;
}
public String toJson() {
return WxGsonBuilder.create().toJson(this);
}
public static WxMenu fromJson(String json) {
return WxGsonBuilder.create().fromJson(json, WxMenu.class);
}
public static WxMenu fromJson(InputStream is) {
return WxGsonBuilder.create().fromJson(new InputStreamReader(is), WxMenu.class);
}
public static class WxMenuButton {
private String type;
private String name;
private String key;
private String url;
private List<WxMenuButton> subButtons = new ArrayList<WxMenuButton>();
public String getType() {
return type;
}
public void setType(String type) {
this.type = type;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getKey() {
return key;
}
public void setKey(String key) {
this.key = key;
}
public String getUrl() {
return url;
}
public void setUrl(String url) {
this.url = url;
}
public List<WxMenuButton> getSubButtons() {
return subButtons;
}
public void setSubButtons(List<WxMenuButton> subButtons) {
this.subButtons = subButtons;
}
}
}

28
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxCustomMessage.java → weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpCustomMessage.java
View File

@@ -1,23 +1,17 @@
package me.chanjar.weixin.mp.bean;
import me.chanjar.weixin.mp.bean.custombuilder.*;
import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
import java.util.ArrayList;
import java.util.List;
import me.chanjar.weixin.mp.api.WxConsts;
import me.chanjar.weixin.mp.bean.custombuilder.ImageBuilder;
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.util.json.WxGsonBuilder;
/**
* 客服消息
* @author chanjarster
*
*/
public class WxCustomMessage {
public class WxMpCustomMessage {
private String toUser;
private String msgType;
@@ -43,12 +37,12 @@ public class WxCustomMessage {
/**
* <pre>
* 请使用
* {@link WxConsts#CUSTOM_MSG_TEXT}
* {@link WxConsts#CUSTOM_MSG_IMAGE}
* {@link WxConsts#CUSTOM_MSG_VOICE}
* {@link WxConsts#CUSTOM_MSG_MUSIC}
* {@link WxConsts#CUSTOM_MSG_VIDEO}
* {@link WxConsts#CUSTOM_MSG_NEWS}
* {@link me.chanjar.weixin.mp.api.WxMpConsts#CUSTOM_MSG_TEXT}
* {@link me.chanjar.weixin.mp.api.WxMpConsts#CUSTOM_MSG_IMAGE}
* {@link me.chanjar.weixin.mp.api.WxMpConsts#CUSTOM_MSG_VOICE}
* {@link me.chanjar.weixin.mp.api.WxMpConsts#CUSTOM_MSG_MUSIC}
* {@link me.chanjar.weixin.mp.api.WxMpConsts#CUSTOM_MSG_VIDEO}
* {@link me.chanjar.weixin.mp.api.WxMpConsts#CUSTOM_MSG_NEWS}
* </pre>
* @param msgType
*/
@@ -105,7 +99,7 @@ public class WxCustomMessage {
}
public String toJson() {
return WxGsonBuilder.INSTANCE.create().toJson(this);
return WxMpGsonBuilder.INSTANCE.create().toJson(this);
}
public static class WxArticle {

12
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxGroup.java → weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpGroup.java
View File

@@ -1,13 +1,13 @@
package me.chanjar.weixin.mp.bean;
import me.chanjar.weixin.mp.util.json.WxGsonBuilder;
import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
/**
* 微信用户分组
* @author chanjarster
*
*/
public class WxGroup {
public class WxMpGroup {
private long id = -1;
private String name;
@@ -31,16 +31,16 @@ public class WxGroup {
this.count = count;
}
public static WxGroup fromJson(String json) {
return WxGsonBuilder.create().fromJson(json, WxGroup.class);
public static WxMpGroup fromJson(String json) {
return WxMpGsonBuilder.create().fromJson(json, WxMpGroup.class);
}
public String toJson() {
return WxGsonBuilder.create().toJson(this);
return WxMpGsonBuilder.create().toJson(this);
}
@Override
public String toString() {
return "WxGroup [id=" + id + ", name=" + name + ", count=" + count + "]";
return "WxMpGroup [id=" + id + ", name=" + name + ", count=" + count + "]";
}
}

19
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMassGroupMessage.java → weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpMassGroupMessage.java
View File

@@ -1,21 +1,20 @@
package me.chanjar.weixin.mp.bean;
import me.chanjar.weixin.mp.api.WxConsts;
import me.chanjar.weixin.mp.util.json.WxGsonBuilder;
import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
/**
* 分组群发的消息
*
* @author chanjarster
*/
public class WxMassGroupMessage {
public class WxMpMassGroupMessage {
private long groupId;
private String msgtype;
private String content;
private String mediaId;
public WxMassGroupMessage() {
public WxMpMassGroupMessage() {
super();
}
@@ -26,11 +25,11 @@ public class WxMassGroupMessage {
/**
* <pre>
* 请使用
* {@link WxConsts#MASS_MSG_IMAGE}
* {@link WxConsts#MASS_MSG_NEWS}
* {@link WxConsts#MASS_MSG_TEXT}
* {@link WxConsts#MASS_MSG_VIDEO}
* {@link WxConsts#MASS_MSG_VOICE}
* {@link me.chanjar.weixin.mp.api.WxMpConsts#MASS_MSG_IMAGE}
* {@link me.chanjar.weixin.mp.api.WxMpConsts#MASS_MSG_NEWS}
* {@link me.chanjar.weixin.mp.api.WxMpConsts#MASS_MSG_TEXT}
* {@link me.chanjar.weixin.mp.api.WxMpConsts#MASS_MSG_VIDEO}
* {@link me.chanjar.weixin.mp.api.WxMpConsts#MASS_MSG_VOICE}
* 如果msgtype和media_id不匹配的话，会返回系统繁忙的错误
* </pre>
* @param msgtype
@@ -56,7 +55,7 @@ public class WxMassGroupMessage {
}
public String toJson() {
return WxGsonBuilder.INSTANCE.create().toJson(this);
return WxMpGsonBuilder.INSTANCE.create().toJson(this);
}
public long getGroupId() {

8
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMassNews.java → weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpMassNews.java
View File

@@ -1,16 +1,16 @@
package me.chanjar.weixin.mp.bean;
import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
import java.util.ArrayList;
import java.util.List;
import me.chanjar.weixin.mp.util.json.WxGsonBuilder;
/**
* 群发时用到的图文消息素材
* @author chanjarster
*
*/
public class WxMassNews {
public class WxMpMassNews {
private List<WxMassNewsArticle> articles = new ArrayList<WxMassNewsArticle>();
@@ -23,7 +23,7 @@ public class WxMassNews {
}
public String toJson() {
return WxGsonBuilder.INSTANCE.create().toJson(this);
return WxMpGsonBuilder.INSTANCE.create().toJson(this);
}
/**

20
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMassOpenIdsMessage.java → weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpMassOpenIdsMessage.java
View File

@@ -1,23 +1,23 @@
package me.chanjar.weixin.mp.bean;
import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
import java.util.ArrayList;
import java.util.List;
import me.chanjar.weixin.mp.util.json.WxGsonBuilder;
/**
* OpenId列表群发的消息
*
* @author chanjarster
*/
public class WxMassOpenIdsMessage {
public class WxMpMassOpenIdsMessage {
private List<String> toUsers = new ArrayList<String>();
private String msgType;
private String content;
private String mediaId;
public WxMassOpenIdsMessage() {
public WxMpMassOpenIdsMessage() {
super();
}
@@ -28,11 +28,11 @@ public class WxMassOpenIdsMessage {
/**
* <pre>
* 请使用
* {@link me.chanjar.weixin.mp.api.WxConsts#MASS_MSG_IMAGE}
* {@link me.chanjar.weixin.mp.api.WxConsts#MASS_MSG_NEWS}
* {@link me.chanjar.weixin.mp.api.WxConsts#MASS_MSG_TEXT}
* {@link me.chanjar.weixin.mp.api.WxConsts#MASS_MSG_VIDEO}
* {@link me.chanjar.weixin.mp.api.WxConsts#MASS_MSG_VOICE}
* {@link me.chanjar.weixin.mp.api.WxMpConsts#MASS_MSG_IMAGE}
* {@link me.chanjar.weixin.mp.api.WxMpConsts#MASS_MSG_NEWS}
* {@link me.chanjar.weixin.mp.api.WxMpConsts#MASS_MSG_TEXT}
* {@link me.chanjar.weixin.mp.api.WxMpConsts#MASS_MSG_VIDEO}
* {@link me.chanjar.weixin.mp.api.WxMpConsts#MASS_MSG_VOICE}
* 如果msgtype和media_id不匹配的话，会返回系统繁忙的错误
* </pre>
* @param msgType
@@ -58,7 +58,7 @@ public class WxMassOpenIdsMessage {
}
public String toJson() {
return WxGsonBuilder.INSTANCE.create().toJson(this);
return WxMpGsonBuilder.INSTANCE.create().toJson(this);
}
/**

6
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMassVideo.java → weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpMassVideo.java
View File

@@ -1,13 +1,13 @@
package me.chanjar.weixin.mp.bean;
import me.chanjar.weixin.mp.util.json.WxGsonBuilder;
import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
/**
* 群发时用到的视频素材
*
* @author chanjarster
*/
public class WxMassVideo {
public class WxMpMassVideo {
private String mediaId;
private String title;
@@ -38,6 +38,6 @@ public class WxMassVideo {
}
public String toJson() {
return WxGsonBuilder.INSTANCE.create().toJson(this);
return WxMpGsonBuilder.INSTANCE.create().toJson(this);
}
}

12
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxXmlOutImageMessage.java → weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpMpXmlOutImageMessage.java
View File

@@ -1,24 +1,24 @@
package me.chanjar.weixin.mp.bean;
import me.chanjar.weixin.common.util.xml.MediaIdMarshaller;
import me.chanjar.weixin.mp.api.WxMpConsts;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import me.chanjar.weixin.mp.api.WxConsts;
import me.chanjar.weixin.mp.util.xml.MediaIdMarshaller;
@XmlRootElement(name = "xml")
@XmlAccessorType(XmlAccessType.FIELD)
public class WxXmlOutImageMessage extends WxXmlOutMessage {
public class WxMpMpXmlOutImageMessage extends WxMpXmlOutMessage {
@XmlElement(name="Image")
@XmlJavaTypeAdapter(MediaIdMarshaller.class)
private String mediaId;
public WxXmlOutImageMessage() {
this.msgType = WxConsts.XML_MSG_IMAGE;
public WxMpMpXmlOutImageMessage() {
this.msgType = WxMpConsts.XML_MSG_IMAGE;
}
public String getMediaId() {

68
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxXmlMessage.java → weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpXmlMessage.java
View File

@@ -1,8 +1,8 @@
package me.chanjar.weixin.mp.bean;
import me.chanjar.weixin.mp.api.WxConfigStorage;
import me.chanjar.weixin.mp.util.crypto.WxCryptUtil;
import me.chanjar.weixin.mp.util.xml.AdapterCDATA;
import me.chanjar.weixin.common.util.xml.AdapterCDATA;
import me.chanjar.weixin.mp.api.WxMpConfigStorage;
import me.chanjar.weixin.mp.util.crypto.WxMpCryptUtil;
import me.chanjar.weixin.mp.util.xml.XmlTransformer;
import org.apache.commons.io.IOUtils;
@@ -27,7 +27,7 @@ import java.util.List;
*/
@XmlRootElement(name = "xml")
@XmlAccessorType(XmlAccessType.FIELD)
public class WxXmlMessage {
public class WxMpXmlMessage {
///////////////////////
// 以下都是微信推送过来的消息的xml的element所对应的属性
@@ -179,13 +179,13 @@ public class WxXmlMessage {
/**
* <pre>
* 当接受用户消息时，可能会获得以下值：
* {@link me.chanjar.weixin.mp.api.WxConsts#XML_MSG_TEXT}
* {@link me.chanjar.weixin.mp.api.WxConsts#XML_MSG_IMAGE}
* {@link me.chanjar.weixin.mp.api.WxConsts#XML_MSG_VOICE}
* {@link me.chanjar.weixin.mp.api.WxConsts#XML_MSG_VIDEO}
* {@link me.chanjar.weixin.mp.api.WxConsts#XML_MSG_LOCATION}
* {@link me.chanjar.weixin.mp.api.WxConsts#XML_MSG_LINK}
* {@link me.chanjar.weixin.mp.api.WxConsts#XML_MSG_EVENT}
* {@link me.chanjar.weixin.mp.api.WxMpConsts#XML_MSG_TEXT}
* {@link me.chanjar.weixin.mp.api.WxMpConsts#XML_MSG_IMAGE}
* {@link me.chanjar.weixin.mp.api.WxMpConsts#XML_MSG_VOICE}
* {@link me.chanjar.weixin.mp.api.WxMpConsts#XML_MSG_VIDEO}
* {@link me.chanjar.weixin.mp.api.WxMpConsts#XML_MSG_LOCATION}
* {@link me.chanjar.weixin.mp.api.WxMpConsts#XML_MSG_LINK}
* {@link me.chanjar.weixin.mp.api.WxMpConsts#XML_MSG_EVENT}
* </pre>
*
* @return
@@ -197,12 +197,12 @@ public class WxXmlMessage {
/**
* <pre>
* 当发送消息的时候使用：
* {@link me.chanjar.weixin.mp.api.WxConsts#XML_MSG_TEXT}
* {@link me.chanjar.weixin.mp.api.WxConsts#XML_MSG_IMAGE}
* {@link me.chanjar.weixin.mp.api.WxConsts#XML_MSG_VOICE}
* {@link me.chanjar.weixin.mp.api.WxConsts#XML_MSG_VIDEO}
* {@link me.chanjar.weixin.mp.api.WxConsts#XML_MSG_NEWS}
* {@link me.chanjar.weixin.mp.api.WxConsts#XML_MSG_MUSIC}
* {@link me.chanjar.weixin.mp.api.WxMpConsts#XML_MSG_TEXT}
* {@link me.chanjar.weixin.mp.api.WxMpConsts#XML_MSG_IMAGE}
* {@link me.chanjar.weixin.mp.api.WxMpConsts#XML_MSG_VOICE}
* {@link me.chanjar.weixin.mp.api.WxMpConsts#XML_MSG_VIDEO}
* {@link me.chanjar.weixin.mp.api.WxMpConsts#XML_MSG_NEWS}
* {@link me.chanjar.weixin.mp.api.WxMpConsts#XML_MSG_MUSIC}
* </pre>
*
* @param msgType
@@ -379,17 +379,17 @@ public class WxXmlMessage {
this.fromUserName = fromUserName;
}
public static WxXmlMessage fromXml(String xml) {
public static WxMpXmlMessage fromXml(String xml) {
try {
return XmlTransformer.fromXml(WxXmlMessage.class, xml);
return XmlTransformer.fromXml(WxMpXmlMessage.class, xml);
} catch (JAXBException e) {
throw new RuntimeException(e);
}
}
public static WxXmlMessage fromXml(InputStream is) {
public static WxMpXmlMessage fromXml(InputStream is) {
try {
return XmlTransformer.fromXml(WxXmlMessage.class, is);
return XmlTransformer.fromXml(WxMpXmlMessage.class, is);
} catch (JAXBException e) {
throw new RuntimeException(e);
}
@@ -399,27 +399,27 @@ public class WxXmlMessage {
* 从加密字符串转换
*
* @param encryptedXml
* @param wxConfigStorage
* @param wxMpConfigStorage
* @param timestamp
* @param nonce
* @param msgSignature
* @return
*/
public static WxXmlMessage fromEncryptedXml(
public static WxMpXmlMessage fromEncryptedXml(
String encryptedXml,
WxConfigStorage wxConfigStorage,
WxMpConfigStorage wxMpConfigStorage,
String timestamp, String nonce, String msgSignature) {
WxCryptUtil cryptUtil = new WxCryptUtil(wxConfigStorage);
WxMpCryptUtil cryptUtil = new WxMpCryptUtil(wxMpConfigStorage);
String plainText = cryptUtil.decrypt(msgSignature, timestamp, nonce, encryptedXml);
return fromXml(plainText);
}
public static WxXmlMessage fromEncryptedXml(
public static WxMpXmlMessage fromEncryptedXml(
InputStream is,
WxConfigStorage wxConfigStorage,
WxMpConfigStorage wxMpConfigStorage,
String timestamp, String nonce, String msgSignature) {
try {
return fromEncryptedXml(IOUtils.toString(is, "UTF-8"), wxConfigStorage, timestamp, nonce, msgSignature);
return fromEncryptedXml(IOUtils.toString(is, "UTF-8"), wxMpConfigStorage, timestamp, nonce, msgSignature);
} catch (IOException e) {
throw new RuntimeException(e);
}
@@ -465,27 +465,27 @@ public class WxXmlMessage {
this.errorCount = errorCount;
}
public WxXmlMessage.ScanCodeInfo getScanCodeInfo() {
public WxMpXmlMessage.ScanCodeInfo getScanCodeInfo() {
return scanCodeInfo;
}
public void setScanCodeInfo(WxXmlMessage.ScanCodeInfo scanCodeInfo) {
public void setScanCodeInfo(WxMpXmlMessage.ScanCodeInfo scanCodeInfo) {
this.scanCodeInfo = scanCodeInfo;
}
public WxXmlMessage.SendPicsInfo getSendPicsInfo() {
public WxMpXmlMessage.SendPicsInfo getSendPicsInfo() {
return sendPicsInfo;
}
public void setSendPicsInfo(WxXmlMessage.SendPicsInfo sendPicsInfo) {
public void setSendPicsInfo(WxMpXmlMessage.SendPicsInfo sendPicsInfo) {
this.sendPicsInfo = sendPicsInfo;
}
public WxXmlMessage.SendLocationInfo getSendLocationInfo() {
public WxMpXmlMessage.SendLocationInfo getSendLocationInfo() {
return sendLocationInfo;
}
public void setSendLocationInfo(WxXmlMessage.SendLocationInfo sendLocationInfo) {
public void setSendLocationInfo(WxMpXmlMessage.SendLocationInfo sendLocationInfo) {
this.sendLocationInfo = sendLocationInfo;
}

23
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxXmlOutMessage.java → weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpXmlOutMessage.java
View File

@@ -1,5 +1,11 @@
package me.chanjar.weixin.mp.bean;
import me.chanjar.weixin.common.util.xml.AdapterCDATA;
import me.chanjar.weixin.mp.api.WxMpConfigStorage;
import me.chanjar.weixin.mp.bean.outxmlbuilder.*;
import me.chanjar.weixin.mp.util.crypto.WxMpCryptUtil;
import me.chanjar.weixin.mp.util.xml.XmlTransformer;
import javax.xml.bind.JAXBException;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
@@ -7,20 +13,9 @@ import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import me.chanjar.weixin.mp.api.WxConfigStorage;
import me.chanjar.weixin.mp.bean.outxmlbuilder.ImageBuilder;
import me.chanjar.weixin.mp.bean.outxmlbuilder.MusicBuilder;
import me.chanjar.weixin.mp.bean.outxmlbuilder.NewsBuilder;
import me.chanjar.weixin.mp.bean.outxmlbuilder.TextBuilder;
import me.chanjar.weixin.mp.bean.outxmlbuilder.VideoBuilder;
import me.chanjar.weixin.mp.bean.outxmlbuilder.VoiceBuilder;
import me.chanjar.weixin.mp.util.crypto.WxCryptUtil;
import me.chanjar.weixin.mp.util.xml.AdapterCDATA;
import me.chanjar.weixin.mp.util.xml.XmlTransformer;
@XmlRootElement(name = "xml")
@XmlAccessorType(XmlAccessType.FIELD)
public class WxXmlOutMessage {
public class WxMpXmlOutMessage {
@XmlElement(name="ToUserName")
@XmlJavaTypeAdapter(AdapterCDATA.class)
@@ -81,9 +76,9 @@ public class WxXmlOutMessage {
* 转换成加密的xml格式
* @return
*/
public String toEncryptedXml(WxConfigStorage wxConfigStorage) {
public String toEncryptedXml(WxMpConfigStorage wxMpConfigStorage) {
String plainXml = toXml();
WxCryptUtil pc = new WxCryptUtil(wxConfigStorage);
WxMpCryptUtil pc = new WxMpCryptUtil(wxMpConfigStorage);
return pc.encrypt(plainXml);
}

21
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxXmlOutMewsMessage.java → weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpXmlOutMewsMessage.java
View File

@@ -1,21 +1,16 @@
package me.chanjar.weixin.mp.bean;
import me.chanjar.weixin.common.util.xml.AdapterCDATA;
import me.chanjar.weixin.mp.api.WxMpConsts;
import javax.xml.bind.annotation.*;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import java.util.ArrayList;
import java.util.List;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlElementWrapper;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import me.chanjar.weixin.mp.api.WxConsts;
import me.chanjar.weixin.mp.util.xml.AdapterCDATA;
@XmlRootElement(name = "xml")
@XmlAccessorType(XmlAccessType.FIELD)
public class WxXmlOutMewsMessage extends WxXmlOutMessage {
public class WxMpXmlOutMewsMessage extends WxMpXmlOutMessage {
@XmlElement(name = "ArticleCount")
protected int articleCount;
@@ -24,8 +19,8 @@ public class WxXmlOutMewsMessage extends WxXmlOutMessage {
@XmlElement(name = "item")
protected final List<Item> articles = new ArrayList<Item>();
public WxXmlOutMewsMessage() {
this.msgType = WxConsts.XML_MSG_NEWS;
public WxMpXmlOutMewsMessage() {
this.msgType = WxMpConsts.XML_MSG_NEWS;
}
public int getArticleCount() {

12
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxXmlOutMusicMessage.java → weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpXmlOutMusicMessage.java
View File

@@ -1,23 +1,23 @@
package me.chanjar.weixin.mp.bean;
import me.chanjar.weixin.common.util.xml.AdapterCDATA;
import me.chanjar.weixin.mp.api.WxMpConsts;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import me.chanjar.weixin.mp.api.WxConsts;
import me.chanjar.weixin.mp.util.xml.AdapterCDATA;
@XmlRootElement(name = "xml")
@XmlAccessorType(XmlAccessType.FIELD)
public class WxXmlOutMusicMessage extends WxXmlOutMessage {
public class WxMpXmlOutMusicMessage extends WxMpXmlOutMessage {
@XmlElement(name = "Music")
protected final Music music = new Music();
public WxXmlOutMusicMessage() {
this.msgType = WxConsts.XML_MSG_MUSIC;
public WxMpXmlOutMusicMessage() {
this.msgType = WxMpConsts.XML_MSG_MUSIC;
}
public String getTitle() {

12
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxXmlOutTextMessage.java → weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpXmlOutTextMessage.java
View File

@@ -1,24 +1,24 @@
package me.chanjar.weixin.mp.bean;
import me.chanjar.weixin.common.util.xml.AdapterCDATA;
import me.chanjar.weixin.mp.api.WxMpConsts;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import me.chanjar.weixin.mp.api.WxConsts;
import me.chanjar.weixin.mp.util.xml.AdapterCDATA;
@XmlRootElement(name = "xml")
@XmlAccessorType(XmlAccessType.FIELD)
public class WxXmlOutTextMessage extends WxXmlOutMessage {
public class WxMpXmlOutTextMessage extends WxMpXmlOutMessage {
@XmlElement(name="Content")
@XmlJavaTypeAdapter(AdapterCDATA.class)
private String content;
public WxXmlOutTextMessage() {
this.msgType = WxConsts.XML_MSG_TEXT;
public WxMpXmlOutTextMessage() {
this.msgType = WxMpConsts.XML_MSG_TEXT;
}
public String getContent() {

12
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxXmlOutVideoMessage.java → weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpXmlOutVideoMessage.java
View File

@@ -1,23 +1,23 @@
package me.chanjar.weixin.mp.bean;
import me.chanjar.weixin.common.util.xml.AdapterCDATA;
import me.chanjar.weixin.mp.api.WxMpConsts;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import me.chanjar.weixin.mp.api.WxConsts;
import me.chanjar.weixin.mp.util.xml.AdapterCDATA;
@XmlRootElement(name = "xml")
@XmlAccessorType(XmlAccessType.FIELD)
public class WxXmlOutVideoMessage extends WxXmlOutMessage {
public class WxMpXmlOutVideoMessage extends WxMpXmlOutMessage {
@XmlElement(name = "Video")
protected final Video video = new Video();
public WxXmlOutVideoMessage() {
this.msgType = WxConsts.XML_MSG_VIDEO;
public WxMpXmlOutVideoMessage() {
this.msgType = WxMpConsts.XML_MSG_VIDEO;
}
public String getMediaId() {

12
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxXmlOutVoiceMessage.java → weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpXmlOutVoiceMessage.java
View File

@@ -1,24 +1,24 @@
package me.chanjar.weixin.mp.bean;
import me.chanjar.weixin.common.util.xml.MediaIdMarshaller;
import me.chanjar.weixin.mp.api.WxMpConsts;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import me.chanjar.weixin.mp.api.WxConsts;
import me.chanjar.weixin.mp.util.xml.MediaIdMarshaller;
@XmlRootElement(name = "xml")
@XmlAccessorType(XmlAccessType.FIELD)
public class WxXmlOutVoiceMessage extends WxXmlOutMessage {
public class WxMpXmlOutVoiceMessage extends WxMpXmlOutMessage {
@XmlElement(name="Voice")
@XmlJavaTypeAdapter(MediaIdMarshaller.class)
private String mediaId;
public WxXmlOutVoiceMessage() {
this.msgType = WxConsts.XML_MSG_VOICE;
public WxMpXmlOutVoiceMessage() {
this.msgType = WxMpConsts.XML_MSG_VOICE;
}
public String getMediaId() {

6
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/custombuilder/BaseBuilder.java
View File

@@ -1,6 +1,6 @@
package me.chanjar.weixin.mp.bean.custombuilder;
import me.chanjar.weixin.mp.bean.WxCustomMessage;
import me.chanjar.weixin.mp.bean.WxMpCustomMessage;
public class BaseBuilder<T> {
protected String msgType;
@@ -11,8 +11,8 @@ public class BaseBuilder<T> {
return (T) this;
}
public WxCustomMessage build() {
WxCustomMessage m = new WxCustomMessage();
public WxMpCustomMessage build() {
WxMpCustomMessage m = new WxMpCustomMessage();
m.setMsgType(this.msgType);
m.setToUser(this.toUser);
return m;

12
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/custombuilder/ImageBuilder.java
View File

@@ -1,12 +1,12 @@
package me.chanjar.weixin.mp.bean.custombuilder;
import me.chanjar.weixin.mp.api.WxConsts;
import me.chanjar.weixin.mp.bean.WxCustomMessage;
import me.chanjar.weixin.mp.api.WxMpConsts;
import me.chanjar.weixin.mp.bean.WxMpCustomMessage;
/**
* 获得消息builder
* <pre>
* 用法: WxCustomMessage m = WxCustomMessage.IMAGE().mediaId(...).toUser(...).build();
* 用法: WxMpCustomMessage m = WxMpCustomMessage.IMAGE().mediaId(...).toUser(...).build();
* </pre>
* @author chanjarster
*
@@ -15,7 +15,7 @@ public final class ImageBuilder extends BaseBuilder<ImageBuilder> {
private String mediaId;
public ImageBuilder() {
this.msgType = WxConsts.CUSTOM_MSG_IMAGE;
this.msgType = WxMpConsts.CUSTOM_MSG_IMAGE;
}
public ImageBuilder mediaId(String media_id) {
@@ -23,8 +23,8 @@ public final class ImageBuilder extends BaseBuilder<ImageBuilder> {
return this;
}
public WxCustomMessage build() {
WxCustomMessage m = super.build();
public WxMpCustomMessage build() {
WxMpCustomMessage m = super.build();
m.setMediaId(this.mediaId);
return m;
}

12
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/custombuilder/MusicBuilder.java
View File

@@ -1,12 +1,12 @@
package me.chanjar.weixin.mp.bean.custombuilder;
import me.chanjar.weixin.mp.api.WxConsts;
import me.chanjar.weixin.mp.bean.WxCustomMessage;
import me.chanjar.weixin.mp.api.WxMpConsts;
import me.chanjar.weixin.mp.bean.WxMpCustomMessage;
/**
* 音乐消息builder
* <pre>
* 用法: WxCustomMessage m = WxCustomMessage.MUSIC()
* 用法: WxMpCustomMessage m = WxMpCustomMessage.MUSIC()
* .musicUrl(...)
* .hqMusicUrl(...)
* .title(...)
@@ -24,7 +24,7 @@ public final class MusicBuilder extends BaseBuilder<MusicBuilder> {
private String hqMusicUrl;
public MusicBuilder() {
this.msgType = WxConsts.CUSTOM_MSG_MUSIC;
this.msgType = WxMpConsts.CUSTOM_MSG_MUSIC;
}
public MusicBuilder musicUrl(String musicurl) {
@@ -52,8 +52,8 @@ public final class MusicBuilder extends BaseBuilder<MusicBuilder> {
return this;
}
public WxCustomMessage build() {
WxCustomMessage m = super.build();
public WxMpCustomMessage build() {
WxMpCustomMessage m = super.build();
m.setMusicUrl(this.musicUrl);
m.setHqMusicUrl(this.hqMusicUrl);
m.setTitle(title);

18
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/custombuilder/NewsBuilder.java
View File

@@ -1,35 +1,35 @@
package me.chanjar.weixin.mp.bean.custombuilder;
import me.chanjar.weixin.mp.api.WxMpConsts;
import me.chanjar.weixin.mp.bean.WxMpCustomMessage;
import java.util.ArrayList;
import java.util.List;
import me.chanjar.weixin.mp.api.WxConsts;
import me.chanjar.weixin.mp.bean.WxCustomMessage;
/**
* 图文消息builder
* <pre>
* 用法:
* WxCustomMessage m = WxCustomMessage.NEWS().addArticle(article).toUser(...).build();
* WxMpCustomMessage m = WxMpCustomMessage.NEWS().addArticle(article).toUser(...).build();
* </pre>
* @author chanjarster
*
*/
public final class NewsBuilder extends BaseBuilder<NewsBuilder> {
private List<WxCustomMessage.WxArticle> articles = new ArrayList<WxCustomMessage.WxArticle>();
private List<WxMpCustomMessage.WxArticle> articles = new ArrayList<WxMpCustomMessage.WxArticle>();
public NewsBuilder() {
this.msgType = WxConsts.CUSTOM_MSG_NEWS;
this.msgType = WxMpConsts.CUSTOM_MSG_NEWS;
}
public NewsBuilder addArticle(WxCustomMessage.WxArticle article) {
public NewsBuilder addArticle(WxMpCustomMessage.WxArticle article) {
this.articles.add(article);
return this;
}
public WxCustomMessage build() {
WxCustomMessage m = super.build();
public WxMpCustomMessage build() {
WxMpCustomMessage m = super.build();
m.setArticles(this.articles);
return m;
}

12
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/custombuilder/TextBuilder.java
View File

@@ -1,12 +1,12 @@
package me.chanjar.weixin.mp.bean.custombuilder;
import me.chanjar.weixin.mp.api.WxConsts;
import me.chanjar.weixin.mp.bean.WxCustomMessage;
import me.chanjar.weixin.mp.api.WxMpConsts;
import me.chanjar.weixin.mp.bean.WxMpCustomMessage;
/**
* 文本消息builder
* <pre>
* 用法: WxCustomMessage m = WxCustomMessage.TEXT().content(...).toUser(...).build();
* 用法: WxMpCustomMessage m = WxMpCustomMessage.TEXT().content(...).toUser(...).build();
* </pre>
* @author chanjarster
*
@@ -15,7 +15,7 @@ public final class TextBuilder extends BaseBuilder<TextBuilder> {
private String content;
public TextBuilder() {
this.msgType = WxConsts.CUSTOM_MSG_TEXT;
this.msgType = WxMpConsts.CUSTOM_MSG_TEXT;
}
public TextBuilder content(String content) {
@@ -23,8 +23,8 @@ public final class TextBuilder extends BaseBuilder<TextBuilder> {
return this;
}
public WxCustomMessage build() {
WxCustomMessage m = super.build();
public WxMpCustomMessage build() {
WxMpCustomMessage m = super.build();
m.setContent(this.content);
return m;
}

12
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/custombuilder/VideoBuilder.java
View File

@@ -1,12 +1,12 @@
package me.chanjar.weixin.mp.bean.custombuilder;
import me.chanjar.weixin.mp.api.WxConsts;
import me.chanjar.weixin.mp.bean.WxCustomMessage;
import me.chanjar.weixin.mp.api.WxMpConsts;
import me.chanjar.weixin.mp.bean.WxMpCustomMessage;
/**
* 视频消息builder
* <pre>
* 用法: WxCustomMessage m = WxCustomMessage.VOICE()
* 用法: WxMpCustomMessage m = WxMpCustomMessage.VOICE()
* .mediaId(...)
* .title(...)
* .thumbMediaId(..)
@@ -24,7 +24,7 @@ public final class VideoBuilder extends BaseBuilder<VideoBuilder> {
private String thumbMediaId;
public VideoBuilder() {
this.msgType = WxConsts.CUSTOM_MSG_VIDEO;
this.msgType = WxMpConsts.CUSTOM_MSG_VIDEO;
}
public VideoBuilder mediaId(String mediaId) {
@@ -47,8 +47,8 @@ public final class VideoBuilder extends BaseBuilder<VideoBuilder> {
return this;
}
public WxCustomMessage build() {
WxCustomMessage m = super.build();
public WxMpCustomMessage build() {
WxMpCustomMessage m = super.build();
m.setMediaId(this.mediaId);
m.setTitle(title);
m.setDescription(description);

12
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/custombuilder/VoiceBuilder.java
View File

@@ -1,12 +1,12 @@
package me.chanjar.weixin.mp.bean.custombuilder;
import me.chanjar.weixin.mp.api.WxConsts;
import me.chanjar.weixin.mp.bean.WxCustomMessage;
import me.chanjar.weixin.mp.api.WxMpConsts;
import me.chanjar.weixin.mp.bean.WxMpCustomMessage;
/**
* 语音消息builder
* <pre>
* 用法: WxCustomMessage m = WxCustomMessage.VOICE().mediaId(...).toUser(...).build();
* 用法: WxMpCustomMessage m = WxMpCustomMessage.VOICE().mediaId(...).toUser(...).build();
* </pre>
* @author chanjarster
*
@@ -15,7 +15,7 @@ public final class VoiceBuilder extends BaseBuilder<VoiceBuilder> {
private String mediaId;
public VoiceBuilder() {
this.msgType = WxConsts.CUSTOM_MSG_VOICE;
this.msgType = WxMpConsts.CUSTOM_MSG_VOICE;
}
public VoiceBuilder mediaId(String media_id) {
@@ -23,8 +23,8 @@ public final class VoiceBuilder extends BaseBuilder<VoiceBuilder> {
return this;
}
public WxCustomMessage build() {
WxCustomMessage m = super.build();
public WxMpCustomMessage build() {
WxMpCustomMessage m = super.build();
m.setMediaId(this.mediaId);
return m;
}

5
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/outxmlbuilder/BaseBuilder.java
View File

@@ -1,7 +1,6 @@
package me.chanjar.weixin.mp.bean.outxmlbuilder;
import me.chanjar.weixin.mp.bean.WxXmlOutMessage;
import me.chanjar.weixin.mp.bean.WxMpXmlOutMessage;
public abstract class BaseBuilder<BuilderType, ValueType> {
@@ -21,7 +20,7 @@ public abstract class BaseBuilder<BuilderType, ValueType> {
public abstract ValueType build();
public void setCommon(WxXmlOutMessage m) {
public void setCommon(WxMpXmlOutMessage m) {
m.setToUserName(this.toUserName);
m.setFromUserName(this.fromUserName);
m.setCreateTime(System.currentTimeMillis() / 1000l);

8
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/outxmlbuilder/ImageBuilder.java
View File

@@ -1,12 +1,12 @@
package me.chanjar.weixin.mp.bean.outxmlbuilder;
import me.chanjar.weixin.mp.bean.WxXmlOutImageMessage;
import me.chanjar.weixin.mp.bean.WxMpMpXmlOutImageMessage;
/**
* 图片消息builder
* @author chanjarster
*/
public final class ImageBuilder extends BaseBuilder<ImageBuilder, WxXmlOutImageMessage> {
public final class ImageBuilder extends BaseBuilder<ImageBuilder, WxMpMpXmlOutImageMessage> {
private String mediaId;
@@ -15,8 +15,8 @@ public final class ImageBuilder extends BaseBuilder<ImageBuilder, WxXmlOutImageM
return this;
}
public WxXmlOutImageMessage build() {
WxXmlOutImageMessage m = new WxXmlOutImageMessage();
public WxMpMpXmlOutImageMessage build() {
WxMpMpXmlOutImageMessage m = new WxMpMpXmlOutImageMessage();
setCommon(m);
m.setMediaId(this.mediaId);
return m;

8
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/outxmlbuilder/MusicBuilder.java
View File

@@ -1,13 +1,13 @@
package me.chanjar.weixin.mp.bean.outxmlbuilder;
import me.chanjar.weixin.mp.bean.WxXmlOutMusicMessage;
import me.chanjar.weixin.mp.bean.WxMpXmlOutMusicMessage;
/**
* 音乐消息builder
*
* @author chanjarster
*/
public final class MusicBuilder extends BaseBuilder<MusicBuilder, WxXmlOutMusicMessage> {
public final class MusicBuilder extends BaseBuilder<MusicBuilder, WxMpXmlOutMusicMessage> {
private String title;
private String description;
@@ -40,8 +40,8 @@ public final class MusicBuilder extends BaseBuilder<MusicBuilder, WxXmlOutMusicM
return this;
}
public WxXmlOutMusicMessage build() {
WxXmlOutMusicMessage m = new WxXmlOutMusicMessage();
public WxMpXmlOutMusicMessage build() {
WxMpXmlOutMusicMessage m = new WxMpXmlOutMusicMessage();
setCommon(m);
m.setTitle(title);
m.setDescription(description);

16
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/outxmlbuilder/NewsBuilder.java
View File

@@ -1,26 +1,26 @@
package me.chanjar.weixin.mp.bean.outxmlbuilder;
import me.chanjar.weixin.mp.bean.WxMpXmlOutMewsMessage;
import java.util.ArrayList;
import java.util.List;
import me.chanjar.weixin.mp.bean.WxXmlOutMewsMessage;
/**
* 图文消息builder
* @author chanjarster
*/
public final class NewsBuilder extends BaseBuilder<NewsBuilder, WxXmlOutMewsMessage> {
public final class NewsBuilder extends BaseBuilder<NewsBuilder, WxMpXmlOutMewsMessage> {
protected final List<WxXmlOutMewsMessage.Item> articles = new ArrayList<WxXmlOutMewsMessage.Item>();
protected final List<WxMpXmlOutMewsMessage.Item> articles = new ArrayList<WxMpXmlOutMewsMessage.Item>();
public NewsBuilder addArticle(WxXmlOutMewsMessage.Item item) {
public NewsBuilder addArticle(WxMpXmlOutMewsMessage.Item item) {
this.articles.add(item);
return this;
}
public WxXmlOutMewsMessage build() {
WxXmlOutMewsMessage m = new WxXmlOutMewsMessage();
for(WxXmlOutMewsMessage.Item item : articles) {
public WxMpXmlOutMewsMessage build() {
WxMpXmlOutMewsMessage m = new WxMpXmlOutMewsMessage();
for(WxMpXmlOutMewsMessage.Item item : articles) {
m.addArticle(item);
}
setCommon(m);

8
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/outxmlbuilder/TextBuilder.java
View File

@@ -1,13 +1,13 @@
package me.chanjar.weixin.mp.bean.outxmlbuilder;
import me.chanjar.weixin.mp.bean.WxXmlOutTextMessage;
import me.chanjar.weixin.mp.bean.WxMpXmlOutTextMessage;
/**
* 文本消息builder
* @author chanjarster
*
*/
public final class TextBuilder extends BaseBuilder<TextBuilder, WxXmlOutTextMessage> {
public final class TextBuilder extends BaseBuilder<TextBuilder, WxMpXmlOutTextMessage> {
private String content;
public TextBuilder content(String content) {
@@ -15,8 +15,8 @@ public final class TextBuilder extends BaseBuilder<TextBuilder, WxXmlOutTextMess
return this;
}
public WxXmlOutTextMessage build() {
WxXmlOutTextMessage m = new WxXmlOutTextMessage();
public WxMpXmlOutTextMessage build() {
WxMpXmlOutTextMessage m = new WxMpXmlOutTextMessage();
setCommon(m);
m.setContent(this.content);
return m;

8
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/outxmlbuilder/VideoBuilder.java
View File

@@ -1,13 +1,13 @@
package me.chanjar.weixin.mp.bean.outxmlbuilder;
import me.chanjar.weixin.mp.bean.WxXmlOutVideoMessage;
import me.chanjar.weixin.mp.bean.WxMpXmlOutVideoMessage;
/**
* 视频消息builder
* @author chanjarster
*
*/
public final class VideoBuilder extends BaseBuilder<VideoBuilder, WxXmlOutVideoMessage> {
public final class VideoBuilder extends BaseBuilder<VideoBuilder, WxMpXmlOutVideoMessage> {
private String mediaId;
private String title;
@@ -26,8 +26,8 @@ public final class VideoBuilder extends BaseBuilder<VideoBuilder, WxXmlOutVideoM
return this;
}
public WxXmlOutVideoMessage build() {
WxXmlOutVideoMessage m = new WxXmlOutVideoMessage();
public WxMpXmlOutVideoMessage build() {
WxMpXmlOutVideoMessage m = new WxMpXmlOutVideoMessage();
setCommon(m);
m.setTitle(title);
m.setDescription(description);

8
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/outxmlbuilder/VoiceBuilder.java
View File

@@ -1,12 +1,12 @@
package me.chanjar.weixin.mp.bean.outxmlbuilder;
import me.chanjar.weixin.mp.bean.WxXmlOutVoiceMessage;
import me.chanjar.weixin.mp.bean.WxMpXmlOutVoiceMessage;
/**
* 语音消息builder
* @author chanjarster
*/
public final class VoiceBuilder extends BaseBuilder<VoiceBuilder, WxXmlOutVoiceMessage> {
public final class VoiceBuilder extends BaseBuilder<VoiceBuilder, WxMpXmlOutVoiceMessage> {
private String mediaId;
@@ -15,8 +15,8 @@ public final class VoiceBuilder extends BaseBuilder<VoiceBuilder, WxXmlOutVoiceM
return this;
}
public WxXmlOutVoiceMessage build() {
WxXmlOutVoiceMessage m = new WxXmlOutVoiceMessage();
public WxMpXmlOutVoiceMessage build() {
WxMpXmlOutVoiceMessage m = new WxMpXmlOutVoiceMessage();
setCommon(m);
m.setMediaId(mediaId);
return m;

136
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxError.java
View File

@@ -1,136 +0,0 @@
package me.chanjar.weixin.mp.bean.result;
import java.util.HashMap;
import java.util.Map;
import me.chanjar.weixin.mp.util.json.WxGsonBuilder;
/**
* 微信错误码说明
* http://mp.weixin.qq.com/wiki/index.php?title=全局返回码说明
* @author chanjarster
*
*/
public class WxError {
protected static final Map<Integer, String> errMap = new HashMap<Integer, String>();
static {
errMap.put(-1, "系统繁忙");
errMap.put(0, "请求成功");
errMap.put(40001, "获取access_token时AppSecret错误，或者access_token无效");
errMap.put(40002, "不合法的凭证类型");
errMap.put(40003, "不合法的OpenID");
errMap.put(40004, "不合法的媒体文件类型");
errMap.put(40005, "不合法的文件类型");
errMap.put(40006, "不合法的文件大小");
errMap.put(40007, "不合法的媒体文件id");
errMap.put(40008, "不合法的消息类型");
errMap.put(40009, "不合法的图片文件大小");
errMap.put(40010, "不合法的语音文件大小");
errMap.put(40011, "不合法的视频文件大小");
errMap.put(40012, "不合法的缩略图文件大小");
errMap.put(40013, "不合法的APPID");
errMap.put(40014, "不合法的access_token");
errMap.put(40015, "不合法的菜单类型");
errMap.put(40016, "不合法的按钮个数");
errMap.put(40017, "不合法的按钮个数");
errMap.put(40018, "不合法的按钮名字长度");
errMap.put(40019, "不合法的按钮KEY长度");
errMap.put(40020, "不合法的按钮URL长度");
errMap.put(40021, "不合法的菜单版本号");
errMap.put(40022, "不合法的子菜单级数");
errMap.put(40023, "不合法的子菜单按钮个数");
errMap.put(40024, "不合法的子菜单按钮类型");
errMap.put(40025, "不合法的子菜单按钮名字长度");
errMap.put(40026, "不合法的子菜单按钮KEY长度");
errMap.put(40027, "不合法的子菜单按钮URL长度");
errMap.put(40028, "不合法的自定义菜单使用用户");
errMap.put(40029, "不合法的oauth_code");
errMap.put(40030, "不合法的refresh_token");
errMap.put(40031, "不合法的openid列表");
errMap.put(40032, "不合法的openid列表长度");
errMap.put(40033, "不合法的请求字符，不能包含\\uxxxx格式的字符");
errMap.put(40035, "不合法的参数");
errMap.put(40038, "不合法的请求格式");
errMap.put(40039, "不合法的URL长度");
errMap.put(40050, "不合法的分组id");
errMap.put(40051, "分组名字不合法");
errMap.put(41001, "缺少access_token参数");
errMap.put(41002, "缺少appid参数");
errMap.put(41003, "缺少refresh_token参数");
errMap.put(41004, "缺少secret参数");
errMap.put(41005, "缺少多媒体文件数据");
errMap.put(41006, "缺少media_id参数");
errMap.put(41007, "缺少子菜单数据");
errMap.put(41008, "缺少oauth code");
errMap.put(41009, "缺少openid");
errMap.put(42001, "access_token超时");
errMap.put(42002, "refresh_token超时");
errMap.put(42003, "oauth_code超时");
errMap.put(43001, "需要GET请求");
errMap.put(43002, "需要POST请求");
errMap.put(43003, "需要HTTPS请求");
errMap.put(43004, "需要接收者关注");
errMap.put(43005, "需要好友关系");
errMap.put(44001, "多媒体文件为空");
errMap.put(44002, "POST的数据包为空");
errMap.put(44003, "图文消息内容为空");
errMap.put(44004, "文本消息内容为空");
errMap.put(45001, "多媒体文件大小超过限制");
errMap.put(45002, "消息内容超过限制");
errMap.put(45003, "标题字段超过限制");
errMap.put(45004, "描述字段超过限制");
errMap.put(45005, "链接字段超过限制");
errMap.put(45006, "图片链接字段超过限制");
errMap.put(45007, "语音播放时间超过限制");
errMap.put(45008, "图文消息超过限制");
errMap.put(45009, "接口调用超过限制");
errMap.put(45010, "创建菜单个数超过限制");
errMap.put(45015, "回复时间超过限制");
errMap.put(45016, "系统分组，不允许修改");
errMap.put(45017, "分组名字过长");
errMap.put(45018, "分组数量超过上限");
errMap.put(46001, "不存在媒体数据");
errMap.put(46002, "不存在的菜单版本");
errMap.put(46003, "不存在的菜单数据");
errMap.put(46004, "不存在的用户");
errMap.put(47001, "解析JSON/XML内容错误");
errMap.put(48001, "api功能未授权");
errMap.put(50001, "用户未授权该api");
}
protected int errorCode;
protected String errorMsg;
public int getErrorCode() {
return errorCode;
}
public void setErrorCode(int errorCode) {
this.errorCode = errorCode;
}
public String getErrorMsg() {
return errorMsg;
}
public void setErrorMsg(String errorMsg) {
this.errorMsg = errorMsg;
}
public String getDescription() {
return errMap.get(errorCode);
}
public static WxError fromJson(String json) {
return WxGsonBuilder.create().fromJson(json, WxError.class);
}
@Override
public String toString() {
return "微信错误 errcode=" + errorCode + ", errmsg=" + errorMsg + ", description=" + getDescription();
}
}

54
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMediaUploadResult.java
View File

@@ -1,54 +0,0 @@
package me.chanjar.weixin.mp.bean.result;
import me.chanjar.weixin.mp.util.json.WxGsonBuilder;
public class WxMediaUploadResult {
private String type;
private String mediaId;
private String thumbMediaId;
private long createdAt;
public String getType() {
return type;
}
public void setType(String type) {
this.type = type;
}
public String getMediaId() {
return mediaId;
}
public void setMediaId(String mediaId) {
this.mediaId = mediaId;
}
public long getCreatedAt() {
return createdAt;
}
public void setCreatedAt(long createdAt) {
this.createdAt = createdAt;
}
public static WxMediaUploadResult fromJson(String json) {
return WxGsonBuilder.create().fromJson(json, WxMediaUploadResult.class);
}
public String getThumbMediaId() {
return thumbMediaId;
}
public void setThumbMediaId(String thumbMediaId) {
this.thumbMediaId = thumbMediaId;
}
@Override
public String toString() {
return "WxUploadResult [type=" + type + ", media_id=" + mediaId + ", thumb_media_id=" + thumbMediaId
+ ", created_at=" + createdAt + "]";
}
}

8
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMassSendResult.java → weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpMassSendResult.java
View File

@@ -1,6 +1,6 @@
package me.chanjar.weixin.mp.bean.result;
import me.chanjar.weixin.mp.util.json.WxGsonBuilder;
import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
/**
* <pre>
@@ -13,7 +13,7 @@ import me.chanjar.weixin.mp.util.json.WxGsonBuilder;
* @author chanjarster
*
*/
public class WxMassSendResult {
public class WxMpMassSendResult {
private String errorCode;
private String errorMsg;
@@ -43,8 +43,8 @@ public class WxMassSendResult {
this.msgId = msgId;
}
public static WxMassSendResult fromJson(String json) {
return WxGsonBuilder.create().fromJson(json, WxMassSendResult.class);
public static WxMpMassSendResult fromJson(String json) {
return WxMpGsonBuilder.create().fromJson(json, WxMpMassSendResult.class);
}
@Override

8
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMassUploadResult.java → weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpMassUploadResult.java
View File

@@ -1,6 +1,6 @@
package me.chanjar.weixin.mp.bean.result;
import me.chanjar.weixin.mp.util.json.WxGsonBuilder;
import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
/**
* <pre>
@@ -10,7 +10,7 @@ import me.chanjar.weixin.mp.util.json.WxGsonBuilder;
* @author chanjarster
*
*/
public class WxMassUploadResult {
public class WxMpMassUploadResult {
private String type;
private String mediaId;
@@ -40,8 +40,8 @@ public class WxMassUploadResult {
this.createdAt = createdAt;
}
public static WxMassUploadResult fromJson(String json) {
return WxGsonBuilder.create().fromJson(json, WxMassUploadResult.class);
public static WxMpMassUploadResult fromJson(String json) {
return WxMpGsonBuilder.create().fromJson(json, WxMpMassUploadResult.class);
}
@Override

8
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxQrCodeTicket.java → weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpQrCodeTicket.java
View File

@@ -1,13 +1,13 @@
package me.chanjar.weixin.mp.bean.result;
import me.chanjar.weixin.mp.util.json.WxGsonBuilder;
import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
/**
* 换取二维码的Ticket
*
* @author chanjarster
*/
public class WxQrCodeTicket {
public class WxMpQrCodeTicket {
protected String ticket;
protected int expire_seconds = -1;
@@ -40,7 +40,7 @@ public class WxQrCodeTicket {
this.url = url;
}
public static WxQrCodeTicket fromJson(String json) {
return WxGsonBuilder.INSTANCE.create().fromJson(json, WxQrCodeTicket.class);
public static WxMpQrCodeTicket fromJson(String json) {
return WxMpGsonBuilder.INSTANCE.create().fromJson(json, WxMpQrCodeTicket.class);
}
}

8
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxUser.java → weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpUser.java
View File

@@ -1,13 +1,13 @@
package me.chanjar.weixin.mp.bean.result;
import me.chanjar.weixin.mp.util.json.WxGsonBuilder;
import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
/**
* 微信用户信息
* @author chanjarster
*
*/
public class WxUser {
public class WxMpUser {
protected boolean subscribe;
protected String openId;
@@ -88,8 +88,8 @@ public class WxUser {
this.unionId = unionId;
}
public static WxUser fromJson(String json) {
return WxGsonBuilder.INSTANCE.create().fromJson(json, WxUser.class);
public static WxMpUser fromJson(String json) {
return WxMpGsonBuilder.INSTANCE.create().fromJson(json, WxMpUser.class);
}
}

10
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxUserList.java → weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpUserList.java
View File

@@ -1,16 +1,16 @@
package me.chanjar.weixin.mp.bean.result;
import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
import java.util.ArrayList;
import java.util.List;
import me.chanjar.weixin.mp.util.json.WxGsonBuilder;
/**
* 关注者列表
* @author chanjarster
*
*/
public class WxUserList {
public class WxMpUserList {
protected int total = -1;
protected int count = -1;
@@ -41,7 +41,7 @@ public class WxUserList {
this.nextOpenId = nextOpenId;
}
public static WxUserList fromJson(String json) {
return WxGsonBuilder.INSTANCE.create().fromJson(json, WxUserList.class);
public static WxMpUserList fromJson(String json) {
return WxMpGsonBuilder.INSTANCE.create().fromJson(json, WxMpUserList.class);
}
}

21
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/exception/WxErrorException.java
View File

@@ -1,21 +0,0 @@
package me.chanjar.weixin.mp.exception;
import me.chanjar.weixin.mp.bean.result.WxError;
public class WxErrorException extends Exception {
private static final long serialVersionUID = -6357149550353160810L;
private WxError error;
public WxErrorException(WxError error) {
super(error.toString());
this.error = error;
}
public WxError getError() {
return error;
}
}

26
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/crypto/ByteGroup.java
View File

@@ -1,26 +0,0 @@
package me.chanjar.weixin.mp.util.crypto;
import java.util.ArrayList;
class ByteGroup {
ArrayList<Byte> byteContainer = new ArrayList<Byte>();
byte[] toBytes() {
byte[] bytes = new byte[byteContainer.size()];
for (int i = 0; i < byteContainer.size(); i++) {
bytes[i] = byteContainer.get(i);
}
return bytes;
}
ByteGroup addBytes(byte[] bytes) {
for (byte b : bytes) {
byteContainer.add(b);
}
return this;
}
int size() {
return byteContainer.size();
}
}

68
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/crypto/PKCS7Encoder.java
View File

@@ -1,68 +0,0 @@
/**
* 对公众平台发送给公众账号的消息加解密示例代码.
*
* @copyright Copyright (c) 1998-2014 Tencent Inc.
*/
// ------------------------------------------------------------------------
package me.chanjar.weixin.mp.util.crypto;
import java.nio.charset.Charset;
import java.util.Arrays;
/**
* 提供基于PKCS7算法的加解
*/
class PKCS7Encoder {
private static final Charset CHARSET = Charset.forName("utf-8");
private static final int BLOCK_SIZE = 32;
/**
* 获得对明文进行补位填充的字节.
*
* @param count 需要进行填充补位操作的明文字节个数
* @return 补齐用的字节数组
*/
static byte[] encode(int count) {
// 计算需要填充的位数
int amountToPad = BLOCK_SIZE - (count % BLOCK_SIZE);
if (amountToPad == 0) {
amountToPad = BLOCK_SIZE;
}
// 获得补位所用的字符
char padChr = chr(amountToPad);
String tmp = new String();
for (int index = 0; index < amountToPad; index++) {
tmp += padChr;
}
return tmp.getBytes(CHARSET);
}
/**
* 删除解密后明文的补位字符
*
* @param decrypted 解密后的明文
* @return 删除补位字符后的明文
*/
static byte[] decode(byte[] decrypted) {
int pad = (int) decrypted[decrypted.length - 1];
if (pad < 1 || pad > 32) {
pad = 0;
}
return Arrays.copyOfRange(decrypted, 0, decrypted.length - pad);
}
/**
* 将数字转化成ASCII码对应的字符，用于对明文进行补码
*
* @param a 需要转化的数字
* @return 转化得到的字符
*/
static char chr(int a) {
byte target = (byte) (a & 0xFF);
return (char) target;
}
}

42
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/crypto/SHA1.java
View File

@@ -1,42 +0,0 @@
package me.chanjar.weixin.mp.util.crypto;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.Arrays;
/**
* Created by qianjia on 14/10/19.
*/
public class SHA1 {
/**
* 生成SHA1签名
* @param arr
* @return
*/
public static String gen(String... arr) throws NoSuchAlgorithmException {
Arrays.sort(arr);
StringBuilder sb = new StringBuilder();
for(String a : arr) {
sb.append(a);
}
MessageDigest sha1 = MessageDigest.getInstance("SHA1");
sha1.update(sb.toString().getBytes());
byte[] output = sha1.digest();
return bytesToHex(output);
}
protected static String bytesToHex(byte[] b) {
char hexDigit[] = {'0', '1', '2', '3', '4', '5', '6', '7',
'8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
StringBuffer buf = new StringBuffer();
for (int j = 0; j < b.length; j++) {
buf.append(hexDigit[(b[j] >> 4) & 0x0f]);
buf.append(hexDigit[b[j] & 0x0f]);
}
return buf.toString();
}
}

322
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/crypto/WxCryptUtil.java
View File

@@ -1,322 +0,0 @@
/**
* 对公众平台发送给公众账号的消息加解密示例代码.
*
* @copyright Copyright (c) 1998-2014 Tencent Inc.
*/
// ------------------------------------------------------------------------
/**
* 针对org.apache.commons.codec.binary.Base64，
* 需要导入架包commons-codec-1.9（或commons-codec-1.8等其他版本）
* 官方下载地址：http://commons.apache.org/proper/commons-codec/download_codec.cgi
*/
package me.chanjar.weixin.mp.util.crypto;
import java.io.StringReader;
import java.nio.charset.Charset;
import java.security.NoSuchAlgorithmException;
import java.util.Arrays;
import java.util.Random;
import javax.crypto.Cipher;
import javax.crypto.spec.IvParameterSpec;
import javax.crypto.spec.SecretKeySpec;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
import me.chanjar.weixin.mp.api.WxConfigStorage;
import org.apache.commons.codec.binary.Base64;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.xml.sax.InputSource;
public class WxCryptUtil {
private static final Base64 base64 = new Base64();
private static final Charset CHARSET = Charset.forName("utf-8");
private static final ThreadLocal<DocumentBuilder> builderLocal =
new ThreadLocal<DocumentBuilder>() {
@Override protected DocumentBuilder initialValue() {
try {
return DocumentBuilderFactory.newInstance().newDocumentBuilder();
} catch (ParserConfigurationException exc) {
throw new IllegalArgumentException(exc);
}
}
};
private byte[] aesKey;
private String token;
private String appId;
/**
* 构造函数
*
* @param wxConfigStorage
*/
public WxCryptUtil(WxConfigStorage wxConfigStorage) {
/*
* @param token 公众平台上，开发者设置的token
* @param encodingAesKey 公众平台上，开发者设置的EncodingAESKey
* @param appId 公众平台appid
*/
String encodingAesKey = wxConfigStorage.getAesKey();
String token = wxConfigStorage.getToken();
String appId = wxConfigStorage.getAppId();
this.token = token;
this.appId = appId;
this.aesKey = Base64.decodeBase64(encodingAesKey + "=");
}
/**
* 构造函数
*
* @param token 公众平台上，开发者设置的token
* @param encodingAesKey 公众平台上，开发者设置的EncodingAESKey
* @param appId 公众平台appid
*/
public WxCryptUtil(String token, String encodingAesKey, String appId) {
this.token = token;
this.appId = appId;
this.aesKey = Base64.decodeBase64(encodingAesKey + "=");
}
/**
* 将公众平台回复用户的消息加密打包.
* <ol>
* <li>对要发送的消息进行AES-CBC加密</li>
* <li>生成安全签名</li>
* <li>将消息密文和安全签名打包成xml格式</li>
* </ol>
*
* @param plainText 公众平台待回复用户的消息，xml格式的字符串
* @return 加密后的可以直接回复用户的密文，包括msg_signature, timestamp, nonce, encrypt的xml格式的字符串
*/
public String encrypt(String plainText) {
// 加密
String encryptedXml = encrypt(genRandomStr(), plainText);
// 生成安全签名
String timeStamp = timeStamp = Long.toString(System.currentTimeMillis() / 1000l);
String nonce = genRandomStr();
try {
String signature = SHA1.gen(token, timeStamp, nonce, encryptedXml);
String result = generateXml(encryptedXml, signature, timeStamp, nonce);
return result;
} catch (NoSuchAlgorithmException e) {
throw new RuntimeException(e);
}
}
/**
* 对明文进行加密.
*
* @param plainText 需要加密的明文
* @return 加密后base64编码的字符串
*/
protected String encrypt(String randomStr, String plainText) {
ByteGroup byteCollector = new ByteGroup();
byte[] randomStringBytes = randomStr.getBytes(CHARSET);
byte[] plainTextBytes = plainText.getBytes(CHARSET);
byte[] bytesOfSizeInNetworkOrder = number2BytesInNetworkOrder(plainTextBytes.length);
byte[] appIdBytes = appId.getBytes(CHARSET);
// randomStr + networkBytesOrder + text + appid
byteCollector.addBytes(randomStringBytes);
byteCollector.addBytes(bytesOfSizeInNetworkOrder);
byteCollector.addBytes(plainTextBytes);
byteCollector.addBytes(appIdBytes);
// ... + pad: 使用自定义的填充方式对明文进行补位填充
byte[] padBytes = PKCS7Encoder.encode(byteCollector.size());
byteCollector.addBytes(padBytes);
// 获得最终的字节流, 未加密
byte[] unencrypted = byteCollector.toBytes();
try {
// 设置加密模式为AES的CBC模式
Cipher cipher = Cipher.getInstance("AES/CBC/NoPadding");
SecretKeySpec keySpec = new SecretKeySpec(aesKey, "AES");
IvParameterSpec iv = new IvParameterSpec(aesKey, 0, 16);
cipher.init(Cipher.ENCRYPT_MODE, keySpec, iv);
// 加密
byte[] encrypted = cipher.doFinal(unencrypted);
// 使用BASE64对加密后的字符串进行编码
String base64Encrypted = base64.encodeToString(encrypted);
return base64Encrypted;
} catch (Exception e) {
throw new RuntimeException(e);
}
}
/**
* 检验消息的真实性，并且获取解密后的明文.
* <ol>
* <li>利用收到的密文生成安全签名，进行签名验证</li>
* <li>若验证通过，则提取xml中的加密消息</li>
* <li>对消息进行解密</li>
* </ol>
*
* @param msgSignature 签名串，对应URL参数的msg_signature
* @param timeStamp 时间戳，对应URL参数的timestamp
* @param nonce 随机串，对应URL参数的nonce
* @param encryptedXml 密文，对应POST请求的数据
* @return 解密后的原文
*/
public String decrypt(String msgSignature, String timeStamp, String nonce, String encryptedXml) {
// 密钥，公众账号的app secret
// 提取密文
String cipherText = extractEncryptPart(encryptedXml);
try {
// 验证安全签名
String signature = SHA1.gen(token, timeStamp, nonce, cipherText);
if (!signature.equals(msgSignature)) {
throw new RuntimeException("加密消息签名校验失败");
}
} catch (NoSuchAlgorithmException e) {
throw new RuntimeException(e);
}
// 解密
String result = decrypt(cipherText);
return result;
}
/**
* 对密文进行解密.
*
* @param cipherText 需要解密的密文
* @return 解密得到的明文
*/
protected String decrypt(String cipherText) {
byte[] original;
try {
// 设置解密模式为AES的CBC模式
Cipher cipher = Cipher.getInstance("AES/CBC/NoPadding");
SecretKeySpec key_spec = new SecretKeySpec(aesKey, "AES");
IvParameterSpec iv = new IvParameterSpec(Arrays.copyOfRange(aesKey, 0, 16));
cipher.init(Cipher.DECRYPT_MODE, key_spec, iv);
// 使用BASE64对密文进行解码
byte[] encrypted = Base64.decodeBase64(cipherText);
// 解密
original = cipher.doFinal(encrypted);
} catch (Exception e) {
throw new RuntimeException(e);
}
String xmlContent, from_appid;
try {
// 去除补位字符
byte[] bytes = PKCS7Encoder.decode(original);
// 分离16位随机字符串,网络字节序和AppId
byte[] networkOrder = Arrays.copyOfRange(bytes, 16, 20);
int xmlLength = bytesNetworkOrder2Number(networkOrder);
xmlContent = new String(Arrays.copyOfRange(bytes, 20, 20 + xmlLength), CHARSET);
from_appid = new String(Arrays.copyOfRange(bytes, 20 + xmlLength, bytes.length),
CHARSET);
} catch (Exception e) {
throw new RuntimeException(e);
}
// appid不相同的情况
if (!from_appid.equals(appId)) {
throw new RuntimeException("AppID不正确");
}
return xmlContent;
}
/**
* 将一个数字转换成生成4个字节的网络字节序bytes数组
*
* @param number
*/
private byte[] number2BytesInNetworkOrder(int number) {
byte[] orderBytes = new byte[4];
orderBytes[3] = (byte) (number & 0xFF);
orderBytes[2] = (byte) (number >> 8 & 0xFF);
orderBytes[1] = (byte) (number >> 16 & 0xFF);
orderBytes[0] = (byte) (number >> 24 & 0xFF);
return orderBytes;
}
/**
* 4个字节的网络字节序bytes数组还原成一个数字
*
* @param bytesInNetworkOrder
*/
private int bytesNetworkOrder2Number(byte[] bytesInNetworkOrder) {
int sourceNumber = 0;
for (int i = 0; i < 4; i++) {
sourceNumber <<= 8;
sourceNumber |= bytesInNetworkOrder[i] & 0xff;
}
return sourceNumber;
}
/**
* 随机生成16位字符串
*
* @return
*/
private String genRandomStr() {
String base = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
Random random = new Random();
StringBuffer sb = new StringBuffer();
for (int i = 0; i < 16; i++) {
int number = random.nextInt(base.length());
sb.append(base.charAt(number));
}
return sb.toString();
}
/**
* 生成xml消息
*
* @param encrypt 加密后的消息密文
* @param signature 安全签名
* @param timestamp 时间戳
* @param nonce 随机字符串
* @return 生成的xml字符串
*/
private String generateXml(String encrypt, String signature, String timestamp, String nonce) {
String format =
"<xml>\n"
+ "<Encrypt><![CDATA[%1$s]]></Encrypt>\n"
+ "<MsgSignature><![CDATA[%2$s]]></MsgSignature>\n"
+ "<TimeStamp>%3$s</TimeStamp>\n"
+ "<Nonce><![CDATA[%4$s]]></Nonce>\n"
+ "</xml>";
return String.format(format, encrypt, signature, timestamp, nonce);
}
static String extractEncryptPart(String xml) {
try {
DocumentBuilder db = builderLocal.get();
Document document = db.parse(new InputSource(new StringReader(xml)));
Element root = document.getDocumentElement();
return root.getElementsByTagName("Encrypt").item(0).getTextContent();
} catch (Exception e) {
throw new RuntimeException(e);
}
}
}

41
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/crypto/WxMpCryptUtil.java Executable file
View File

@@ -0,0 +1,41 @@
/**
* 对公众平台发送给公众账号的消息加解密示例代码.
*
* @copyright Copyright (c) 1998-2014 Tencent Inc.
*/
// ------------------------------------------------------------------------
/**
* 针对org.apache.commons.codec.binary.Base64，
* 需要导入架包commons-codec-1.9（或commons-codec-1.8等其他版本）
* 官方下载地址：http://commons.apache.org/proper/commons-codec/download_codec.cgi
*/
package me.chanjar.weixin.mp.util.crypto;
import me.chanjar.weixin.mp.api.WxMpConfigStorage;
import org.apache.commons.codec.binary.Base64;
public class WxMpCryptUtil extends me.chanjar.weixin.common.util.crypto.WxCryptUtil {
/**
* 构造函数
*
* @param wxMpConfigStorage
*/
public WxMpCryptUtil(WxMpConfigStorage wxMpConfigStorage) {
/*
* @param token 公众平台上，开发者设置的token
* @param encodingAesKey 公众平台上，开发者设置的EncodingAESKey
* @param appId 公众平台appid
*/
String encodingAesKey = wxMpConfigStorage.getAesKey();
String token = wxMpConfigStorage.getToken();
String appId = wxMpConfigStorage.getAppId();
this.token = token;
this.appidOrCorpid = appId;
this.aesKey = Base64.decodeBase64(encodingAesKey + "=");
}
}

47
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/fs/FileUtils.java
View File

@@ -1,47 +0,0 @@
package me.chanjar.weixin.mp.util.fs;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
public class FileUtils {
/**
* 创建临时文件
* @param inputStream
* @param name 文件名
* @param ext 扩展名
* @return
* @throws IOException
*/
public static File createTmpFile(InputStream inputStream, String name, String ext) throws IOException {
FileOutputStream fos = null;
try {
File tmpFile = File.createTempFile(name, '.' + ext);
tmpFile.deleteOnExit();
fos = new FileOutputStream(tmpFile);
int read = 0;
byte[] bytes = new byte[1024 * 100];
while ((read = inputStream.read(bytes)) != -1) {
fos.write(bytes, 0, read);
}
fos.flush();
return tmpFile;
} finally {
if (inputStream != null) {
try {
inputStream.close();
} catch (IOException e) {
}
}
if (fos != null) {
try {
fos.close();
} catch (IOException e) {
}
}
}
}
}

27
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/InputStreamResponseHandler.java
View File

@@ -1,27 +0,0 @@
package me.chanjar.weixin.mp.util.http;
import java.io.IOException;
import java.io.InputStream;
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
import org.apache.http.StatusLine;
import org.apache.http.client.HttpResponseException;
import org.apache.http.client.ResponseHandler;
import org.apache.http.util.EntityUtils;
public class InputStreamResponseHandler implements ResponseHandler<InputStream> {
public static final ResponseHandler<InputStream> INSTANCE = new InputStreamResponseHandler();
public InputStream handleResponse(final HttpResponse response) throws HttpResponseException, IOException {
final StatusLine statusLine = response.getStatusLine();
final HttpEntity entity = response.getEntity();
if (statusLine.getStatusCode() >= 300) {
EntityUtils.consume(entity);
throw new HttpResponseException(statusLine.getStatusCode(), statusLine.getReasonPhrase());
}
return entity == null ? null : entity.getContent();
}
}

67
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MediaDownloadRequestExecutor.java
View File

@@ -1,67 +0,0 @@
package me.chanjar.weixin.mp.util.http;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import me.chanjar.weixin.mp.bean.result.WxError;
import me.chanjar.weixin.mp.exception.WxErrorException;
import me.chanjar.weixin.mp.util.fs.FileUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.http.Header;
import org.apache.http.client.ClientProtocolException;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.entity.ContentType;
/**
* 下载媒体文件请求执行器，请求的参数是String, 返回的结果是File
* @author chanjarster
*
*/
public class MediaDownloadRequestExecutor implements RequestExecutor<File, String> {
@Override
public File execute(String uri, String queryParam) throws WxErrorException, ClientProtocolException, IOException {
if (queryParam != null) {
if (uri.indexOf('?') == -1) {
uri += '?';
}
uri += uri.endsWith("?") ? queryParam : '&' + queryParam;
}
HttpGet httpGet = new HttpGet(uri);
CloseableHttpResponse response = httpclient.execute(httpGet);
Header[] contentTypeHeader = response.getHeaders("Content-Type");
if (contentTypeHeader != null && contentTypeHeader.length > 0) {
// 下载媒体文件出错
if (ContentType.TEXT_PLAIN.getMimeType().equals(contentTypeHeader[0].getValue())) {
String responseContent = Utf8ResponseHandler.INSTANCE.handleResponse(response);
throw new WxErrorException(WxError.fromJson(responseContent));
}
}
InputStream inputStream = InputStreamResponseHandler.INSTANCE.handleResponse(response);
// 视频文件不支持下载
String fileName = getFileName(response);
if (StringUtils.isBlank(fileName)) {
return null;
}
String[] name_ext = fileName.split("\\.");
File localFile = FileUtils.createTmpFile(inputStream, name_ext[0], name_ext[1]);
return localFile;
}
protected String getFileName(CloseableHttpResponse response) {
Header[] contentDispositionHeader = response.getHeaders("Content-disposition");
Pattern p = Pattern.compile(".*filename=\"(.*)\"");
Matcher m = p.matcher(contentDispositionHeader[0].getValue());
m.matches();
String fileName = m.group(1);
return fileName;
}
}

43
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MediaUploadRequestExecutor.java
View File

@@ -1,43 +0,0 @@
package me.chanjar.weixin.mp.util.http;
import java.io.File;
import java.io.IOException;
import me.chanjar.weixin.mp.bean.result.WxError;
import me.chanjar.weixin.mp.bean.result.WxMediaUploadResult;
import me.chanjar.weixin.mp.exception.WxErrorException;
import org.apache.http.HttpEntity;
import org.apache.http.client.ClientProtocolException;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.entity.ContentType;
import org.apache.http.entity.mime.MultipartEntityBuilder;
/**
* 上传媒体文件请求执行器，请求的参数是File, 返回的结果是String
* @author chanjarster
*
*/
public class MediaUploadRequestExecutor implements RequestExecutor<WxMediaUploadResult, File> {
@Override
public WxMediaUploadResult execute(String uri, File file) throws WxErrorException, ClientProtocolException, IOException {
HttpPost httpPost = new HttpPost(uri);
if (file != null) {
HttpEntity entity = MultipartEntityBuilder
.create()
.addBinaryBody("media", file)
.build();
httpPost.setEntity(entity);
httpPost.setHeader("Content-Type", ContentType.MULTIPART_FORM_DATA.toString());
}
CloseableHttpResponse response = httpclient.execute(httpPost);
String responseContent = Utf8ResponseHandler.INSTANCE.handleResponse(response);
WxError error = WxError.fromJson(responseContent);
if (error.getErrorCode() != 0) {
throw new WxErrorException(error);
}
return WxMediaUploadResult.fromJson(responseContent);
}
}

28
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/QrCodeRequestExecutor.java
View File

@@ -1,31 +1,33 @@
package me.chanjar.weixin.mp.util.http;
import me.chanjar.weixin.common.bean.result.WxError;
import me.chanjar.weixin.common.util.fs.FileUtils;
import me.chanjar.weixin.common.util.http.InputStreamResponseHandler;
import me.chanjar.weixin.common.util.http.RequestExecutor;
import me.chanjar.weixin.common.util.http.Utf8ResponseHandler;
import me.chanjar.weixin.mp.bean.result.WxMpQrCodeTicket;
import me.chanjar.weixin.common.exception.WxErrorException;
import org.apache.http.Header;
import org.apache.http.client.ClientProtocolException;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.entity.ContentType;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.net.URLEncoder;
import java.util.UUID;
import org.apache.http.Header;
import org.apache.http.client.ClientProtocolException;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.entity.ContentType;
import me.chanjar.weixin.mp.bean.result.WxError;
import me.chanjar.weixin.mp.bean.result.WxQrCodeTicket;
import me.chanjar.weixin.mp.exception.WxErrorException;
import me.chanjar.weixin.mp.util.fs.FileUtils;
/**
* 获得QrCode图片 请求执行器
* @author chanjarster
*
*/
public class QrCodeRequestExecutor implements RequestExecutor<File, WxQrCodeTicket> {
public class QrCodeRequestExecutor implements RequestExecutor<File, WxMpQrCodeTicket> {
@Override
public File execute(String uri, WxQrCodeTicket ticket) throws WxErrorException, ClientProtocolException, IOException {
public File execute(String uri, WxMpQrCodeTicket ticket) throws WxErrorException, ClientProtocolException, IOException {
if (ticket != null) {
if (uri.indexOf('?') == -1) {
uri += '?';

24
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/RequestExecutor.java
View File

@@ -1,24 +0,0 @@
package me.chanjar.weixin.mp.util.http;
import java.io.IOException;
import org.apache.http.client.ClientProtocolException;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients;
import me.chanjar.weixin.mp.exception.WxErrorException;
/**
* http请求执行器
* @author chanjarster
*
* @param <T> 返回值类型
* @param <E> 请求参数类型
*/
public interface RequestExecutor<T, E> {
public static final CloseableHttpClient httpclient = HttpClients.createDefault();
public T execute(String uri, E data) throws WxErrorException, ClientProtocolException, IOException;
}

36
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/SimpleGetRequestExecutor.java
View File

@@ -1,36 +0,0 @@
package me.chanjar.weixin.mp.util.http;
import java.io.IOException;
import me.chanjar.weixin.mp.bean.result.WxError;
import me.chanjar.weixin.mp.exception.WxErrorException;
import org.apache.http.client.ClientProtocolException;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpGet;
/**
* 简单的GET请求执行器，请求的参数是String, 返回的结果也是String
* @author chanjarster
*
*/
public class SimpleGetRequestExecutor implements RequestExecutor<String, String> {
@Override
public String execute(String uri, String queryParam) throws WxErrorException, ClientProtocolException, IOException {
if (queryParam != null) {
if (uri.indexOf('?') == -1) {
uri += '?';
}
uri += uri.endsWith("?") ? queryParam : '&' + queryParam;
}
HttpGet httpGet = new HttpGet(uri);
CloseableHttpResponse response = httpclient.execute(httpGet);
String responseContent = Utf8ResponseHandler.INSTANCE.handleResponse(response);
WxError error = WxError.fromJson(responseContent);
if (error.getErrorCode() != 0) {
throw new WxErrorException(error);
}
return responseContent;
}
}

36
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/SimplePostRequestExecutor.java
View File

@@ -1,36 +0,0 @@
package me.chanjar.weixin.mp.util.http;
import java.io.IOException;
import me.chanjar.weixin.mp.bean.result.WxError;
import me.chanjar.weixin.mp.exception.WxErrorException;
import org.apache.http.Consts;
import org.apache.http.client.ClientProtocolException;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.entity.StringEntity;
/**
* 简单的POST请求执行器，请求的参数是String, 返回的结果也是String
* @author chanjarster
*
*/
public class SimplePostRequestExecutor implements RequestExecutor<String, String> {
@Override
public String execute(String uri, String postEntity) throws WxErrorException, ClientProtocolException, IOException {
HttpPost httpPost = new HttpPost(uri);
if (postEntity != null) {
StringEntity entity = new StringEntity(postEntity, Consts.UTF_8);
httpPost.setEntity(entity);
}
CloseableHttpResponse response = httpclient.execute(httpPost);
String responseContent = Utf8ResponseHandler.INSTANCE.handleResponse(response);
WxError error = WxError.fromJson(responseContent);
if (error.getErrorCode() != 0) {
throw new WxErrorException(error);
}
return responseContent;
}
}

32
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/Utf8ResponseHandler.java
View File

@@ -1,32 +0,0 @@
package me.chanjar.weixin.mp.util.http;
import java.io.IOException;
import org.apache.http.Consts;
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
import org.apache.http.StatusLine;
import org.apache.http.client.HttpResponseException;
import org.apache.http.client.ResponseHandler;
import org.apache.http.util.EntityUtils;
/**
* copy from {@link org.apache.http.impl.client.BasicResponseHandler}
* @author chanjarster
*
*/
public class Utf8ResponseHandler implements ResponseHandler<String> {
public static final ResponseHandler<String> INSTANCE = new Utf8ResponseHandler();
public String handleResponse(final HttpResponse response) throws HttpResponseException, IOException {
final StatusLine statusLine = response.getStatusLine();
final HttpEntity entity = response.getEntity();
if (statusLine.getStatusCode() >= 300) {
EntityUtils.consume(entity);
throw new HttpResponseException(statusLine.getStatusCode(), statusLine.getReasonPhrase());
}
return entity == null ? null : EntityUtils.toString(entity, Consts.UTF_8);
}
}

115
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/GsonHelper.java
View File

@@ -1,115 +0,0 @@
/*
* KINGSTAR MEDIA SOLUTIONS Co.,LTD. Copyright c 2005-2013. All rights reserved.
*
* This source code is the property of KINGSTAR MEDIA SOLUTIONS LTD. It is intended
* only for the use of KINGSTAR MEDIA application development. Reengineering, reproduction
* 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.
*/
package me.chanjar.weixin.mp.util.json;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
public class GsonHelper {
public static boolean isNull(JsonElement element) {
return element == null || element.isJsonNull();
}
public static boolean isNotNull(JsonElement element) {
return !isNull(element);
}
public static Long getLong(JsonObject json, String property) {
return getAsLong(json.get(property));
}
public static long getPrimitiveLong(JsonObject json, String property) {
return getAsPrimitiveLong(json.get(property));
}
public static Integer getInteger(JsonObject json, String property) {
return getAsInteger(json.get(property));
}
public static int getPrimitiveInteger(JsonObject json, String property) {
return getAsPrimitiveInt(json.get(property));
}
public static Double getDouble(JsonObject json, String property) {
return getAsDouble(json.get(property));
}
public static double getPrimitiveDouble(JsonObject json, String property) {
return getAsPrimitiveDouble(json.get(property));
}
public static Float getFloat(JsonObject json, String property) {
return getAsFloat(json.get(property));
}
public static float getPrimitiveFloat(JsonObject json, String property) {
return getAsPrimitiveFloat(json.get(property));
}
public static Boolean getBoolean(JsonObject json, String property) {
return getAsBoolean(json.get(property));
}
public static String getString(JsonObject json, String property) {
return getAsString(json.get(property));
}
public static String getAsString(JsonElement element) {
return isNull(element) ? null : element.getAsString();
}
public static Long getAsLong(JsonElement element) {
return isNull(element) ? null : element.getAsLong();
}
public static long getAsPrimitiveLong(JsonElement element) {
Long r = getAsLong(element);
return r == null ? 0l : r;
}
public static Integer getAsInteger(JsonElement element) {
return isNull(element) ? null : element.getAsInt();
}
public static int getAsPrimitiveInt(JsonElement element) {
Integer r = getAsInteger(element);
return r == null ? 0 : r;
}
public static Boolean getAsBoolean(JsonElement element) {
return isNull(element) ? null : element.getAsBoolean();
}
public static boolean getAsPrimitiveBool(JsonElement element) {
Boolean r = getAsBoolean(element);
return r == null ? false : r.booleanValue();
}
public static Double getAsDouble(JsonElement element) {
return isNull(element) ? null : element.getAsDouble();
}
public static double getAsPrimitiveDouble(JsonElement element) {
Double r = getAsDouble(element);
return r == null ? 0d : r;
}
public static Float getAsFloat(JsonElement element) {
return isNull(element) ? null : element.getAsFloat();
}
public static float getAsPrimitiveFloat(JsonElement element) {
Float r = getAsFloat(element);
return r == null ? 0f : r;
}
}

36
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxAccessTokenAdapter.java
View File

@@ -1,36 +0,0 @@
/*
* KINGSTAR MEDIA SOLUTIONS Co.,LTD. Copyright c 2005-2013. All rights reserved.
*
* This source code is the property of KINGSTAR MEDIA SOLUTIONS LTD. It is intended
* only for the use of KINGSTAR MEDIA application development. Reengineering, reproduction
* 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.
*/
package me.chanjar.weixin.mp.util.json;
import com.google.gson.*;
import me.chanjar.weixin.mp.bean.WxAccessToken;
import java.lang.reflect.Type;
/**
*
* @author Daniel Qian
*
*/
public class WxAccessTokenAdapter implements JsonDeserializer<WxAccessToken> {
public WxAccessToken deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
WxAccessToken accessToken = new WxAccessToken();
JsonObject accessTokenJsonObject = json.getAsJsonObject();
if (accessTokenJsonObject.get("access_token") != null && !accessTokenJsonObject.get("access_token").isJsonNull()) {
accessToken.setAccessToken(GsonHelper.getAsString(accessTokenJsonObject.get("access_token")));
}
if (accessTokenJsonObject.get("expires_in") != null && !accessTokenJsonObject.get("expires_in").isJsonNull()) {
accessToken.setExpiresIn(GsonHelper.getAsPrimitiveInt(accessTokenJsonObject.get("expires_in")));
}
return accessToken;
}
}

36
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxErrorAdapter.java
View File

@@ -1,36 +0,0 @@
/*
* KINGSTAR MEDIA SOLUTIONS Co.,LTD. Copyright c 2005-2013. All rights reserved.
*
* This source code is the property of KINGSTAR MEDIA SOLUTIONS LTD. It is intended
* only for the use of KINGSTAR MEDIA application development. Reengineering, reproduction
* 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.
*/
package me.chanjar.weixin.mp.util.json;
import com.google.gson.*;
import me.chanjar.weixin.mp.bean.result.WxError;
import java.lang.reflect.Type;
/**
*
* @author Daniel Qian
*
*/
public class WxErrorAdapter implements JsonDeserializer<WxError> {
public WxError deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
WxError wxError = new WxError();
JsonObject wxErrorJsonObject = json.getAsJsonObject();
if (wxErrorJsonObject.get("errcode") != null && !wxErrorJsonObject.get("errcode").isJsonNull()) {
wxError.setErrorCode(GsonHelper.getAsPrimitiveInt(wxErrorJsonObject.get("errcode")));
}
if (wxErrorJsonObject.get("errmsg") != null && !wxErrorJsonObject.get("errmsg").isJsonNull()) {
wxError.setErrorMsg(GsonHelper.getAsString(wxErrorJsonObject.get("errmsg")));
}
return wxError;
}
}

37
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxGsonBuilder.java
View File

@@ -1,37 +0,0 @@
package me.chanjar.weixin.mp.util.json;
import me.chanjar.weixin.bean.*;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import me.chanjar.weixin.mp.bean.*;
import me.chanjar.weixin.mp.bean.result.*;
public class WxGsonBuilder {
public static final GsonBuilder INSTANCE = new GsonBuilder();
static {
INSTANCE.disableHtmlEscaping();
INSTANCE.registerTypeAdapter(WxCustomMessage.class, new WxCustomMessageGsonAdapter());
INSTANCE.registerTypeAdapter(WxMenu.class, new WxMenuGsonAdapter());
INSTANCE.registerTypeAdapter(WxMassNews.class, new WxMassNewsGsonAdapter());
INSTANCE.registerTypeAdapter(WxMassGroupMessage.class, new WxMassMessageGsonAdapter());
INSTANCE.registerTypeAdapter(WxMassOpenIdsMessage.class, new WxMassOpenIdsMessageGsonAdapter());
INSTANCE.registerTypeAdapter(WxGroup.class, new WxGroupGsonAdapter());
INSTANCE.registerTypeAdapter(WxUser.class, new WxUserGsonAdapter());
INSTANCE.registerTypeAdapter(WxUserList.class, new WxUserListGsonAdapter());
INSTANCE.registerTypeAdapter(WxAccessToken.class, new WxAccessTokenAdapter());
INSTANCE.registerTypeAdapter(WxError.class, new WxErrorAdapter());
INSTANCE.registerTypeAdapter(WxMassVideo.class, new WxMassVideoAdapter());
INSTANCE.registerTypeAdapter(WxMediaUploadResult.class, new WxMediaUploadResultAdapter());
INSTANCE.registerTypeAdapter(WxMassSendResult.class, new WxMassSendResultAdapter());
INSTANCE.registerTypeAdapter(WxMassUploadResult.class, new WxMassUploadResultAdapter());
INSTANCE.registerTypeAdapter(WxQrCodeTicket.class, new WxQrCodeTicketAdapter());
}
public static Gson create() {
return INSTANCE.create();
}
}

42
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMediaUploadResultAdapter.java
View File

@@ -1,42 +0,0 @@
/*
* KINGSTAR MEDIA SOLUTIONS Co.,LTD. Copyright c 2005-2013. All rights reserved.
*
* This source code is the property of KINGSTAR MEDIA SOLUTIONS LTD. It is intended
* only for the use of KINGSTAR MEDIA application development. Reengineering, reproduction
* 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.
*/
package me.chanjar.weixin.mp.util.json;
import com.google.gson.*;
import me.chanjar.weixin.mp.bean.result.WxMediaUploadResult;
import java.lang.reflect.Type;
/**
*
* @author Daniel Qian
*
*/
public class WxMediaUploadResultAdapter implements JsonDeserializer<WxMediaUploadResult> {
public WxMediaUploadResult deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
WxMediaUploadResult uploadResult = new WxMediaUploadResult();
JsonObject uploadResultJsonObject = json.getAsJsonObject();
if (uploadResultJsonObject.get("type") != null && !uploadResultJsonObject.get("type").isJsonNull()) {
uploadResult.setType(GsonHelper.getAsString(uploadResultJsonObject.get("type")));
}
if (uploadResultJsonObject.get("media_id") != null && !uploadResultJsonObject.get("media_id").isJsonNull()) {
uploadResult.setMediaId(GsonHelper.getAsString(uploadResultJsonObject.get("media_id")));
}
if (uploadResultJsonObject.get("thumb_media_id") != null && !uploadResultJsonObject.get("thumb_media_id").isJsonNull()) {
uploadResult.setThumbMediaId(GsonHelper.getAsString(uploadResultJsonObject.get("thumb_media_id")));
}
if (uploadResultJsonObject.get("created_at") != null && !uploadResultJsonObject.get("created_at").isJsonNull()) {
uploadResult.setCreatedAt(GsonHelper.getAsPrimitiveLong(uploadResultJsonObject.get("created_at")));
}
return uploadResult;
}
}

94
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMenuGsonAdapter.java
View File

@@ -1,94 +0,0 @@
/*
* KINGSTAR MEDIA SOLUTIONS Co.,LTD. Copyright c 2005-2013. All rights reserved.
*
* This source code is the property of KINGSTAR MEDIA SOLUTIONS LTD. It is intended
* only for the use of KINGSTAR MEDIA application development. Reengineering, reproduction
* 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.
*/
package me.chanjar.weixin.mp.util.json;
import java.lang.reflect.Type;
import me.chanjar.weixin.mp.bean.WxMenu;
import com.google.gson.JsonArray;
import com.google.gson.JsonDeserializationContext;
import com.google.gson.JsonDeserializer;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.JsonParseException;
import com.google.gson.JsonSerializationContext;
import com.google.gson.JsonSerializer;
/**
*
* @author qianjia
*
*/
public class WxMenuGsonAdapter implements JsonSerializer<WxMenu>, JsonDeserializer<WxMenu> {
public JsonElement serialize(WxMenu menu, Type typeOfSrc, JsonSerializationContext context) {
JsonObject json = new JsonObject();
JsonArray buttonArray = new JsonArray();
for (WxMenu.WxMenuButton button : menu.getButtons()) {
JsonObject buttonJson = convertToJson(button);
buttonArray.add(buttonJson);
}
json.add("button", buttonArray);
return json;
}
protected JsonObject convertToJson(WxMenu.WxMenuButton button) {
JsonObject buttonJson = new JsonObject();
buttonJson.addProperty("type", button.getType());
buttonJson.addProperty("name", button.getName());
buttonJson.addProperty("key", button.getKey());
buttonJson.addProperty("url", button.getUrl());
if (button.getSubButtons() != null && button.getSubButtons().size() > 0) {
JsonArray buttonArray = new JsonArray();
for (WxMenu.WxMenuButton sub_button : button.getSubButtons()) {
buttonArray.add(convertToJson(sub_button));
}
buttonJson.add("sub_button", buttonArray);
}
return buttonJson;
}
public WxMenu deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
/*
* 操蛋的微信
* 创建菜单时是 { button : ... }
* 查询菜单时是 { menu : { button : ... } }
*/
WxMenu menu = new WxMenu();
JsonObject menuJson = json.getAsJsonObject().get("menu").getAsJsonObject();
JsonArray buttonsJson = menuJson.get("button").getAsJsonArray();
for (int i = 0; i < buttonsJson.size(); i++) {
JsonObject buttonJson = buttonsJson.get(i).getAsJsonObject();
WxMenu.WxMenuButton button = convertFromJson(buttonJson);
menu.getButtons().add(button);
if (buttonJson.get("sub_button") == null || buttonJson.get("sub_button").isJsonNull()) {
continue;
}
JsonArray sub_buttonsJson = buttonJson.get("sub_button").getAsJsonArray();
for (int j = 0; j < sub_buttonsJson.size(); j++) {
JsonObject sub_buttonJson = sub_buttonsJson.get(j).getAsJsonObject();
button.getSubButtons().add(convertFromJson(sub_buttonJson));
}
}
return menu;
}
protected WxMenu.WxMenuButton convertFromJson(JsonObject json) {
WxMenu.WxMenuButton button = new WxMenu.WxMenuButton();
button.setName(GsonHelper.getString(json, "name"));
button.setKey(GsonHelper.getString(json, "key"));
button.setUrl(GsonHelper.getString(json, "url"));
button.setType(GsonHelper.getString(json, "type"));
return button;
}
}

31
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxCustomMessageGsonAdapter.java → weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpCustomMessageGsonAdapter.java
View File

@@ -8,48 +8,43 @@
*/
package me.chanjar.weixin.mp.util.json;
import com.google.gson.*;
import me.chanjar.weixin.mp.api.WxMpConsts;
import me.chanjar.weixin.mp.bean.WxMpCustomMessage;
import java.lang.reflect.Type;
import me.chanjar.weixin.mp.api.WxConsts;
import me.chanjar.weixin.mp.bean.WxCustomMessage;
import com.google.gson.JsonArray;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.JsonSerializationContext;
import com.google.gson.JsonSerializer;
/**
*
* @author qianjia
*
*/
public class WxCustomMessageGsonAdapter implements JsonSerializer<WxCustomMessage> {
public class WxMpCustomMessageGsonAdapter implements JsonSerializer<WxMpCustomMessage> {
public JsonElement serialize(WxCustomMessage message, Type typeOfSrc, JsonSerializationContext context) {
public JsonElement serialize(WxMpCustomMessage message, Type typeOfSrc, JsonSerializationContext context) {
JsonObject messageJson = new JsonObject();
messageJson.addProperty("touser", message.getToUser());
messageJson.addProperty("msgtype", message.getMsgType());
if (WxConsts.CUSTOM_MSG_TEXT.equals(message.getMsgType())) {
if (WxMpConsts.CUSTOM_MSG_TEXT.equals(message.getMsgType())) {
JsonObject text = new JsonObject();
text.addProperty("content", message.getContent());
messageJson.add("text", text);
}
if (WxConsts.CUSTOM_MSG_IMAGE.equals(message.getMsgType())) {
if (WxMpConsts.CUSTOM_MSG_IMAGE.equals(message.getMsgType())) {
JsonObject image = new JsonObject();
image.addProperty("media_id", message.getMediaId());
messageJson.add("image", image);
}
if (WxConsts.CUSTOM_MSG_VOICE.equals(message.getMsgType())) {
if (WxMpConsts.CUSTOM_MSG_VOICE.equals(message.getMsgType())) {
JsonObject voice = new JsonObject();
voice.addProperty("media_id", message.getMediaId());
messageJson.add("voice", voice);
}
if (WxConsts.CUSTOM_MSG_VIDEO.equals(message.getMsgType())) {
if (WxMpConsts.CUSTOM_MSG_VIDEO.equals(message.getMsgType())) {
JsonObject video = new JsonObject();
video.addProperty("media_id", message.getMediaId());
video.addProperty("thumb_media_id", message.getThumbMediaId());
@@ -58,7 +53,7 @@ public class WxCustomMessageGsonAdapter implements JsonSerializer<WxCustomMessag
messageJson.add("video", video);
}
if (WxConsts.CUSTOM_MSG_MUSIC.equals(message.getMsgType())) {
if (WxMpConsts.CUSTOM_MSG_MUSIC.equals(message.getMsgType())) {
JsonObject music = new JsonObject();
music.addProperty("title", message.getTitle());
music.addProperty("description", message.getDescription());
@@ -68,9 +63,9 @@ public class WxCustomMessageGsonAdapter implements JsonSerializer<WxCustomMessag
messageJson.add("music", music);
}
if (WxConsts.CUSTOM_MSG_NEWS.equals(message.getMsgType())) {
if (WxMpConsts.CUSTOM_MSG_NEWS.equals(message.getMsgType())) {
JsonArray articleJsonArray = new JsonArray();
for (WxCustomMessage.WxArticle article : message.getArticles()) {
for (WxMpCustomMessage.WxArticle article : message.getArticles()) {
JsonObject articleJson = new JsonObject();
articleJson.addProperty("title", article.getTitle());
articleJson.addProperty("description", article.getDescription());

22
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxGroupGsonAdapter.java → weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpGroupGsonAdapter.java
View File

@@ -8,26 +8,20 @@
*/
package me.chanjar.weixin.mp.util.json;
import com.google.gson.*;
import me.chanjar.weixin.common.util.json.GsonHelper;
import me.chanjar.weixin.mp.bean.WxMpGroup;
import java.lang.reflect.Type;
import me.chanjar.weixin.mp.bean.WxGroup;
import com.google.gson.JsonDeserializationContext;
import com.google.gson.JsonDeserializer;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.JsonParseException;
import com.google.gson.JsonSerializationContext;
import com.google.gson.JsonSerializer;
/**
*
* @author qianjia
*
*/
public class WxGroupGsonAdapter implements JsonSerializer<WxGroup>, JsonDeserializer<WxGroup> {
public class WxMpGroupGsonAdapter implements JsonSerializer<WxMpGroup>, JsonDeserializer<WxMpGroup> {
public JsonElement serialize(WxGroup group, Type typeOfSrc, JsonSerializationContext context) {
public JsonElement serialize(WxMpGroup group, Type typeOfSrc, JsonSerializationContext context) {
JsonObject json = new JsonObject();
JsonObject groupJson = new JsonObject();
groupJson.addProperty("name", group.getName());
@@ -37,8 +31,8 @@ public class WxGroupGsonAdapter implements JsonSerializer<WxGroup>, JsonDeserial
return json;
}
public WxGroup deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
WxGroup group = new WxGroup();
public WxMpGroup deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
WxMpGroup group = new WxMpGroup();
JsonObject groupJson = json.getAsJsonObject();
if (json.getAsJsonObject().get("group") != null) {
groupJson = json.getAsJsonObject().get("group").getAsJsonObject();

31
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpGsonBuilder.java Normal file
View File

@@ -0,0 +1,31 @@
package me.chanjar.weixin.mp.util.json;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import me.chanjar.weixin.mp.bean.*;
import me.chanjar.weixin.mp.bean.result.*;
public class WxMpGsonBuilder {
public static final GsonBuilder INSTANCE = new GsonBuilder();
static {
INSTANCE.disableHtmlEscaping();
INSTANCE.registerTypeAdapter(WxMpCustomMessage.class, new WxMpCustomMessageGsonAdapter());
INSTANCE.registerTypeAdapter(WxMpMassNews.class, new WxMpMassNewsGsonAdapter());
INSTANCE.registerTypeAdapter(WxMpMassGroupMessage.class, new WxMpMassMessageGsonAdapter());
INSTANCE.registerTypeAdapter(WxMpMassOpenIdsMessage.class, new WxMpMassOpenIdsMessageGsonAdapter());
INSTANCE.registerTypeAdapter(WxMpGroup.class, new WxMpGroupGsonAdapter());
INSTANCE.registerTypeAdapter(WxMpUser.class, new WxUserGsonAdapter());
INSTANCE.registerTypeAdapter(WxMpUserList.class, new WxUserListGsonAdapter());
INSTANCE.registerTypeAdapter(WxMpMassVideo.class, new WxMpMassVideoAdapter());
INSTANCE.registerTypeAdapter(WxMpMassSendResult.class, new WxMpMassSendResultAdapter());
INSTANCE.registerTypeAdapter(WxMpMassUploadResult.class, new WxMpMassUploadResultAdapter());
INSTANCE.registerTypeAdapter(WxMpQrCodeTicket.class, new WxQrCodeTicketAdapter());
}
public static Gson create() {
return INSTANCE.create();
}
}

33
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMassMessageGsonAdapter.java → weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMassMessageGsonAdapter.java
View File

@@ -8,54 +8,53 @@
*/
package me.chanjar.weixin.mp.util.json;
import java.lang.reflect.Type;
import me.chanjar.weixin.mp.api.WxConsts;
import me.chanjar.weixin.mp.bean.WxMassGroupMessage;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.JsonSerializationContext;
import com.google.gson.JsonSerializer;
import me.chanjar.weixin.mp.api.WxMpConsts;
import me.chanjar.weixin.mp.bean.WxMpMassGroupMessage;
import java.lang.reflect.Type;
/**
*
* @author qianjia
*
*/
public class WxMassMessageGsonAdapter implements JsonSerializer<WxMassGroupMessage> {
public class WxMpMassMessageGsonAdapter implements JsonSerializer<WxMpMassGroupMessage> {
public JsonElement serialize(WxMassGroupMessage message, Type typeOfSrc, JsonSerializationContext context) {
public JsonElement serialize(WxMpMassGroupMessage message, Type typeOfSrc, JsonSerializationContext context) {
JsonObject messageJson = new JsonObject();
JsonObject filter = new JsonObject();
filter.addProperty("group_id", message.getGroupId());
messageJson.add("filter", filter);
if (WxConsts.MASS_MSG_NEWS.equals(message.getMsgtype())) {
if (WxMpConsts.MASS_MSG_NEWS.equals(message.getMsgtype())) {
JsonObject sub = new JsonObject();
sub.addProperty("media_id", message.getMediaId());
messageJson.add(WxConsts.MASS_MSG_NEWS, sub);
messageJson.add(WxMpConsts.MASS_MSG_NEWS, sub);
}
if (WxConsts.MASS_MSG_TEXT.equals(message.getMsgtype())) {
if (WxMpConsts.MASS_MSG_TEXT.equals(message.getMsgtype())) {
JsonObject sub = new JsonObject();
sub.addProperty("content", message.getContent());
messageJson.add(WxConsts.MASS_MSG_TEXT, sub);
messageJson.add(WxMpConsts.MASS_MSG_TEXT, sub);
}
if (WxConsts.MASS_MSG_VOICE.equals(message.getMsgtype())) {
if (WxMpConsts.MASS_MSG_VOICE.equals(message.getMsgtype())) {
JsonObject sub = new JsonObject();
sub.addProperty("media_id", message.getMediaId());
messageJson.add(WxConsts.MASS_MSG_VOICE, sub);
messageJson.add(WxMpConsts.MASS_MSG_VOICE, sub);
}
if (WxConsts.MASS_MSG_IMAGE.equals(message.getMsgtype())) {
if (WxMpConsts.MASS_MSG_IMAGE.equals(message.getMsgtype())) {
JsonObject sub = new JsonObject();
sub.addProperty("media_id", message.getMediaId());
messageJson.add(WxConsts.MASS_MSG_IMAGE, sub);
messageJson.add(WxMpConsts.MASS_MSG_IMAGE, sub);
}
if (WxConsts.MASS_MSG_VIDEO.equals(message.getMsgtype())) {
if (WxMpConsts.MASS_MSG_VIDEO.equals(message.getMsgtype())) {
JsonObject sub = new JsonObject();
sub.addProperty("media_id", message.getMediaId());
messageJson.add(WxConsts.MASS_MSG_VIDEO, sub);
messageJson.add(WxMpConsts.MASS_MSG_VIDEO, sub);
}
messageJson.addProperty("msgtype", message.getMsgtype());
return messageJson;

17
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMassNewsGsonAdapter.java → weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMassNewsGsonAdapter.java
View File

@@ -8,28 +8,23 @@
*/
package me.chanjar.weixin.mp.util.json;
import com.google.gson.*;
import me.chanjar.weixin.mp.bean.WxMpMassNews;
import java.lang.reflect.Type;
import me.chanjar.weixin.mp.bean.WxMassNews;
import com.google.gson.JsonArray;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.JsonSerializationContext;
import com.google.gson.JsonSerializer;
/**
*
* @author qianjia
*
*/
public class WxMassNewsGsonAdapter implements JsonSerializer<WxMassNews> {
public class WxMpMassNewsGsonAdapter implements JsonSerializer<WxMpMassNews> {
public JsonElement serialize(WxMassNews message, Type typeOfSrc, JsonSerializationContext context) {
public JsonElement serialize(WxMpMassNews message, Type typeOfSrc, JsonSerializationContext context) {
JsonObject newsJson = new JsonObject();
JsonArray articleJsonArray = new JsonArray();
for (WxMassNews.WxMassNewsArticle article : message.getArticles()) {
for (WxMpMassNews.WxMassNewsArticle article : message.getArticles()) {
JsonObject articleJson = new JsonObject();
articleJson.addProperty("thumb_media_id", article.getThumbMediaId());
articleJson.addProperty("title", article.getTitle());

38
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMassOpenIdsMessageGsonAdapter.java → weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMassOpenIdsMessageGsonAdapter.java
View File

@@ -8,26 +8,20 @@
*/
package me.chanjar.weixin.mp.util.json;
import com.google.gson.*;
import me.chanjar.weixin.mp.api.WxMpConsts;
import me.chanjar.weixin.mp.bean.WxMpMassOpenIdsMessage;
import java.lang.reflect.Type;
import me.chanjar.weixin.mp.api.WxConsts;
import me.chanjar.weixin.mp.bean.WxMassOpenIdsMessage;
import com.google.gson.JsonArray;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.JsonPrimitive;
import com.google.gson.JsonSerializationContext;
import com.google.gson.JsonSerializer;
/**
*
* @author qianjia
*
*/
public class WxMassOpenIdsMessageGsonAdapter implements JsonSerializer<WxMassOpenIdsMessage> {
public class WxMpMassOpenIdsMessageGsonAdapter implements JsonSerializer<WxMpMassOpenIdsMessage> {
public JsonElement serialize(WxMassOpenIdsMessage message, Type typeOfSrc, JsonSerializationContext context) {
public JsonElement serialize(WxMpMassOpenIdsMessage message, Type typeOfSrc, JsonSerializationContext context) {
JsonObject messageJson = new JsonObject();
JsonArray toUsers = new JsonArray();
@@ -36,30 +30,30 @@ public class WxMassOpenIdsMessageGsonAdapter implements JsonSerializer<WxMassOpe
}
messageJson.add("touser", toUsers);
if (WxConsts.MASS_MSG_NEWS.equals(message.getMsgType())) {
if (WxMpConsts.MASS_MSG_NEWS.equals(message.getMsgType())) {
JsonObject sub = new JsonObject();
sub.addProperty("media_id", message.getMediaId());
messageJson.add(WxConsts.MASS_MSG_NEWS, sub);
messageJson.add(WxMpConsts.MASS_MSG_NEWS, sub);
}
if (WxConsts.MASS_MSG_TEXT.equals(message.getMsgType())) {
if (WxMpConsts.MASS_MSG_TEXT.equals(message.getMsgType())) {
JsonObject sub = new JsonObject();
sub.addProperty("content", message.getContent());
messageJson.add(WxConsts.MASS_MSG_TEXT, sub);
messageJson.add(WxMpConsts.MASS_MSG_TEXT, sub);
}
if (WxConsts.MASS_MSG_VOICE.equals(message.getMsgType())) {
if (WxMpConsts.MASS_MSG_VOICE.equals(message.getMsgType())) {
JsonObject sub = new JsonObject();
sub.addProperty("media_id", message.getMediaId());
messageJson.add(WxConsts.MASS_MSG_VOICE, sub);
messageJson.add(WxMpConsts.MASS_MSG_VOICE, sub);
}
if (WxConsts.MASS_MSG_IMAGE.equals(message.getMsgType())) {
if (WxMpConsts.MASS_MSG_IMAGE.equals(message.getMsgType())) {
JsonObject sub = new JsonObject();
sub.addProperty("media_id", message.getMediaId());
messageJson.add(WxConsts.MASS_MSG_IMAGE, sub);
messageJson.add(WxMpConsts.MASS_MSG_IMAGE, sub);
}
if (WxConsts.MASS_MSG_VIDEO.equals(message.getMsgType())) {
if (WxMpConsts.MASS_MSG_VIDEO.equals(message.getMsgType())) {
JsonObject sub = new JsonObject();
sub.addProperty("media_id", message.getMediaId());
messageJson.add(WxConsts.MASS_MSG_VIDEO, sub);
messageJson.add(WxMpConsts.MASS_MSG_VIDEO, sub);
}
messageJson.addProperty("msgtype", message.getMsgType());
return messageJson;

9
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMassSendResultAdapter.java → weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMassSendResultAdapter.java
View File

@@ -9,7 +9,8 @@
package me.chanjar.weixin.mp.util.json;
import com.google.gson.*;
import me.chanjar.weixin.mp.bean.result.WxMassSendResult;
import me.chanjar.weixin.common.util.json.GsonHelper;
import me.chanjar.weixin.mp.bean.result.WxMpMassSendResult;
import java.lang.reflect.Type;
@@ -18,10 +19,10 @@ import java.lang.reflect.Type;
* @author Daniel Qian
*
*/
public class WxMassSendResultAdapter implements JsonDeserializer<WxMassSendResult> {
public class WxMpMassSendResultAdapter implements JsonDeserializer<WxMpMassSendResult> {
public WxMassSendResult deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
WxMassSendResult sendResult = new WxMassSendResult();
public WxMpMassSendResult deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
WxMpMassSendResult sendResult = new WxMpMassSendResult();
JsonObject sendResultJsonObject = json.getAsJsonObject();
if (sendResultJsonObject.get("errcode") != null && !sendResultJsonObject.get("errcode").isJsonNull()) {

9
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMassUploadResultAdapter.java → weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMassUploadResultAdapter.java
View File

@@ -9,7 +9,8 @@
package me.chanjar.weixin.mp.util.json;
import com.google.gson.*;
import me.chanjar.weixin.mp.bean.result.WxMassUploadResult;
import me.chanjar.weixin.common.util.json.GsonHelper;
import me.chanjar.weixin.mp.bean.result.WxMpMassUploadResult;
import java.lang.reflect.Type;
@@ -18,10 +19,10 @@ import java.lang.reflect.Type;
* @author Daniel Qian
*
*/
public class WxMassUploadResultAdapter implements JsonDeserializer<WxMassUploadResult> {
public class WxMpMassUploadResultAdapter implements JsonDeserializer<WxMpMassUploadResult> {
public WxMassUploadResult deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
WxMassUploadResult uploadResult = new WxMassUploadResult();
public WxMpMassUploadResult deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
WxMpMassUploadResult uploadResult = new WxMpMassUploadResult();
JsonObject uploadResultJsonObject = json.getAsJsonObject();
if (uploadResultJsonObject.get("type") != null && !uploadResultJsonObject.get("type").isJsonNull()) {

11
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMassVideoAdapter.java → weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMassVideoAdapter.java
View File

@@ -8,8 +8,11 @@
*/
package me.chanjar.weixin.mp.util.json;
import com.google.gson.*;
import me.chanjar.weixin.mp.bean.WxMassVideo;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.JsonSerializationContext;
import com.google.gson.JsonSerializer;
import me.chanjar.weixin.mp.bean.WxMpMassVideo;
import java.lang.reflect.Type;
@@ -18,9 +21,9 @@ import java.lang.reflect.Type;
* @author Daniel Qian
*
*/
public class WxMassVideoAdapter implements JsonSerializer<WxMassVideo> {
public class WxMpMassVideoAdapter implements JsonSerializer<WxMpMassVideo> {
public JsonElement serialize(WxMassVideo message, Type typeOfSrc, JsonSerializationContext context) {
public JsonElement serialize(WxMpMassVideo message, Type typeOfSrc, JsonSerializationContext context) {
JsonObject messageJson = new JsonObject();
messageJson.addProperty("media_id", message.getMediaId());
messageJson.addProperty("description", message.getDescription());

9
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxQrCodeTicketAdapter.java
View File

@@ -9,7 +9,8 @@
package me.chanjar.weixin.mp.util.json;
import com.google.gson.*;
import me.chanjar.weixin.mp.bean.result.WxQrCodeTicket;
import me.chanjar.weixin.common.util.json.GsonHelper;
import me.chanjar.weixin.mp.bean.result.WxMpQrCodeTicket;
import java.lang.reflect.Type;
@@ -18,10 +19,10 @@ import java.lang.reflect.Type;
* @author Daniel Qian
*
*/
public class WxQrCodeTicketAdapter implements JsonDeserializer<WxQrCodeTicket> {
public class WxQrCodeTicketAdapter implements JsonDeserializer<WxMpQrCodeTicket> {
public WxQrCodeTicket deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
WxQrCodeTicket ticket = new WxQrCodeTicket();
public WxMpQrCodeTicket deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
WxMpQrCodeTicket ticket = new WxMpQrCodeTicket();
JsonObject ticketJsonObject = json.getAsJsonObject();
if (ticketJsonObject.get("ticket") != null && !ticketJsonObject.get("ticket").isJsonNull()) {

46
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxUserGsonAdapter.java
View File

@@ -8,45 +8,41 @@
*/
package me.chanjar.weixin.mp.util.json;
import com.google.gson.*;
import me.chanjar.weixin.common.util.json.GsonHelper;
import me.chanjar.weixin.mp.bean.result.WxMpUser;
import java.lang.reflect.Type;
import me.chanjar.weixin.mp.bean.result.WxUser;
import com.google.gson.JsonDeserializationContext;
import com.google.gson.JsonDeserializer;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.JsonParseException;
/**
*
* @author qianjia
*
*/
public class WxUserGsonAdapter implements JsonDeserializer<WxUser> {
public class WxUserGsonAdapter implements JsonDeserializer<WxMpUser> {
public WxUser deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
public WxMpUser deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
JsonObject o = json.getAsJsonObject();
WxUser wxUser = new WxUser();
wxUser.setSubscribe(new Integer(0).equals(GsonHelper.getInteger(o, "subscribe")) ? false : true);
wxUser.setCity(GsonHelper.getString(o, "city"));
wxUser.setCountry(GsonHelper.getString(o, "country"));
wxUser.setHeadImgUrl(GsonHelper.getString(o, "headimgurl"));
wxUser.setLanguage(GsonHelper.getString(o, "language"));
wxUser.setNickname(GsonHelper.getString(o, "nickname"));
wxUser.setOpenId(GsonHelper.getString(o, "openid"));
wxUser.setProvince(GsonHelper.getString(o, "province"));
wxUser.setSubscribeTime(GsonHelper.getLong(o, "subscribe_time"));
wxUser.setUnionId(GsonHelper.getString(o, "unionid"));
WxMpUser wxMpUser = new WxMpUser();
wxMpUser.setSubscribe(new Integer(0).equals(GsonHelper.getInteger(o, "subscribe")) ? false : true);
wxMpUser.setCity(GsonHelper.getString(o, "city"));
wxMpUser.setCountry(GsonHelper.getString(o, "country"));
wxMpUser.setHeadImgUrl(GsonHelper.getString(o, "headimgurl"));
wxMpUser.setLanguage(GsonHelper.getString(o, "language"));
wxMpUser.setNickname(GsonHelper.getString(o, "nickname"));
wxMpUser.setOpenId(GsonHelper.getString(o, "openid"));
wxMpUser.setProvince(GsonHelper.getString(o, "province"));
wxMpUser.setSubscribeTime(GsonHelper.getLong(o, "subscribe_time"));
wxMpUser.setUnionId(GsonHelper.getString(o, "unionid"));
Integer sex = GsonHelper.getInteger(o, "sex");
if(new Integer(1).equals(sex)) {
wxUser.setSex("男");
wxMpUser.setSex("男");
} else if (new Integer(2).equals(sex)) {
wxUser.setSex("女");
wxMpUser.setSex("女");
} else {
wxUser.setSex("未知");
wxMpUser.setSex("未知");
}
return wxUser;
return wxMpUser;
}
}

29
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxUserListGsonAdapter.java
View File

@@ -8,35 +8,30 @@
*/
package me.chanjar.weixin.mp.util.json;
import com.google.gson.*;
import me.chanjar.weixin.common.util.json.GsonHelper;
import me.chanjar.weixin.mp.bean.result.WxMpUserList;
import java.lang.reflect.Type;
import me.chanjar.weixin.mp.bean.result.WxUserList;
import com.google.gson.JsonArray;
import com.google.gson.JsonDeserializationContext;
import com.google.gson.JsonDeserializer;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.JsonParseException;
/**
*
* @author qianjia
*
*/
public class WxUserListGsonAdapter implements JsonDeserializer<WxUserList> {
public class WxUserListGsonAdapter implements JsonDeserializer<WxMpUserList> {
public WxUserList deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
public WxMpUserList deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
JsonObject o = json.getAsJsonObject();
WxUserList wxUserList = new WxUserList();
wxUserList.setTotal(GsonHelper.getInteger(o, "total"));
wxUserList.setCount(GsonHelper.getInteger(o, "count"));
wxUserList.setNextOpenId(GsonHelper.getString(o, "next_openid"));
WxMpUserList wxMpUserList = new WxMpUserList();
wxMpUserList.setTotal(GsonHelper.getInteger(o, "total"));
wxMpUserList.setCount(GsonHelper.getInteger(o, "count"));
wxMpUserList.setNextOpenId(GsonHelper.getString(o, "next_openid"));
JsonArray data = o.get("data").getAsJsonObject().get("openid").getAsJsonArray();
for (int i = 0; i < data.size(); i++) {
wxUserList.getOpenIds().add(GsonHelper.getAsString(data.get(i)));
wxMpUserList.getOpenIds().add(GsonHelper.getAsString(data.get(i)));
}
return wxUserList;
return wxMpUserList;
}
}

24
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/xml/AdapterCDATA.java
View File

@@ -1,24 +0,0 @@
package me.chanjar.weixin.mp.util.xml;
import javax.xml.bind.annotation.adapters.XmlAdapter;
/**
*
* http://stackoverflow.com/questions/14193944/jaxb-marshalling-unmarshalling-with-cdata
*
* @author chanjarster
*
*/
public class AdapterCDATA extends XmlAdapter<String, String> {
@Override
public String marshal(String arg0) throws Exception {
return "<![CDATA[" + arg0 + "]]>";
}
@Override
public String unmarshal(String arg0) throws Exception {
return arg0;
}
}

21
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/xml/MediaIdMarshaller.java
View File

@@ -1,21 +0,0 @@
package me.chanjar.weixin.mp.util.xml;
import javax.xml.bind.annotation.adapters.XmlAdapter;
/**
* @author chanjarster
*/
public class MediaIdMarshaller extends XmlAdapter<String, String> {
@Override
public String marshal(String arg0) throws Exception {
return "<MediaId><![CDATA[" + arg0 + "]]></MediaId>";
}
@Override
public String unmarshal(String arg0) throws Exception {
// do nothing
return arg0;
}
}

32
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/xml/XmlTransformer.java
View File

@@ -1,18 +1,14 @@
package me.chanjar.weixin.mp.util.xml;
import java.io.IOException;
import java.io.InputStream;
import java.io.StringReader;
import java.io.StringWriter;
import java.io.Writer;
import javax.xml.bind.*;
import me.chanjar.weixin.bean.*;
import com.sun.xml.bind.marshaller.CharacterEscapeHandler;
import me.chanjar.weixin.mp.bean.*;
import org.xml.sax.InputSource;
import com.sun.xml.bind.marshaller.CharacterEscapeHandler;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
import javax.xml.bind.Marshaller;
import javax.xml.bind.Unmarshaller;
import java.io.*;
public class XmlTransformer {
@@ -78,14 +74,14 @@ public class XmlTransformer {
*/
try {
return JAXBContext.newInstance(
WxXmlOutMessage.class,
WxXmlOutImageMessage.class,
WxXmlOutMewsMessage.class,
WxXmlOutMusicMessage.class,
WxXmlOutTextMessage.class,
WxXmlOutVideoMessage.class,
WxXmlOutVoiceMessage.class,
WxXmlMessage.class);
WxMpXmlOutMessage.class,
WxMpMpXmlOutImageMessage.class,
WxMpXmlOutMewsMessage.class,
WxMpXmlOutMusicMessage.class,
WxMpXmlOutTextMessage.class,
WxMpXmlOutVideoMessage.class,
WxMpXmlOutVoiceMessage.class,
WxMpXmlMessage.class);
} catch (JAXBException e) {
throw new RuntimeException(e);
}