diff --git a/weixin4j-server/README.md b/weixin4j-server/README.md index 2e00c6a2..7c0d3316 100644 --- a/weixin4j-server/README.md +++ b/weixin4j-server/README.md @@ -107,7 +107,7 @@ assembly打包(辅助) src/main/assembly.xml - weixin-server + weixin4j-server diff --git a/weixin4j-server/deploy.xml b/weixin4j-server/deploy.xml index f524dc3b..d173551e 100644 --- a/weixin4j-server/deploy.xml +++ b/weixin4j-server/deploy.xml @@ -2,11 +2,11 @@ - + - + diff --git a/weixin4j-server/src/main/java/com/foxinmy/weixin4j/dispatcher/WeixinMessageDispatcher.java b/weixin4j-server/src/main/java/com/foxinmy/weixin4j/dispatcher/WeixinMessageDispatcher.java index 7b0cb2ec..ab106769 100644 --- a/weixin4j-server/src/main/java/com/foxinmy/weixin4j/dispatcher/WeixinMessageDispatcher.java +++ b/weixin4j-server/src/main/java/com/foxinmy/weixin4j/dispatcher/WeixinMessageDispatcher.java @@ -127,6 +127,8 @@ public class WeixinMessageDispatcher { if (targetClass != null) { message = messageRead(request.getOriginalContent(), targetClass); } + logger.info("define [{}] messageKey matched [{}] unmarshal to {}", + messageKey, targetClass, message); MessageHandlerExecutor handlerExecutor = getHandlerExecutor(context, request, messageKey, message); if (handlerExecutor == null @@ -141,9 +143,6 @@ public class WeixinMessageDispatcher { try { WeixinResponse response = handlerExecutor.getMessageHandler() .doHandle(request, message); - logger.info( - "\n=================message response=================\n{}", - response); handlerExecutor.applyPostHandle(request, response, message); context.write(response); } catch (WeixinException e) { diff --git a/weixin4j-server/src/main/java/com/foxinmy/weixin4j/messagekey/DefaultMessageKeyDefiner.java b/weixin4j-server/src/main/java/com/foxinmy/weixin4j/messagekey/DefaultMessageKeyDefiner.java index 3991a175..8fc55c55 100644 --- a/weixin4j-server/src/main/java/com/foxinmy/weixin4j/messagekey/DefaultMessageKeyDefiner.java +++ b/weixin4j-server/src/main/java/com/foxinmy/weixin4j/messagekey/DefaultMessageKeyDefiner.java @@ -1,6 +1,7 @@ package com.foxinmy.weixin4j.messagekey; import com.foxinmy.weixin4j.type.AccountType; +import com.foxinmy.weixin4j.type.MessageType; import com.foxinmy.weixin4j.util.StringUtil; /** @@ -22,6 +23,9 @@ public class DefaultMessageKeyDefiner implements WeixinMessageKeyDefiner { StringBuilder messageKey = new StringBuilder(); if (!StringUtil.isBlank(messageType)) { messageKey.append(messageType.toLowerCase()); + if (!messageType.trim().equalsIgnoreCase(MessageType.event.name())) { + return messageKey.toString(); + } } if (accountType != null) { messageKey.insert(0, String.format("%s%s", accountType.name() diff --git a/weixin4j-server/src/main/java/com/foxinmy/weixin4j/socket/WeixinMessageDecoder.java b/weixin4j-server/src/main/java/com/foxinmy/weixin4j/socket/WeixinMessageDecoder.java index 93d4ba9a..0d77baed 100644 --- a/weixin4j-server/src/main/java/com/foxinmy/weixin4j/socket/WeixinMessageDecoder.java +++ b/weixin4j-server/src/main/java/com/foxinmy/weixin4j/socket/WeixinMessageDecoder.java @@ -47,10 +47,8 @@ public class WeixinMessageDecoder extends String content = req.content().toString(Consts.UTF_8); QueryStringDecoder queryDecoder = new QueryStringDecoder(req.getUri(), true); - logger.info("\n=================receive request================="); - logger.info("{}", req.getMethod()); - logger.info("{}", req.getUri()); - logger.info("{}", content); + logger.info("decode request:{} use {} method invoking", req.getUri(), + req.getMethod().name()); Map> parameters = queryDecoder.parameters(); EncryptType encryptType = parameters.containsKey("encrypt_type") ? EncryptType .valueOf(parameters.get("encrypt_type").get(0).toUpperCase()) 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 61a87b84..a8ed5382 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 @@ -56,8 +56,6 @@ public class WeixinRequestHandler extends @Override protected void channelRead0(ChannelHandlerContext ctx, WeixinRequest request) throws WeixinException { - logger.info("\n=================message request=================\n{}", - request); if (request.getMethod().equals(HttpMethod.GET.name())) { if (MessageUtil.signature(aesToken.getToken(), request.getTimeStamp(), request.getNonce()).equals( diff --git a/weixin4j-server/src/main/java/com/foxinmy/weixin4j/socket/WeixinResponseEncoder.java b/weixin4j-server/src/main/java/com/foxinmy/weixin4j/socket/WeixinResponseEncoder.java index dfd62bd1..032646f7 100644 --- a/weixin4j-server/src/main/java/com/foxinmy/weixin4j/socket/WeixinResponseEncoder.java +++ b/weixin4j-server/src/main/java/com/foxinmy/weixin4j/socket/WeixinResponseEncoder.java @@ -94,7 +94,6 @@ public class WeixinResponseEncoder extends } ctx.writeAndFlush(HttpUtil.createHttpResponse(content.toString(), OK, Consts.CONTENTTYPE$APPLICATION_XML)); - logger.info("\n=================response message================="); - logger.info("{}", content); + logger.info("{} encode response:{}", encryptType, content); } } \ No newline at end of file diff --git a/weixin4j-server/src/main/java/com/foxinmy/weixin4j/startup/WeixinServerBootstrap.java b/weixin4j-server/src/main/java/com/foxinmy/weixin4j/startup/WeixinServerBootstrap.java index 4747df29..eb362ff0 100644 --- a/weixin4j-server/src/main/java/com/foxinmy/weixin4j/startup/WeixinServerBootstrap.java +++ b/weixin4j-server/src/main/java/com/foxinmy/weixin4j/startup/WeixinServerBootstrap.java @@ -7,6 +7,8 @@ import io.netty.channel.EventLoopGroup; import io.netty.channel.nio.NioEventLoopGroup; import io.netty.channel.socket.nio.NioServerSocketChannel; import io.netty.handler.logging.LoggingHandler; +import io.netty.util.internal.logging.InternalLogger; +import io.netty.util.internal.logging.InternalLoggerFactory; import java.util.Arrays; import java.util.LinkedList; @@ -36,6 +38,9 @@ import com.foxinmy.weixin4j.util.AesToken; */ public final class WeixinServerBootstrap { + private final InternalLogger logger = InternalLoggerFactory + .getInstance(getClass()); + /** * 默认boss线程数,一般设置为cpu的核数 */ @@ -141,6 +146,7 @@ public final class WeixinServerBootstrap { messageDispatcher)); Channel ch = b.bind(serverPort).sync().channel(); System.err.println("weixin4j server startup OK:" + serverPort); + logger.info("weixin4j server startup OK:{}", serverPort); ch.closeFuture().sync(); } catch (WeixinException e) { throw e; diff --git a/weixin4j-server/src/main/startup.sh b/weixin4j-server/src/main/startup.sh index 55e9be13..14bf657f 100644 --- a/weixin4j-server/src/main/startup.sh +++ b/weixin4j-server/src/main/startup.sh @@ -6,10 +6,10 @@ JAVA_HOME="/usr/local/java/" RUNNING_USER=root #Run home -APP_HOME="/usr/local/weixin/weixin-server" +APP_HOME="/usr/local/weixin/weixin4j-server" #main class -APP_MAINCLASS=netty服务启动类 +APP_MAINCLASS=微信服务启动类 #classpath CLASSPATH=$APP_HOME/classes