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

hasText rename to isBlank

Browse Source
This commit is contained in:
jinyu 2016-01-08 18:11:24 +08:00
parent deaadade97
commit 997bdc58b6
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
weixin4j-server/src/main/java/com/foxinmy/weixin4j/dispatcher/WeixinMessageKey.java
View File

@ -48,10 +48,10 @@ public class WeixinMessageKey implements Serializable {
result = prime * result result = prime * result
+ ((accountType == null) ? 0 : accountType.hashCode()); + ((accountType == null) ? 0 : accountType.hashCode());
result = prime * result result = prime * result
+ ((ServerToolkits.hasText(eventType)) ? 0 : eventType.hashCode()); + ((ServerToolkits.isBlank(eventType)) ? 0 : eventType.hashCode());
result = prime result = prime
* result * result
+ ((ServerToolkits.hasText(messageType)) ? 0 : messageType + ((ServerToolkits.isBlank(messageType)) ? 0 : messageType
.hashCode()); .hashCode());
return result; return result;
} }

4
weixin4j-server/src/main/java/com/foxinmy/weixin4j/socket/WeixinMessageDecoder.java
View File

@ -67,9 +67,9 @@ public class WeixinMessageDecoder extends
"weixin_id").get(0) : null; "weixin_id").get(0) : null;
AesToken aesToken = aesTokenMap.get(weixinId); AesToken aesToken = aesTokenMap.get(weixinId);
String encryptContent = null; String encryptContent = null;
if (!ServerToolkits.hasText(messageContent) if (!ServerToolkits.isBlank(messageContent)
&& encryptType == EncryptType.AES) { && encryptType == EncryptType.AES) {
if (ServerToolkits.hasText(aesToken.getAesKey())) { if (ServerToolkits.isBlank(aesToken.getAesKey())) {
throw new WeixinException( throw new WeixinException(
"AESEncodingKey not be null in AES mode"); "AESEncodingKey not be null in AES mode");
} }

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

@ -56,8 +56,8 @@ public class WeixinRequestHandler extends
throws WeixinException { throws WeixinException {
final AesToken aesToken = request.getAesToken(); final AesToken aesToken = request.getAesToken();
if (aesToken == null if (aesToken == null
|| (ServerToolkits.hasText(request.getSignature()) && ServerToolkits || (ServerToolkits.isBlank(request.getSignature()) && ServerToolkits
.hasText(request.getMsgSignature()))) { .isBlank(request.getMsgSignature()))) {
ctx.writeAndFlush(HttpUtil.createHttpResponse(BAD_REQUEST)) ctx.writeAndFlush(HttpUtil.createHttpResponse(BAD_REQUEST))
.addListener(ChannelFutureListener.CLOSE); .addListener(ChannelFutureListener.CLOSE);
return; return;
@ -67,14 +67,14 @@ public class WeixinRequestHandler extends
* 企业号:无论Get,Post都带msg_signature参数 * 企业号:无论Get,Post都带msg_signature参数
**/ **/
if (request.getMethod().equals(HttpMethod.GET.name())) { if (request.getMethod().equals(HttpMethod.GET.name())) {
if (!ServerToolkits.hasText(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(
request.getSignature())) { request.getSignature())) {
ctx.write(new SingleResponse(request.getEchoStr())); ctx.write(new SingleResponse(request.getEchoStr()));
return; return;
} }
if (!ServerToolkits.hasText(request.getMsgSignature()) if (!ServerToolkits.isBlank(request.getMsgSignature())
&& MessageUtil.signature(aesToken.getToken(), && MessageUtil.signature(aesToken.getToken(),
request.getTimeStamp(), request.getNonce(), request.getTimeStamp(), request.getNonce(),
request.getEchoStr()).equals( request.getEchoStr()).equals(
@ -87,7 +87,7 @@ public class WeixinRequestHandler extends
.addListener(ChannelFutureListener.CLOSE); .addListener(ChannelFutureListener.CLOSE);
return; return;
} else if (request.getMethod().equals(HttpMethod.POST.name())) { } else if (request.getMethod().equals(HttpMethod.POST.name())) {
if (!ServerToolkits.hasText(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(
request.getSignature())) { request.getSignature())) {

2
weixin4j-server/src/main/java/com/foxinmy/weixin4j/util/ServerToolkits.java
View File

@ -96,7 +96,7 @@ public final class ServerToolkits {
* @param cs * @param cs
* @return * @return
*/ */
public static boolean hasText(final CharSequence cs) { public static boolean isBlank(final CharSequence cs) {
int strLen; int strLen;
if (cs == null || (strLen = cs.length()) == 0) { if (cs == null || (strLen = cs.length()) == 0) {
return true; return true;

2
weixin4j-server/src/main/java/com/foxinmy/weixin4j/xml/MessageTransferHandler.java
View File

@ -75,7 +75,7 @@ public class MessageTransferHandler extends DefaultHandler {
if (isQY) { if (isQY) {
return AccountType.QY; return AccountType.QY;
} }
if (ServerToolkits.hasText(msgType) && ServerToolkits.hasText(eventType)) { if (ServerToolkits.isBlank(msgType) && ServerToolkits.isBlank(eventType)) {
return null; return null;
} }
return AccountType.MP; return AccountType.MP;