Skip to content

Commit

Permalink
修改部署配置
Browse files Browse the repository at this point in the history
  • Loading branch information
jzyong committed Nov 24, 2017
1 parent bedbea8 commit 1f5dc9f
Show file tree
Hide file tree
Showing 13 changed files with 52 additions and 26 deletions.
4 changes: 2 additions & 2 deletions game-bydr/run.bat
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
title cluster
java -jar -server -Xms512M -Xmx1024M target/game-bydr-0.0.1-SNAPSHOT.jar
title game-bydr
java -jar -server -Xms512M -Xmx1024M target/game-bydr-releases.jar

pause
21 changes: 17 additions & 4 deletions game-bydr/src/main/resources/Filter/LOCAL_DEFAULT.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,24 @@
# To change this template file, choose Tools | Templates
# and open the template in the editor.


#\u65e5\u5fd7\u8f93\u51fa\u7ea7\u522b
LOG_LEVEL=INFO,stdout
LOG_LEVEL=DEBUG,stdout

#Redis ip\u5730\u5740
REDIS_IP=127.0.0.1

#Mongo\u8fde\u63a5\u5730\u5740
MONGO_URL=mongodb://127.0.0.1:27017

#Game
GAME.ID=1
GAME.HOST=127.0.0.1
GAME.PORT=9001
GAME.HTTPPORT=9003
GAME.CONNTO.CLUSTER.HOST=127.0.0.1
GAME.CONNTO.HALL.HOST=127.0.0.1


#Cluster
CLUSTER.HOST=192.168.0.17
CLUSTER.PORT=8600
CLUSTER.HOST=127.0.0.1
CLUSTER.PORT=8000
2 changes: 1 addition & 1 deletion game-cluster/run.bat
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
title cluster
java -jar -server -Xms512M -Xmx512M target/game-cluster-0.0.1-SNAPSHOT.jar
java -jar -server -Xms512M -Xmx512M target/game-cluster-releases.jar

pause
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# redis \u7684ip
REDIS_IP=172.31.0.13
REDIS_IP=127.0.0.1



#\u65e5\u5fd7\u7ea7\u522b ERROR\u3001WARN\u3001INFO\u3001DEBUG DEBUG\u5c06\u663e\u793a\u6240\u6709
LOG_LEVEL=INFO,stdout
#\u65e5\u5fd7\u76f8\u5173
LOG_LEVEL=DEBUG,stdout
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified game-config/src/main/resources/table/ConfigNotice.xlsx
Binary file not shown.
2 changes: 1 addition & 1 deletion game-gate/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@

<filters>
<filter>
src/main/resources/Filter/LOCAL_JZY.properties
src/main/resources/Filter/LOCAL_DEFAULT.properties
</filter>
</filters>
<resources>
Expand Down
4 changes: 2 additions & 2 deletions game-gate/run.bat
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
title game-hall
java -jar -server -Xms512M -Xmx1024M target/game-hall-0.0.1-SNAPSHOT.jar
title game-gate
java -jar -server -Xms512M -Xmx1024M target/game-gate-releases.jar

pause
21 changes: 17 additions & 4 deletions game-gate/src/main/resources/Filter/LOCAL_DEFAULT.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,24 @@
# To change this template file, choose Tools | Templates
# and open the template in the editor.


#\u65e5\u5fd7\u8f93\u51fa\u7ea7\u522b
LOG_LEVEL=INFO,stdout
LOG_LEVEL=DEBUG,stdout

#Redis ip\u5730\u5740
REDIS_IP=127.0.0.1

#Mongo\u8fde\u63a5\u5730\u5740
MONGO_URL=mongodb://127.0.0.1:27017

#GATE
GATE.ID=3
GATE.HOST=127.0.0.1
GATE.GMAE.PORT=8003
GATE.USER.PORT=8002
GATE.USER.UDP.PORT=8004
GATE.HTTP.PORT=8006
GATE.WEBSOCKET.PORT=8007

#Cluster
CLUSTER.HOST=192.168.0.17
CLUSTER.PORT=8600
CLUSTER.HOST=127.0.0.1
CLUSTER.PORT=8000
4 changes: 2 additions & 2 deletions game-hall/run.bat
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
title cluster
java -jar -server -Xms512M -Xmx1024M target/game-bydr-0.0.1-SNAPSHOT.jar
title hall
java -jar -server -Xms512M -Xmx1024M target/game-hall-releases.jar

pause
12 changes: 6 additions & 6 deletions game-hall/src/main/resources/Filter/LOCAL_DEFAULT.properties
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,20 @@
LOG_LEVEL=DEBUG,stdout

#Redis ip\u5730\u5740
REDIS_IP=192.168.0.71
REDIS_IP=127.0.0.1

#Mongo\u8fde\u63a5\u5730\u5740
MONGO_URL=mongodb://192.168.0.71:27017
MONGO_URL=mongodb://127.0.0.1:27017

#Game
GAME.ID=1
GAME.HOST=192.168.0.17
GAME.HOST=127.0.0.1
GAME.PORT=9001
GAME.HTTPPORT=9002
GAME.CONNTO.CLUSTER.HOST=192.168.0.17
GAME.CONNTO.HALL.HOST=192.168.0.17
GAME.CONNTO.CLUSTER.HOST=127.0.0.1
GAME.CONNTO.HALL.HOST=127.0.0.1


#Cluster
CLUSTER.HOST=192.168.0.17
CLUSTER.HOST=127.0.0.1
CLUSTER.PORT=8000
1 change: 1 addition & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<name>game</name>
<description>棋牌游戏服务器</description>
<modules>
<module>game-engine</module>
<module>game-gate</module>
<module>game-model</module>
<module>game-cluster</module>
Expand Down

0 comments on commit 1f5dc9f

Please sign in to comment.