Skip to content

Commit 91880fa

Browse files
author
Evan Hu
committed
game server
1 parent ffdc8c2 commit 91880fa

File tree

82 files changed

+269
-270
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+269
-270
lines changed

‎game-cluster/pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<parent>
6-
<artifactId>game-project</artifactId>
6+
<artifactId>g-engine-server</artifactId>
77
<groupId>info.xiaomo</groupId>
8-
<version>2019.1</version>
8+
<version>3.1.0</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

@@ -19,13 +19,13 @@
1919
<dependencies>
2020
<dependency>
2121
<groupId>info.xiaomo</groupId>
22-
<artifactId>game-core</artifactId>
23-
<version>2.0.7</version>
22+
<artifactId>g-engine</artifactId>
23+
<version>3.1.0</version>
2424
</dependency>
2525
<dependency>
2626
<groupId>info.xiaomo</groupId>
2727
<artifactId>game-protocol</artifactId>
28-
<version>2019.1</version>
28+
<version>3.1.0</version>
2929
<scope>compile</scope>
3030
</dependency>
3131
</dependencies>

‎game-cluster/src/main/java/info/xiaomo/server/cluster/AppCluster.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
import java.io.File;
44
import java.util.Objects;
5-
import info.xiaomo.core.common.utils.FileUtil;
6-
import info.xiaomo.core.common.utils.SysUtil;
7-
import info.xiaomo.core.network.mina.config.MinaServerConfig;
8-
import info.xiaomo.core.persist.redis.jedis.JedisClusterConfig;
9-
import info.xiaomo.core.thread.ThreadPoolExecutorConfig;
5+
import info.xiaomo.gengine.common.utils.FileUtil;
6+
import info.xiaomo.gengine.common.utils.SysUtil;
7+
import info.xiaomo.gengine.network.mina.config.MinaServerConfig;
8+
import info.xiaomo.gengine.persist.redis.jedis.JedisClusterConfig;
9+
import info.xiaomo.gengine.thread.ThreadPoolExecutorConfig;
1010
import info.xiaomo.server.cluster.server.ClusterServer;
1111
import org.slf4j.Logger;
1212
import org.slf4j.LoggerFactory;

‎game-cluster/src/main/java/info/xiaomo/server/cluster/manager/ServerManager.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
import java.util.Map;
44
import java.util.Optional;
55
import java.util.concurrent.ConcurrentHashMap;
6-
import info.xiaomo.core.server.ServerInfo;
7-
import info.xiaomo.core.server.ServerState;
8-
import info.xiaomo.core.server.ServerType;
6+
import info.xiaomo.gengine.server.ServerInfo;
7+
import info.xiaomo.gengine.server.ServerState;
8+
import info.xiaomo.gengine.server.ServerType;
99
import info.xiaomo.server.cluster.server.ClusterTcpServer;
1010
import info.xiaomo.server.protocol.ServerMessage;
1111
import org.apache.mina.core.session.IoSession;

‎game-cluster/src/main/java/info/xiaomo/server/cluster/server/ClusterHttpServer.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package info.xiaomo.server.cluster.server;
22

3-
import info.xiaomo.core.common.handler.*;
4-
import info.xiaomo.core.network.mina.HttpServer;
5-
import info.xiaomo.core.network.mina.config.MinaServerConfig;
6-
import info.xiaomo.core.network.mina.handler.HttpServerIoHandler;
7-
import info.xiaomo.core.script.ScriptManager;
8-
import info.xiaomo.core.server.GameService;
9-
import info.xiaomo.core.thread.ThreadPoolExecutorConfig;
3+
import info.xiaomo.gengine.common.handler.*;
4+
import info.xiaomo.gengine.network.mina.HttpServer;
5+
import info.xiaomo.gengine.network.mina.config.MinaServerConfig;
6+
import info.xiaomo.gengine.network.mina.handler.HttpServerIoHandler;
7+
import info.xiaomo.gengine.script.ScriptManager;
8+
import info.xiaomo.gengine.server.GameService;
9+
import info.xiaomo.gengine.thread.ThreadPoolExecutorConfig;
1010
import org.apache.mina.core.session.IoSession;
1111
import org.apache.mina.filter.FilterEvent;
1212
import org.slf4j.Logger;

‎game-cluster/src/main/java/info/xiaomo/server/cluster/server/ClusterServer.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package info.xiaomo.server.cluster.server;
22

3-
import info.xiaomo.core.common.bean.NetPort;
4-
import info.xiaomo.core.common.utils.SysUtil;
5-
import info.xiaomo.core.network.mina.config.MinaServerConfig;
6-
import info.xiaomo.core.script.ScriptManager;
7-
import info.xiaomo.core.thread.ThreadPoolExecutorConfig;
3+
import info.xiaomo.gengine.common.bean.NetPort;
4+
import info.xiaomo.gengine.common.utils.SysUtil;
5+
import info.xiaomo.gengine.network.mina.config.MinaServerConfig;
6+
import info.xiaomo.gengine.script.ScriptManager;
7+
import info.xiaomo.gengine.thread.ThreadPoolExecutorConfig;
88
import info.xiaomo.server.cluster.AppCluster;
99
import org.slf4j.Logger;
1010
import org.slf4j.LoggerFactory;

