Browse Source

修改环境配置

neo 1 year ago
parent
commit
2face951ed
5 changed files with 19 additions and 18 deletions
  1. 2 1
      .gitignore
  2. 3 3
      run/common/public.conf
  3. 3 3
      run/neo-test1/common.conf
  4. 3 3
      run/neo-test1/db.lua
  5. 8 8
      run/neo-test1/nodes.lua

+ 2 - 1
.gitignore

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

+ 3 - 3
run/common/public.conf

@@ -5,8 +5,8 @@ thread = 8
5
 harbor = 0
5
 harbor = 0
6
 bootstrap = "snlua bootstrap"
6
 bootstrap = "snlua bootstrap"
7
 
7
 
8
-proto_path = root.."elm-proto/proto-lib/"
9
-config_path = root.."config/"
8
+proto_path = root.."box-proto/proto-lib/"
9
+config_path = root.."box-config/"
10
 
10
 
11
 lualoader = root.."skynet/lualib/loader.lua"
11
 lualoader = root.."skynet/lualib/loader.lua"
12
 cpath = root.."skynet/cservice/?.so;"..root.."lib/cservice/?.so;"
12
 cpath = root.."skynet/cservice/?.so;"..root.."lib/cservice/?.so;"
@@ -23,7 +23,7 @@ lua_path = root.."skynet/lualib/?.lua;"
23
 ..root.."common/db/?.lua;"
23
 ..root.."common/db/?.lua;"
24
 ..root.."nodes/?.lua;"
24
 ..root.."nodes/?.lua;"
25
 ..root.."dev/?.lua;"
25
 ..root.."dev/?.lua;"
26
-..root.."elm-proto/?.lua;"
26
+..root.."box-proto/?.lua;"
27
 ..root.."lib/lualib/?.lua;"
27
 ..root.."lib/lualib/?.lua;"
28
 ..root.."run/etc/?.lua;"
28
 ..root.."run/etc/?.lua;"
29
 ..proto_path.."?.lua;"
29
 ..proto_path.."?.lua;"

+ 3 - 3
run/neo-test1/common.conf

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

+ 3 - 3
run/neo-test1/db.lua

@@ -16,7 +16,7 @@ root["mysql"]["game"] = {
16
     -- 游戏服务数据库
16
     -- 游戏服务数据库
17
     host = "192.168.10.14",
17
     host = "192.168.10.14",
18
     port = 3306,
18
     port = 3306,
19
-    database = "fc",
19
+    database = "box",
20
     user = "neo",
20
     user = "neo",
21
     password = "aGMtbmVvLWRldi0yMDIzMDQwNw==",
21
     password = "aGMtbmVvLWRldi0yMDIzMDQwNw==",
22
     max_packet_size = 2048 * 2048
22
     max_packet_size = 2048 * 2048
@@ -26,13 +26,13 @@ root["mysql"]["game"] = {
26
 root["redis"]["game"] = {
26
 root["redis"]["game"] = {
27
     {
27
     {
28
         host = "127.0.0.1",
28
         host = "127.0.0.1",
29
-        port = 6380,
29
+        port = 6381,
30
         db = 0,
30
         db = 0,
31
         auth = "aGMtbmVvLWRldi0yMDIzMDQwNw=="
31
         auth = "aGMtbmVvLWRldi0yMDIzMDQwNw=="
32
     },
32
     },
33
     {
33
     {
34
         host = "127.0.0.1",
34
         host = "127.0.0.1",
35
-        port = 6380,
35
+        port = 6381,
36
         db = 0,
36
         db = 0,
37
         auth = "aGMtbmVvLWRldi0yMDIzMDQwNw=="
37
         auth = "aGMtbmVvLWRldi0yMDIzMDQwNw=="
38
     }
38
     }

+ 8 - 8
run/neo-test1/nodes.lua

@@ -10,8 +10,8 @@ local root = {}
10
 
10
 
11
 -- master
11
 -- master
12
 root["master"] = {
12
 root["master"] = {
13
-    debugPort = 8000,
14
-    port = 8100,
13
+    debugPort = 8200,
14
+    port = 8300,
15
     agentCount = 1,
15
     agentCount = 1,
16
     bodyLimit = 8192
16
     bodyLimit = 8192
17
 }
17
 }
@@ -19,8 +19,8 @@ root["master"] = {
19
 -- 登陆服
19
 -- 登陆服
20
 root["login_1_1"] = {
20
 root["login_1_1"] = {
21
     ip = "0.0.0.0",
21
     ip = "0.0.0.0",
22
-    debugPort = 8001,
23
-    port = 8101,
22
+    debugPort = 8201,
23
+    port = 8301,
24
     agentCount = 5,
24
     agentCount = 5,
25
     bodyLimit = 8192
25
     bodyLimit = 8192
26
 }
26
 }
@@ -28,18 +28,18 @@ root["login_1_1"] = {
28
 -- 网关
28
 -- 网关
29
 root["gate_1_1"] = {
29
 root["gate_1_1"] = {
30
     ip = "192.168.10.14",
30
     ip = "192.168.10.14",
31
-    debugPort = 8002,
32
-    port = 8102,
31
+    debugPort = 8202,
32
+    port = 8302,
33
     maxClient = 5000,
33
     maxClient = 5000,
34
     nodelay = 1,
34
     nodelay = 1,
35
     protocol = "ws",
35
     protocol = "ws",
36
     weight = 50, -- 权重
36
     weight = 50, -- 权重
37
-    wsPort = 8103 -- websocket端口
37
+    wsPort = 8303 -- websocket端口
38
 }
38
 }
39
 
39
 
40
 -- 游戏服
40
 -- 游戏服
41
 root["game_1_1"] = {
41
 root["game_1_1"] = {
42
-    debugPort = 8003,
42
+    debugPort = 8203,
43
     weight = 50 -- 权重
43
     weight = 50 -- 权重
44
 }
44
 }
45
 
45