调整文件结构

incubator-game/src/main/java/com/incubator/game/GGame.java

@@ -10,7 +10,6 @@ import com.incubator.common.net.netty.handler.websocket.binary.WebSocketServerBi
 import com.incubator.common.net.netty.server.NettyServer;
 import com.incubator.common.thread.NamedThreadFactory;
 import com.incubator.common.util.PropertiesUtil;
-import com.incubator.core.db.pool.DBFactory;
 import com.incubator.core.net.http.HttpRequestHandler;
 import com.incubator.game.listener.HttpInnerListener;
 import com.incubator.core.net.ws.NetHandler;
@@ -21,9 +20,7 @@ import com.incubator.game.data.entity.GlobalInfoPO;
 import com.incubator.game.data.jdbc.LSDBHandler;
 import com.incubator.game.listener.PublicListener;
 import com.incubator.game.player.GPlayer;
-import com.incubator.game.service.RoomService;
-import com.incubator.game.timer.FlushDB;
-import com.incubator.game.timer.RefreshNewDay;
+import com.incubator.game.room.RoomService;
 import com.incubator.game.util.GameDataUtil;
 import io.netty.util.CharsetUtil;
 import org.apache.commons.lang3.StringUtils;
@@ -39,7 +36,6 @@ import java.nio.file.Paths;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ScheduledThreadPoolExecutor;
-import java.util.concurrent.atomic.AtomicInteger;
 
 public class GGame extends AbstractService {
 

incubator-game/src/main/java/com/incubator/game/handler/CreatRoomHandler.java

@@ -6,7 +6,7 @@ import com.incubator.core.net.ws.WSRequest;
 import com.incubator.core.net.ws.WSResponse;
 import com.incubator.game.player.Player;
 import com.incubator.game.room.Room;
-import com.incubator.game.service.RoomService;
+import com.incubator.game.room.RoomService;
 import com.incubator.game.util.MsgUtil;
 import com.incubator.game.util.PlayerUtil;
 import com.incubator.message.proto.CommonProto;

incubator-game/src/main/java/com/incubator/game/handler/JoinRoomHandler.java

@@ -6,7 +6,7 @@ import com.incubator.core.net.ws.WSRequest;
 import com.incubator.core.net.ws.WSResponse;
 import com.incubator.game.player.Player;
 import com.incubator.game.room.Room;
-import com.incubator.game.service.RoomService;
+import com.incubator.game.room.RoomService;
 import com.incubator.game.util.MsgUtil;
 import com.incubator.game.util.PlayerUtil;
 import com.incubator.message.proto.CommonProto;

incubator-game/src/main/java/com/incubator/game/handler/LoginGameHandler.java

@@ -7,7 +7,7 @@ import com.incubator.core.net.ws.WSResponse;
 import com.incubator.game.data.entity.PlayerInfoPO;
 import com.incubator.game.player.Player;
 import com.incubator.game.room.Room;
-import com.incubator.game.service.RoomService;
+import com.incubator.game.room.RoomService;
 import com.incubator.game.util.MsgUtil;
 import com.incubator.game.util.PlayerUtil;
 import com.incubator.message.proto.CommonProto;

incubator-game/src/main/java/com/incubator/game/handler/jdgd/JDGDDisCardHandler.java

@@ -4,9 +4,9 @@ import com.incubator.common.net.Connection;
 import com.incubator.core.net.ws.NetHandler;
 import com.incubator.core.net.ws.WSRequest;
 import com.incubator.core.net.ws.WSResponse;
-import com.incubator.game.jdgd.JDGDRoom;
+import com.incubator.game.room.jdgd.JDGDRoom;
 import com.incubator.game.player.Player;
-import com.incubator.game.service.RoomService;
+import com.incubator.game.room.RoomService;
 import com.incubator.game.util.MsgUtil;
 import com.incubator.game.util.PlayerUtil;
 import com.incubator.message.proto.CommonProto;

incubator-game/src/main/java/com/incubator/game/handler/jdgd/JDGDReadyHandler.java

@@ -4,9 +4,9 @@ import com.incubator.common.net.Connection;
 import com.incubator.core.net.ws.NetHandler;
 import com.incubator.core.net.ws.WSRequest;
 import com.incubator.core.net.ws.WSResponse;
-import com.incubator.game.jdgd.JDGDRoom;
+import com.incubator.game.room.jdgd.JDGDRoom;
 import com.incubator.game.player.Player;
-import com.incubator.game.service.RoomService;
+import com.incubator.game.room.RoomService;
 import com.incubator.game.util.MsgUtil;
 import com.incubator.game.util.PlayerUtil;
 import com.incubator.message.proto.CommonProto;

incubator-game/src/main/java/com/incubator/game/room/Room.java

@@ -2,8 +2,8 @@ package com.incubator.game.room;
 
 import com.incubator.common.log4j.Log4jUtil;
 import com.incubator.game.data.model.RoomPO;
-import com.incubator.game.jdgd.JDGDRoom;
-import com.incubator.game.jdgd.JDGDSchedule;
+import com.incubator.game.room.jdgd.JDGDRoom;
+import com.incubator.game.room.jdgd.JDGDSchedule;
 import org.slf4j.Logger;
 
 import java.util.concurrent.Executors;

incubator-game/src/main/java/com/incubator/game/service/RoomService.java → incubator-game/src/main/java/com/incubator/game/room/RoomService.java

@@ -1,10 +1,9 @@
-package com.incubator.game.service;
+package com.incubator.game.room;
 
 import com.incubator.common.log4j.Log4jUtil;
 import com.incubator.common.util.RandomUtil;
 import com.incubator.game.player.Player;
-import com.incubator.game.jdgd.JDGDRoom;
-import com.incubator.game.room.Room;
+import com.incubator.game.room.jdgd.JDGDRoom;
 import com.incubator.game.util.MsgUtil;
 import com.incubator.message.proto.CommonProto;
 import org.slf4j.Logger;

incubator-game/src/main/java/com/incubator/game/jdgd/JDGDRoom.java → incubator-game/src/main/java/com/incubator/game/room/jdgd/JDGDRoom.java

@@ -1,4 +1,4 @@
-package com.incubator.game.jdgd;
+package com.incubator.game.room.jdgd;
 
 import com.incubator.game.player.Player;
 import com.incubator.game.room.GRoomInterface;

incubator-game/src/main/java/com/incubator/game/jdgd/JDGDSchedule.java → incubator-game/src/main/java/com/incubator/game/room/jdgd/JDGDSchedule.java

@@ -1,7 +1,6 @@
-package com.incubator.game.jdgd;
+package com.incubator.game.room.jdgd;
 
 import com.incubator.common.log4j.Log4jUtil;
-import com.incubator.game.service.RoomService;
 import org.slf4j.Logger;
 
 /**