From 66bf725a8f25f88d9104983f5fccd5151c0524ca Mon Sep 17 00:00:00 2001 From: zhangye <654600784@qq.com> Date: Mon, 30 Dec 2019 10:01:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E5=8F=91=E9=80=81=E6=B8=B8?= =?UTF-8?q?=E6=88=8F=E5=BC=80=E5=A7=8B=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ccsens/game/netty/ChannelManager.java | 77 ++++++++++--------- .../game/netty/wsserver/WebSocketEncoder.java | 4 + .../game/netty/wsserver/WebSocketHandler.java | 3 + .../game/persist/dao/GameUserJoinDao.java | 2 +- .../ccsens/game/service/ClientService.java | 9 ++- .../ccsens/game/service/MessageService.java | 15 ++-- .../ccsens/game/service/RabbitMQListener.java | 12 +-- 7 files changed, 66 insertions(+), 56 deletions(-) diff --git a/game/src/main/java/com/ccsens/game/netty/ChannelManager.java b/game/src/main/java/com/ccsens/game/netty/ChannelManager.java index 9061ee91..0308e9d6 100644 --- a/game/src/main/java/com/ccsens/game/netty/ChannelManager.java +++ b/game/src/main/java/com/ccsens/game/netty/ChannelManager.java @@ -2,8 +2,8 @@ package com.ccsens.game.netty; import cn.hutool.core.collection.CollectionUtil; import io.netty.channel.Channel; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import lombok.extern.slf4j.Slf4j; + import java.util.*; import java.util.concurrent.ConcurrentHashMap; @@ -11,8 +11,8 @@ import java.util.concurrent.ConcurrentHashMap; /** * @author wei */ +@Slf4j public class ChannelManager { - private static Logger logger = LoggerFactory.getLogger(ChannelManager.class); private static ThreadLocal threadLocal = new ThreadLocal<>(); /** @@ -63,12 +63,12 @@ public class ChannelManager { * @param serverType 服务器类型 */ public static synchronized void addChannel(Channel channel,String serverType){ - logger.debug("Invoke addChannel({},{})",channel,serverType); + log.info("Invoke addChannel({},{})",channel,serverType); if(null != channel) { rawChannels.put(channel, new WrapperedChannel(channel, serverType)); - logger.debug("Add a new channel: {},{}",channel.id().asLongText(),serverType); + log.info("Add a new channel: {},{}",channel.id().asLongText(),serverType); }else{ - logger.error("channel is null"); + log.error("channel is null"); } } @@ -80,7 +80,7 @@ public class ChannelManager { * @param minor 客户端次版本号 */ public static synchronized void authChannel(Channel channel,String userId,Integer major,Integer minor){ - logger.debug("Invoke authedChannels({},{},{},{})",channel.id().asLongText(),userId,major,minor); + log.info("Invoke authedChannels({},{},{},{})",channel.id().asLongText(),userId,major,minor); major = major != null ? major : 0; minor = minor != null ? minor : 0; @@ -89,9 +89,9 @@ public class ChannelManager { wrapperedChannel.whenAuthed(userId,major,minor); Set authedWchannelSet = authedChannels.computeIfAbsent(userId, k -> new HashSet<>()); authedWchannelSet.add(wrapperedChannel); - logger.debug("Authed channel {} with user {}", channel.id().asLongText(), userId); + log.info("Authed channel {} with user {}", channel.id().asLongText(), userId); }else{ - logger.error("Authed channel,but wrappedChannel is null."); + log.error("Authed channel,but wrappedChannel is null."); } } @@ -104,7 +104,7 @@ public class ChannelManager { * @param minor 用户参加的游戏id */ public static synchronized void authChannel(Channel channel,String userId,Integer major,Integer minor,String recordId){ - logger.debug("Invoke authedChannels({},{},{},{})",channel.id().asLongText(),userId,major,minor); + log.info("Invoke authedChannels({},{},{},{})",channel.id().asLongText(),userId,major,minor); major = major != null ? major : 0; minor = minor != null ? minor : 0; @@ -113,9 +113,9 @@ public class ChannelManager { wrapperedChannel.whenAuthed(userId,major,minor,recordId); Set authedWchannelSet = authedChannels.computeIfAbsent(userId, k -> new HashSet<>()); authedWchannelSet.add(wrapperedChannel); - logger.debug("Authed channel {} with user {}", channel.id().asLongText(), userId); + log.info("Authed channel {} with user {}", channel.id().asLongText(), userId); }else{ - logger.error("Authed channel,but wrappedChannel is null."); + log.error("Authed channel,but wrappedChannel is null."); } } @@ -124,27 +124,27 @@ public class ChannelManager { * @param channel 要移除的连接 */ public static synchronized void removeChannel(Channel channel){ - logger.debug("Invoke removeChannel({})",channel.id().asLongText()); + log.info("Invoke removeChannel({})",channel.id().asLongText()); WrapperedChannel wrapperedChannel = rawChannels.get(channel); if(wrapperedChannel != null){ //从rawChannels集合中删除 rawChannels.remove(channel); - logger.debug("Remove a channel from rawChannels: {}",channel.id().asLongText()); + log.info("Remove a channel from rawChannels: {}",channel.id().asLongText()); if(wrapperedChannel.isAuthed()){ Set authedChannelSet = authedChannels.get(wrapperedChannel.getUserId()); //从authedChannel集合的value(set)中删除 if(CollectionUtil.isNotEmpty(authedChannelSet)){ authedChannelSet.remove(wrapperedChannel); - logger.debug("Remove a channel from authedChannelSet: {}, {}",wrapperedChannel.getUserId(),channel.id().asLongText()); + log.info("Remove a channel from authedChannelSet: {}, {}",wrapperedChannel.getUserId(),channel.id().asLongText()); } //从authedChannel中删除，此处不用else，因为if中语句执行完毕之后，authedChannelSet也可能变成空集合 if(CollectionUtil.isEmpty(authedChannelSet)){ authedChannels.remove(wrapperedChannel.getUserId()); - logger.debug("Remove a user from authedChannels: {}",wrapperedChannel.getUserId()); + log.info("Remove a user from authedChannels: {}",wrapperedChannel.getUserId()); } } }else{ - logger.error("Remove channel,but wrappedChannel is null."); + log.error("Remove channel,but wrappedChannel is null."); } if(channel.isOpen() || channel.isActive()){ @@ -157,18 +157,18 @@ public class ChannelManager { * @param userId 要移除的用户 */ public static synchronized void removeUser(String userId){ - logger.debug("Invoke remove user : {}",userId); + log.info("Invoke remove user : {}",userId); Set wChannelSet = authedChannels.get(userId); if(CollectionUtil.isNotEmpty(wChannelSet)){ for(WrapperedChannel wChannel : wChannelSet){ //从rawChannel中依次删除 rawChannels.remove(wChannel.getChannel()); - logger.debug("Remove a channel from rawChannels: {}",wChannel.getChannel().id().asLongText()); + log.info("Remove a channel from rawChannels: {}",wChannel.getChannel().id().asLongText()); } } //从authedChannel中删除 authedChannels.remove(userId); - logger.debug("Remove a user from authedChannels: {}",userId); + log.info("Remove a user from authedChannels: {}",userId); } /** @@ -179,13 +179,13 @@ public class ChannelManager { * @param minor 次版本号 */ public static synchronized void versionChannel(Channel channel,int major,int minor){ - logger.debug("Invoke Version channel({},{},{}))",channel.id().asLongText(),major,minor); + log.info("Invoke Version channel({},{},{}))",channel.id().asLongText(),major,minor); WrapperedChannel wChannel = rawChannels.get(channel); if(wChannel != null){ wChannel.setVersion(major,minor); - logger.debug("Version Channel: {},{},{}",channel.id().asLongText(),major,minor); + log.info("Version Channel: {},{},{}",channel.id().asLongText(),major,minor); }else{ - logger.error("Remove channel,but wrappedChannel is null."); + log.error("Remove channel,but wrappedChannel is null."); } } @@ -194,12 +194,12 @@ public class ChannelManager { * @param message 消息 */ public static synchronized void broadCastAuthed(Object message) { - logger.debug("Invoke broadCastAuthed({})",message); + log.info("Invoke broadCastAuthed({})",message); for (Map.Entry entry : rawChannels.entrySet()) { WrapperedChannel wChannel = entry.getValue(); if(wChannel.isAuthed()) { wChannel.writeAndFlush(message); - logger.debug("Send Message {} to {},{}",message,wChannel.getUserId(),wChannel.getId()); + log.info("Send Message {} to {},{}",message,wChannel.getUserId(),wChannel.getId()); } } } @@ -209,10 +209,10 @@ public class ChannelManager { * @param message 消息 */ public static synchronized void broadCast(Object message) { - logger.debug("Invoke broadCast({})",message); + log.info("Invoke broadCast({})",message); for (Map.Entry entry : rawChannels.entrySet()) { entry.getValue().writeAndFlush(message); - logger.debug("Send Message {} to {}",message,entry.getValue().getId()); + log.info("Send Message {} to {}",message,entry.getValue().getId()); } } @@ -222,13 +222,13 @@ public class ChannelManager { * @param message 消息 */ public static synchronized void sendTo(Channel channel,Object message){ - logger.debug("Invoke sendTo({},{})",channel.id().asLongText(),message); + log.info("Invoke sendTo({},{})",channel.id().asLongText(),message); WrapperedChannel wrapperedChannel = rawChannels.get(channel); if(wrapperedChannel != null) { wrapperedChannel.writeAndFlush(message); - logger.debug("Write message {} to Channel {}",message,channel); + log.info("Write message {} to Channel {}",message,channel); }else{ - logger.error("can't find channel from rawChannels"); + log.error("can't find channel from rawChannels"); } } @@ -238,12 +238,13 @@ public class ChannelManager { * @param message 消息 */ public static synchronized boolean sendTo(String userId,Object message){ - logger.debug("Invoke sendTo({},{})",userId,message); + log.info("Invoke sendTo({},{})",userId,message); Set wChannelSet = authedChannels.get(userId); + log.info("wChannelSet sendTo({},{})",userId,wChannelSet); if(CollectionUtil.isNotEmpty(wChannelSet)){ for(WrapperedChannel wChannel:wChannelSet){ wChannel.writeAndFlush(message); - logger.debug("Send message {} to channel {}",message,userId); + log.info("Send message {} to channel {}",message,userId); } return true; }else{ @@ -256,12 +257,12 @@ public class ChannelManager { * @param channel 接收数据的连接 */ public static synchronized void flushReceiveTimestamp(Channel channel){ - logger.debug("Invoke flushReceiveTimestamp({})",channel.id().asLongText()); + log.info("Invoke flushReceiveTimestamp({})",channel.id().asLongText()); WrapperedChannel wrapperedChannel = rawChannels.get(channel); if(wrapperedChannel != null){ wrapperedChannel.whenReceivedData(); }else{ - logger.error("can find channel from rawChannels"); + log.error("can find channel from rawChannels"); } } @@ -273,7 +274,7 @@ public class ChannelManager { */ @Deprecated public static synchronized void closeUnAuthedChannels(Long unAuthedChannelsMaxAliveTimeInSeconds) throws Exception { - logger.debug("Inovke closeUnAuthedChannels({})",unAuthedChannelsMaxAliveTimeInSeconds); + log.info("Inovke closeUnAuthedChannels({})",unAuthedChannelsMaxAliveTimeInSeconds); Iterator> it = rawChannels.entrySet().iterator(); while(it.hasNext()){ Map.Entry entry = it.next(); @@ -282,7 +283,7 @@ public class ChannelManager { it.remove(); //关闭连接 wrapperedChannel.getChannel().close(); - logger.debug("Remove a unAuthed Channel {}, which has connected {}s,maxOutTime is {}s", wrapperedChannel.getId(),wrapperedChannel.getConnectedSeconds() , + log.info("Remove a unAuthed Channel {}, which has connected {}s,maxOutTime is {}s", wrapperedChannel.getId(),wrapperedChannel.getConnectedSeconds() , unAuthedChannelsMaxAliveTimeInSeconds ); } } @@ -370,13 +371,13 @@ public class ChannelManager { public static synchronized void showAuthedChannels(){ for(Map.Entry> entry : authedChannels.entrySet()){ for (WrapperedChannel channel:entry.getValue()){ - logger.debug("{}-->{}",entry.getKey(),channel.toString()); + log.info("{}-->{}",entry.getKey(),channel.toString()); } } } public static synchronized void showAllChannels(){ for(Map.Entry entry : rawChannels.entrySet()){ - logger.debug(entry.getValue().toString()); + log.info(entry.getValue().toString()); } } diff --git a/game/src/main/java/com/ccsens/game/netty/wsserver/WebSocketEncoder.java b/game/src/main/java/com/ccsens/game/netty/wsserver/WebSocketEncoder.java index 1430ce80..2c3c6ddb 100644 --- a/game/src/main/java/com/ccsens/game/netty/wsserver/WebSocketEncoder.java +++ b/game/src/main/java/com/ccsens/game/netty/wsserver/WebSocketEncoder.java @@ -6,18 +6,22 @@ import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; import io.netty.handler.codec.MessageToByteEncoder; import io.netty.handler.codec.http.websocketx.TextWebSocketFrame; +import lombok.extern.slf4j.Slf4j; import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** * @author wei */ +@Slf4j public class WebSocketEncoder extends MessageToByteEncoder { private static Logger logger = LoggerFactory.getLogger(WebSocketEncoder.class); @Override protected void encode(ChannelHandlerContext ctx, BaseMessageDto outMessageSet, ByteBuf out) throws Exception { + log.info("--=-=-========== {}",outMessageSet); String msg = JacksonUtil.beanToJson(outMessageSet); + log.info("--=-=-==msg======== {}",msg); ctx.writeAndFlush(new TextWebSocketFrame(msg)); logger.info("Websocket send: {}",msg); diff --git a/game/src/main/java/com/ccsens/game/netty/wsserver/WebSocketHandler.java b/game/src/main/java/com/ccsens/game/netty/wsserver/WebSocketHandler.java index 1b2fadff..20ce7415 100644 --- a/game/src/main/java/com/ccsens/game/netty/wsserver/WebSocketHandler.java +++ b/game/src/main/java/com/ccsens/game/netty/wsserver/WebSocketHandler.java @@ -12,6 +12,7 @@ import io.netty.channel.ChannelHandlerContext; import io.netty.channel.SimpleChannelInboundHandler; import io.netty.handler.timeout.IdleState; import io.netty.handler.timeout.IdleStateEvent; +import lombok.extern.slf4j.Slf4j; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -20,6 +21,7 @@ import org.springframework.stereotype.Component; /** * @author wei */ +@Slf4j @ChannelHandler.Sharable @Component public class WebSocketHandler extends SimpleChannelInboundHandler { @@ -96,6 +98,7 @@ public class WebSocketHandler extends SimpleChannelInboundHandler selectByRecordId(@Param("recordId") Long recordId); diff --git a/game/src/main/java/com/ccsens/game/service/ClientService.java b/game/src/main/java/com/ccsens/game/service/ClientService.java index 7f084d7c..35fb0d8b 100644 --- a/game/src/main/java/com/ccsens/game/service/ClientService.java +++ b/game/src/main/java/com/ccsens/game/service/ClientService.java @@ -148,7 +148,7 @@ public class ClientService implements IClientService { long expiration = gameRecord.getStartTime() - System.currentTimeMillis(); sendMsg.sendMsg(executor, expiration, ()->{ try { - sendMsg.sendStatus(gameRecord, joins, GameConstant.GAME_PROCESSING); + sendMsg.sendStatus(gameRecord, joins, GameConstant.GAME_COMPLETED); } catch (JsonProcessingException e) { e.printStackTrace(); } @@ -187,7 +187,12 @@ public class ClientService implements IClientService { ClientVo.CompletedData completedData = new ClientVo.CompletedData(); completedData.setTimes(join.getTimes()); completedData.setScore(join.getScore()); - completedData.setSort(gameUserJoinDao.getRanking(join.getUserId(), join.getUserId())); + Integer sort = gameUserJoinDao.getRanking(join.getUserId(), join.getUserId()); + if(ObjectUtil.isNotNull(sort)){ + completedData.setSort(sort); + }else { + completedData.setSort(1); + } int low = gameUserJoinDao.overNum(gameRecord.getId(), join.getScore()); GameUserJoinExample joinExample = new GameUserJoinExample(); joinExample.createCriteria().andRecordIdEqualTo(gameRecord.getId()); diff --git a/game/src/main/java/com/ccsens/game/service/MessageService.java b/game/src/main/java/com/ccsens/game/service/MessageService.java index 0514efb6..d6262a56 100644 --- a/game/src/main/java/com/ccsens/game/service/MessageService.java +++ b/game/src/main/java/com/ccsens/game/service/MessageService.java @@ -11,6 +11,7 @@ import com.ccsens.util.JacksonUtil; import com.ccsens.util.WebConstant; import com.ccsens.util.config.RabbitMQConfig; import io.netty.channel.ChannelHandlerContext; +import lombok.extern.slf4j.Slf4j; import org.springframework.amqp.core.AmqpTemplate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -20,7 +21,7 @@ import java.util.List; import static com.ccsens.game.netty.ChannelManager.sendTo; - +@Slf4j @Service public class MessageService implements IMessageService { @Autowired @@ -102,17 +103,13 @@ public class MessageService implements IMessageService { */ @Override public void doChangeStatusMessage(List gameMessages) { + log.info("认证 {}",gameMessages); if (CollectionUtil.isNotEmpty(gameMessages)) { + gameMessages.forEach(gameMessage -> { gameMessage.setType(WebConstant.Message_Type.ChangeStatus.phase); - - sendTo(gameMessage.getUserId().toString(), gameMessage.getData()); -// List changeStatusMessageDtoList = gameMessage.getData().getChangeStatusMessageDto(); -// if(CollectionUtil.isNotEmpty(changeStatusMessageDtoList)){ -// for(ChangeStatusMessageDto changeStatus : changeStatusMessageDtoList){ -// sendTo(changeStatus.getUserId().toString(),gameMessage); -// } -// } + log.info("============ {}",gameMessage); + sendTo(gameMessage.getUserId().toString(), gameMessage); }); } } diff --git a/game/src/main/java/com/ccsens/game/service/RabbitMQListener.java b/game/src/main/java/com/ccsens/game/service/RabbitMQListener.java index 941873c2..0c2c7b07 100644 --- a/game/src/main/java/com/ccsens/game/service/RabbitMQListener.java +++ b/game/src/main/java/com/ccsens/game/service/RabbitMQListener.java @@ -6,6 +6,7 @@ import com.ccsens.game.bean.dto.message.GameMessageWithChangeStatusOut; import com.ccsens.util.JacksonUtil; import com.ccsens.util.WebConstant; import com.ccsens.util.config.RabbitMQConfig; +import lombok.extern.slf4j.Slf4j; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.amqp.rabbit.annotation.RabbitHandler; @@ -17,7 +18,7 @@ import java.io.IOException; import java.util.List; import java.util.TreeMap; - +@Slf4j @Component @RabbitListener(queues = RabbitMQConfig.GAME_STATUS) public class RabbitMQListener { @@ -27,11 +28,10 @@ public class RabbitMQListener { @RabbitHandler public void process(String messageJson) throws IOException { - System.out.println("*************"+messageJson); - List gameMessageList = JacksonUtil.jsonToBean(messageJson, - GameMessageWithChangeStatusOut.class, true); - - + System.out.println("++++++++++++++"+messageJson); +// List gameMessageList = JacksonUtil.jsonToBean(messageJson, +// GameMessageWithChangeStatusOut.class, true); + log.info("认证MQ {}",messageJson); messageService.doChangeStatusMessage(JacksonUtil.jsonToBean(messageJson, GameMessageWithChangeStatusOut.class, true)); }