niko/weixin4j
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

up

Browse Source
This commit is contained in:
jinyu 2016-05-08 09:14:50 +08:00
parent fcd543de1f
commit d6755d4c62
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
weixin4j-server/src/main/java/com/foxinmy/weixin4j/request/WeixinRequest.java
View File

@ -183,7 +183,7 @@ public class WeixinRequest implements HttpMessage {
@Override @Override
public String toString() { public String toString() {
return "WeixinRequest [headers=" + headers + ", method=" + method return "WeixinRequest [headers=" + headers.entries() + ", method=" + method
+ ", uri=" + uri + ", echoStr=" + echoStr + ", timeStamp=" + ", uri=" + uri + ", echoStr=" + echoStr + ", timeStamp="
+ timeStamp + ", nonce=" + nonce + ", signature=" + signature + timeStamp + ", nonce=" + nonce + ", signature=" + signature
+ ", msgSignature=" + msgSignature + ", encryptType=" + ", msgSignature=" + msgSignature + ", encryptType="

8
weixin4j-server/src/main/java/com/foxinmy/weixin4j/socket/WeixinRequestHandler.java
View File

@ -71,7 +71,7 @@ public class WeixinRequestHandler extends
* 一般来说：signature验证url上的参数签名，msg_signature验证消息体签名 * 一般来说：signature验证url上的参数签名，msg_signature验证消息体签名
**/ **/
if (request.getMethod() == HttpMethod.GET) { if (request.getMethod() == HttpMethod.GET) {
// 服务器URL验证 // URL参数签名验证
if (!ServerToolkits.isBlank(request.getSignature()) if (!ServerToolkits.isBlank(request.getSignature())
&& MessageUtil.signature(aesToken.getToken(), && MessageUtil.signature(aesToken.getToken(),
request.getTimeStamp(), request.getNonce()).equals( request.getTimeStamp(), request.getNonce()).equals(
@ -79,7 +79,7 @@ public class WeixinRequestHandler extends
ctx.writeAndFlush(new SingleResponse(request.getEchoStr())); ctx.writeAndFlush(new SingleResponse(request.getEchoStr()));
return; return;
} }
// 消息签名验证 // XML消息签名验证
if (!ServerToolkits.isBlank(request.getMsgSignature()) if (!ServerToolkits.isBlank(request.getMsgSignature())
&& MessageUtil.signature(aesToken.getToken(), && MessageUtil.signature(aesToken.getToken(),
request.getTimeStamp(), request.getNonce(), request.getTimeStamp(), request.getNonce(),
@ -93,7 +93,7 @@ public class WeixinRequestHandler extends
ChannelFutureListener.CLOSE); ChannelFutureListener.CLOSE);
return; return;
} else if (request.getMethod() == HttpMethod.POST) { } else if (request.getMethod() == HttpMethod.POST) {
// 加密模式下消息签名验证 // URL参数签名验证
if (!ServerToolkits.isBlank(request.getSignature()) if (!ServerToolkits.isBlank(request.getSignature())
&& !MessageUtil.signature(aesToken.getToken(), && !MessageUtil.signature(aesToken.getToken(),
request.getTimeStamp(), request.getNonce()).equals( request.getTimeStamp(), request.getNonce()).equals(
@ -102,7 +102,7 @@ public class WeixinRequestHandler extends
.addListener(ChannelFutureListener.CLOSE); .addListener(ChannelFutureListener.CLOSE);
return; return;
} }
// 明文模式下消息签名验证 // XML消息签名验证
if (request.getEncryptType() == EncryptType.AES if (request.getEncryptType() == EncryptType.AES
&& !MessageUtil.signature(aesToken.getToken(), && !MessageUtil.signature(aesToken.getToken(),
request.getTimeStamp(), request.getNonce(), request.getTimeStamp(), request.getNonce(),