johnclot69 4 ماه پیش
والد
کامیت
37e21fd916

+ 3 - 2
incubator-core/src/main/java/com/incubator/core/net/ws/MsgBase.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson2.JSON;
 import org.msgpack.core.MessageBufferPacker;
 import org.msgpack.core.MessagePack;
 import org.msgpack.core.MessageUnpacker;
+import org.msgpack.core.buffer.MessageBuffer;
 import org.msgpack.value.ValueType;
 
 import java.io.ByteArrayInputStream;
@@ -156,7 +157,7 @@ public abstract class MsgBase {
     /**
      * 将 WSResponse 序列化为字节数组
      */
-    public byte[] toBytes() throws Exception {
+    public MessageBuffer toBytes() throws Exception {
         MessageBufferPacker packer = MessagePack.newDefaultBufferPacker();
 
         // 序列化成一个 Map,包含 "cmd" 和 "data"
@@ -183,7 +184,7 @@ public abstract class MsgBase {
         }
 
         packer.close();
-        return packer.toByteArray();
+        return packer.toMessageBuffer();
     }
 
     /**

+ 2 - 1
incubator-game/src/main/java/com/incubator/game/GGame.java

@@ -257,7 +257,8 @@ public class GGame extends AbstractService {
         logger.info("初始化网络服务...");
         // websocket端口
         NetServer publicServer = new NettyServer(GGame.BIND_HOST, GGame.BIND_PORT,
-                new WebSocketServerBinaryAdapterHandler("/ws", new InitalizerProtocolHandler(new PublicListener())));
+                new WebSocketServerBinaryAdapterHandler("/ws",
+                        new InitalizerProtocolHandler(new PublicListener())));
         publicServer.start();
 
         // http端口

+ 1 - 1
incubator-game/src/main/java/com/incubator/game/data/jedis/JedisPoolUtil.java

@@ -9,7 +9,7 @@ import redis.clients.jedis.Jedis;
 import redis.clients.jedis.JedisPool;
 import redis.clients.jedis.JedisPoolConfig;
 
-public class JedisPoolUtil {
+public final class JedisPoolUtil {
 
 	protected static Logger logger = Log4jUtil.getLogger(JedisPoolUtil.class);
 

+ 1 - 1
incubator-game/src/main/java/com/incubator/game/data/jedis/RedisUtil.java

@@ -12,7 +12,7 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.*;
 
-public class RedisUtil {
+public final class RedisUtil {
 
 	private static final int DEFAULT_SETEX_TIMEOUT = 60 * 60;// setex的默认时间
 

+ 1 - 1
incubator-game/src/main/java/com/incubator/game/room/JDGDRoom.java

@@ -250,7 +250,7 @@ public class JDGDRoom extends Room implements GRoomInterface {
             case 4:// 4人房
                 // 1.判断单贡, 13游一队,24游一队
 
-                // 2.判断双贡, 12游一队34游一队
+                // 2.判断双贡, 12游一队,34游一队
                 break;
         }
     }