‎game-cluster/src/main/java/info/xiaomo/server/cluster/server/ClusterTcpServer.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
package info.xiaomo.server.cluster.server;
22

3-
import info.xiaomo.core.common.utils.IntUtil;
4-
import info.xiaomo.core.common.utils.MsgUtil;
5-
import info.xiaomo.core.network.mina.TcpServer;
6-
import info.xiaomo.core.network.mina.config.MinaServerConfig;
7-
import info.xiaomo.core.network.mina.handler.DefaultProtocolHandler;
8-
import info.xiaomo.core.server.GameService;
9-
import info.xiaomo.core.server.ServerInfo;
10-
import info.xiaomo.core.thread.ServerThread;
11-
import info.xiaomo.core.thread.ThreadPoolExecutorConfig;
12-
import info.xiaomo.core.thread.ThreadType;
13-
import info.xiaomo.core.thread.timer.event.ServerHeartTimer;
3+
import info.xiaomo.gengine.common.utils.IntUtil;
4+
import info.xiaomo.gengine.common.utils.MsgUtil;
5+
import info.xiaomo.gengine.network.mina.TcpServer;
6+
import info.xiaomo.gengine.network.mina.config.MinaServerConfig;
7+
import info.xiaomo.gengine.network.mina.handler.DefaultProtocolHandler;
8+
import info.xiaomo.gengine.server.GameService;
9+
import info.xiaomo.gengine.server.ServerInfo;
10+
import info.xiaomo.gengine.thread.ServerThread;
11+
import info.xiaomo.gengine.thread.ThreadPoolExecutorConfig;
12+
import info.xiaomo.gengine.thread.ThreadType;
13+
import info.xiaomo.gengine.thread.timer.event.ServerHeartTimer;
1414
import info.xiaomo.server.cluster.manager.ServerManager;
1515
import org.apache.mina.core.session.IdleStatus;
1616
import org.apache.mina.core.session.IoSession;

‎game-gate/pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<parent>
6-
<artifactId>game-project</artifactId>
6+
<artifactId>g-engine-server</artifactId>
77
<groupId>info.xiaomo</groupId>
8-
<version>2019.1</version>
8+
<version>3.1.0</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

@@ -19,13 +19,13 @@
1919
<dependencies>
2020
<dependency>
2121
<groupId>info.xiaomo</groupId>
22-
<artifactId>game-core</artifactId>
23-
<version>2.0.7</version>
22+
<artifactId>g-engine</artifactId>
23+
<version>3.1.0</version>
2424
</dependency>
2525
<dependency>
2626
<groupId>info.xiaomo</groupId>
2727
<artifactId>game-protocol</artifactId>
28-
<version>2019.1</version>
28+
<version>3.1.0</version>
2929
<scope>compile</scope>
3030
</dependency>
3131
</dependencies>

‎game-gate/src/main/java/info/xiaomo/server/gate/AppGate.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package info.xiaomo.server.gate;
22

33
import java.io.File;
4-
import info.xiaomo.core.common.utils.FileUtil;
5-
import info.xiaomo.core.persist.redis.jedis.JedisClusterConfig;
6-
import info.xiaomo.core.persist.redis.jedis.JedisManager;
7-
import info.xiaomo.core.script.ScriptManager;
4+
import info.xiaomo.gengine.common.utils.FileUtil;
5+
import info.xiaomo.gengine.persist.redis.jedis.JedisClusterConfig;
6+
import info.xiaomo.gengine.persist.redis.jedis.JedisManager;
7+
import info.xiaomo.gengine.script.ScriptManager;
88
import info.xiaomo.server.gate.manager.MongoManager;
99
import info.xiaomo.server.gate.server.GateServer;
1010
import org.slf4j.Logger;

‎game-gate/src/main/java/info/xiaomo/server/gate/manager/MongoManager.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
*/
66
package info.xiaomo.server.gate.manager;
77

8-
import info.xiaomo.core.persist.mongo.AbsMongoManager;
9-
import info.xiaomo.core.persist.mongo.dao.HallInfoDao;
10-
import info.xiaomo.core.persist.mongo.dao.RoleDao;
11-
import info.xiaomo.core.persist.mongo.dao.UserDao;
8+
import info.xiaomo.gengine.persist.mongo.AbsMongoManager;
9+
import info.xiaomo.gengine.persist.mongo.dao.HallInfoDao;
10+
import info.xiaomo.gengine.persist.mongo.dao.RoleDao;
11+
import info.xiaomo.gengine.persist.mongo.dao.UserDao;
1212
import org.slf4j.Logger;
1313
import org.slf4j.LoggerFactory;
1414

‎game-gate/src/main/java/info/xiaomo/server/gate/manager/ServerManager.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package info.xiaomo.server.gate.manager;
22

3-
import info.xiaomo.core.server.ServerInfo;
4-
import info.xiaomo.core.server.ServerState;
5-
import info.xiaomo.core.server.ServerType;
3+
import info.xiaomo.gengine.server.ServerInfo;
4+
import info.xiaomo.gengine.server.ServerState;
5+
import info.xiaomo.gengine.server.ServerType;
66
import info.xiaomo.server.gate.struct.UserSession;
77
import info.xiaomo.server.protocol.ServerMessage;
88
import info.xiaomo.server.protocol.system.SystemMessage.SystemErroCode;

0 commit comments

Comments
 (0)