From d6755d4c6209997a411adcfa0118cd2e8c621396 Mon Sep 17 00:00:00 2001 From: jinyu Date: Sun, 8 May 2016 09:14:50 +0800 Subject: [PATCH] up --- .../java/com/foxinmy/weixin4j/request/WeixinRequest.java | 2 +- .../com/foxinmy/weixin4j/socket/WeixinRequestHandler.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/weixin4j-server/src/main/java/com/foxinmy/weixin4j/request/WeixinRequest.java b/weixin4j-server/src/main/java/com/foxinmy/weixin4j/request/WeixinRequest.java index 8ef2d797..1486e353 100644 --- a/weixin4j-server/src/main/java/com/foxinmy/weixin4j/request/WeixinRequest.java +++ b/weixin4j-server/src/main/java/com/foxinmy/weixin4j/request/WeixinRequest.java @@ -183,7 +183,7 @@ public class WeixinRequest implements HttpMessage { @Override public String toString() { - return "WeixinRequest [headers=" + headers + ", method=" + method + return "WeixinRequest [headers=" + headers.entries() + ", method=" + method + ", uri=" + uri + ", echoStr=" + echoStr + ", timeStamp=" + timeStamp + ", nonce=" + nonce + ", signature=" + signature + ", msgSignature=" + msgSignature + ", encryptType=" diff --git a/weixin4j-server/src/main/java/com/foxinmy/weixin4j/socket/WeixinRequestHandler.java b/weixin4j-server/src/main/java/com/foxinmy/weixin4j/socket/WeixinRequestHandler.java index 8825618b..592814e7 100644 --- a/weixin4j-server/src/main/java/com/foxinmy/weixin4j/socket/WeixinRequestHandler.java +++ b/weixin4j-server/src/main/java/com/foxinmy/weixin4j/socket/WeixinRequestHandler.java @@ -71,7 +71,7 @@ public class WeixinRequestHandler extends * 一般来说：signature验证url上的参数签名，msg_signature验证消息体签名 **/ if (request.getMethod() == HttpMethod.GET) { - // 服务器URL验证 + // URL参数签名验证 if (!ServerToolkits.isBlank(request.getSignature()) && MessageUtil.signature(aesToken.getToken(), request.getTimeStamp(), request.getNonce()).equals( @@ -79,7 +79,7 @@ public class WeixinRequestHandler extends ctx.writeAndFlush(new SingleResponse(request.getEchoStr())); return; } - // 消息签名验证 + // XML消息签名验证 if (!ServerToolkits.isBlank(request.getMsgSignature()) && MessageUtil.signature(aesToken.getToken(), request.getTimeStamp(), request.getNonce(), @@ -93,7 +93,7 @@ public class WeixinRequestHandler extends ChannelFutureListener.CLOSE); return; } else if (request.getMethod() == HttpMethod.POST) { - // 加密模式下消息签名验证 + // URL参数签名验证 if (!ServerToolkits.isBlank(request.getSignature()) && !MessageUtil.signature(aesToken.getToken(), request.getTimeStamp(), request.getNonce()).equals( @@ -102,7 +102,7 @@ public class WeixinRequestHandler extends .addListener(ChannelFutureListener.CLOSE); return; } - // 明文模式下消息签名验证 + // XML消息签名验证 if (request.getEncryptType() == EncryptType.AES && !MessageUtil.signature(aesToken.getToken(), request.getTimeStamp(), request.getNonce(),