diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/service/IpService.java b/mallchat-common/src/main/java/com/abin/mallchat/common/user/service/IpService.java index c4b445e..5a0364f 100644 --- a/mallchat-common/src/main/java/com/abin/mallchat/common/user/service/IpService.java +++ b/mallchat-common/src/main/java/com/abin/mallchat/common/user/service/IpService.java @@ -4,7 +4,7 @@ public interface IpService { /** * 异步更新用户ip详情 * - * @param id + * @param uid */ - void refreshIpDetailAsync(Long id); + void refreshIpDetailAsync(Long uid); } diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/impl/ChatServiceImpl.java b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/impl/ChatServiceImpl.java index 13e75eb..5ce5291 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/impl/ChatServiceImpl.java +++ b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/impl/ChatServiceImpl.java @@ -179,6 +179,7 @@ public class ChatServiceImpl implements ChatService { .status(transformAct(request.getActType())) .build(); messageMarkDao.updateById(update); + return; } //没标记过消息,插入一条新消息 MessageMark insert = MessageMark.builder() diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/handler/MsgHandler.java b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/handler/MsgHandler.java index ecad5ea..6493ed2 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/handler/MsgHandler.java +++ b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/handler/MsgHandler.java @@ -7,6 +7,7 @@ import me.chanjar.weixin.common.session.WxSessionManager; import me.chanjar.weixin.mp.api.WxMpService; import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage; import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage; +import me.chanjar.weixin.mp.bean.message.WxMpXmlOutTextMessage; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Component; @@ -24,7 +25,9 @@ public class MsgHandler extends AbstractHandler { public WxMpXmlOutMessage handle(WxMpXmlMessage wxMessage, Map context, WxMpService weixinService, WxSessionManager sessionManager) { - + if (true) { + return WxMpXmlOutMessage.TEXT().build(); + } if (!wxMessage.getMsgType().equals(XmlMsgType.EVENT)) { //可以选择将消息保存到本地 } @@ -32,11 +35,11 @@ public class MsgHandler extends AbstractHandler { //当用户输入关键词如“你好”,“客服”等,并且有客服在线时,把消息转发给在线客服 try { if (StringUtils.startsWithAny(wxMessage.getContent(), "你好", "客服") - && weixinService.getKefuService().kfOnlineList() - .getKfOnlineList().size() > 0) { + && weixinService.getKefuService().kfOnlineList() + .getKfOnlineList().size() > 0) { return WxMpXmlOutMessage.TRANSFER_CUSTOMER_SERVICE() - .fromUser(wxMessage.getToUser()) - .toUser(wxMessage.getFromUser()).build(); + .fromUser(wxMessage.getToUser()) + .toUser(wxMessage.getFromUser()).build(); } } catch (WxErrorException e) { e.printStackTrace(); diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/websocket/NettyWebSocketServer.java b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/websocket/NettyWebSocketServer.java index 41e3d68..9d44f2d 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/websocket/NettyWebSocketServer.java +++ b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/websocket/NettyWebSocketServer.java @@ -78,6 +78,7 @@ public class NettyWebSocketServer { * 2. 这就是为什么当浏览器发送大量数据时,就会发出多次 http请求的原因 */ pipeline.addLast(new HttpObjectAggregator(8192)); + //保存用户ip pipeline.addLast(new HttpHeadersHandler()); /** * 说明: diff --git a/mallchat-custom-server/src/main/resources/logback.xml b/mallchat-custom-server/src/main/resources/logback.xml index e7bb55a..cb2ffa8 100644 --- a/mallchat-custom-server/src/main/resources/logback.xml +++ b/mallchat-custom-server/src/main/resources/logback.xml @@ -1,7 +1,9 @@ + + @@ -13,7 +15,7 @@ ${CONSOLE_LOG_PATTERN} - + ${LOG_PATH}/${LOG_FILE}.log true @@ -21,15 +23,18 @@ ${CONSOLE_LOG_PATTERN} + ${LOG_PATH}/archived/${LOG_FILE}.%d{dd-MM-yyyy}.log + 30 + 5GB - + ERROR @@ -51,8 +56,10 @@ + +