修改环境配置

.gitignore

@@ -8,4 +8,5 @@
 /run/etc
 log/*.info
 settings.json
-/elm-proto
+/box-proto
+/box-config

run/common/public.conf

@@ -5,8 +5,8 @@ thread = 8
 harbor = 0
 bootstrap = "snlua bootstrap"
 
-proto_path = root.."elm-proto/proto-lib/"
-config_path = root.."config/"
+proto_path = root.."box-proto/proto-lib/"
+config_path = root.."box-config/"
 
 lualoader = root.."skynet/lualib/loader.lua"
 cpath = root.."skynet/cservice/?.so;"..root.."lib/cservice/?.so;"
@@ -23,7 +23,7 @@ lua_path = root.."skynet/lualib/?.lua;"
 ..root.."common/db/?.lua;"
 ..root.."nodes/?.lua;"
 ..root.."dev/?.lua;"
-..root.."elm-proto/?.lua;"
+..root.."box-proto/?.lua;"
 ..root.."lib/lualib/?.lua;"
 ..root.."run/etc/?.lua;"
 ..proto_path.."?.lua;"

run/neo-test1/common.conf

@@ -1,8 +1,8 @@
 mode = "debug"
 write_log = "11111111"
 
-logpath = "/home/neo/work/h5/elm-server/log/"
-statistic_path = "/home/neo/work/h5/elm-server/log/statistic/"
-zip_statistic_path = "/home/neo/work/h5/elm-server/log/zip_path/"
+logpath = "/home/neo/work/box/box-server/log/"
+statistic_path = "/home/neo/work/box/box-server/log/statistic/"
+zip_statistic_path = "/home/neo/work/box/box-server/log/zip_path/"
 
 system = 'linux'

run/neo-test1/db.lua

@@ -16,7 +16,7 @@ root["mysql"]["game"] = {
     -- 游戏服务数据库
     host = "192.168.10.14",
     port = 3306,
-    database = "fc",
+    database = "box",
     user = "neo",
     password = "aGMtbmVvLWRldi0yMDIzMDQwNw==",
     max_packet_size = 2048 * 2048
@@ -26,13 +26,13 @@ root["mysql"]["game"] = {
 root["redis"]["game"] = {
     {
         host = "127.0.0.1",
-        port = 6380,
+        port = 6381,
         db = 0,
         auth = "aGMtbmVvLWRldi0yMDIzMDQwNw=="
     },
     {
         host = "127.0.0.1",
-        port = 6380,
+        port = 6381,
         db = 0,
         auth = "aGMtbmVvLWRldi0yMDIzMDQwNw=="
     }

run/neo-test1/nodes.lua

@@ -10,8 +10,8 @@ local root = {}
 
 -- master
 root["master"] = {
-    debugPort = 8000,
-    port = 8100,
+    debugPort = 8200,
+    port = 8300,
     agentCount = 1,
     bodyLimit = 8192
 }
@@ -19,8 +19,8 @@ root["master"] = {
 -- 登陆服
 root["login_1_1"] = {
     ip = "0.0.0.0",
-    debugPort = 8001,
-    port = 8101,
+    debugPort = 8201,
+    port = 8301,
     agentCount = 5,
     bodyLimit = 8192
 }
@@ -28,18 +28,18 @@ root["login_1_1"] = {
 -- 网关
 root["gate_1_1"] = {
     ip = "192.168.10.14",
-    debugPort = 8002,
-    port = 8102,
+    debugPort = 8202,
+    port = 8302,
     maxClient = 5000,
     nodelay = 1,
     protocol = "ws",
     weight = 50, -- 权重
-    wsPort = 8103 -- websocket端口
+    wsPort = 8303 -- websocket端口
 }
 
 -- 游戏服
 root["game_1_1"] = {
-    debugPort = 8003,
+    debugPort = 8203,
     weight = 50 -- 权重
 }