diff --git a/DBServer/DBServerLinux.txt b/DBServer/DBServerLinux.txt index ac2b9e5..63e945b 100755 --- a/DBServer/DBServerLinux.txt +++ b/DBServer/DBServerLinux.txt @@ -40,7 +40,7 @@ DBServer = { --数据库连接配置 SQL = { - Host = "127.0.0.1", + Host = "192.168.25.110", Port = 3308, DBName = "mir_actor_s1", DBUser = "root", diff --git a/Gateway/GateWay.txt b/Gateway/GateWay.txt index e76eced..7a98fce 100755 --- a/Gateway/GateWay.txt +++ b/Gateway/GateWay.txt @@ -10,7 +10,7 @@ GateServer = { }, --后台服务器的地址和端口 BackServer = { - Host = "127.0.0.1", + Host = "logic", Port = 10318, }, }, diff --git a/LogicServer/LogicServerLinux.txt b/LogicServer/LogicServerLinux.txt index b6820fa..55b600a 100755 --- a/LogicServer/LogicServerLinux.txt +++ b/LogicServer/LogicServerLinux.txt @@ -13,37 +13,37 @@ LogicServer = { --连接：数据服务器 DbServer = { - Address = "127.0.0.1", + Address = "172.36.10.25", Port = 10319, }, --连接：LocalLog服务器 LocalLogServer = { - Address = "127.0.0.1", + Address = "172.36.10.25", Port = 35010, }, --连接：会话服务器 SessionServer = { - Address = "127.0.0.1", + Address = "172.36.10.25", Port = 31000, }, --连接：Log服务器 LogServer = { - Address = "127.0.0.1", + Address = "172.36.10.25", Port = 34000, }, --连接：AM服务器 AMServer = { - Host = "127.0.0.1", + Host = "172.36.10.25", Port = 5660, }, --连接：后台服务器 MgrServer = { - Host = "127.0.0.1", + Host = "172.36.10.25", Port = 8500, }, } diff --git a/buildConfig/AMServerLinux.txt b/buildConfig/AMServerLinux.txt old mode 100644 new mode 100755 index 1a00098..fb5ff34 --- a/buildConfig/AMServerLinux.txt +++ b/buildConfig/AMServerLinux.txt @@ -9,10 +9,10 @@ amconfig= codeid=1, --产品的编号 code="djrm", --产品的code db="mir_amdb", --数据库名 - host="127.0.0.1", --数据库主机 - port=3306, --数据库端口 + host="192.168.25.110", --数据库主机 + port=3307, --数据库端口 user="root", --数据库账号 - pass="85b5c930502992d4", --数据库密码 + pass="mysql_Adkijc", --数据库密码 paykey="GAmqXI8ao8kGAOIQmjFVqg==", -- awdkey="GAmqXI8ao8kGAOIQmjFVqg==", -- bianma="utf8", -- diff --git a/buildConfig/BackStageServerLinux.txt b/buildConfig/BackStageServerLinux.txt old mode 100644 new mode 100755 index a126688..50a88bb --- a/buildConfig/BackStageServerLinux.txt +++ b/buildConfig/BackStageServerLinux.txt @@ -1,4 +1,4 @@ -BackServer = +BackServer = { spguid = 1, --默认的spid @@ -14,11 +14,11 @@ --数据库连接相关 SQL = { - Host = "127.0.0.1", - Port = 3306, + Host = "192.168.25.110", + Port = 3307, DBName = "mir_command", DBUser = "root", - DBPass = "85b5c930502992d4", + DBPass = "mysql_Adkijc", utf8=1, }, } \ No newline at end of file diff --git a/buildConfig/LoggerServerLinux.txt b/buildConfig/LoggerServerLinux.txt old mode 100644 new mode 100755 index 05a67da..3f17139 --- a/buildConfig/LoggerServerLinux.txt +++ b/buildConfig/LoggerServerLinux.txt @@ -1,4 +1,4 @@ -LoggerServer = +LoggerServer = { --监听：服务器参数配置 Server = @@ -19,11 +19,11 @@ --数据库连接相关 SQL = { - Host = "127.0.0.1", - Port = 3306, + Host = "192.168.25.110", + Port = 3307, DBName = "mir_log_s1", DBUser = "root", - DBPass = "85b5c930502992d4", + DBPass = "mysql_Adkijc", utf8=1, }, } \ No newline at end of file diff --git a/buildConfig/NameServerLinux.txt b/buildConfig/NameServerLinux.txt old mode 100644 new mode 100755 index 2ff0fa3..e4ff9b1 --- a/buildConfig/NameServerLinux.txt +++ b/buildConfig/NameServerLinux.txt @@ -1,4 +1,4 @@ -NameServer = +NameServer = { --服务器名称 ServerName = "zgame-nameserver", @@ -15,10 +15,10 @@ SQL = { --Host = "192.168.0.173", - Host = "127.0.0.1", - Port = 3306, + Host = "192.168.25.110", + Port = 3307, DBName = "mir_name", DBUser = "root", - DBPass = "85b5c930502992d4" + DBPass = "mysql_Adkijc" } } diff --git a/buildConfig/SessionServerLinux.txt b/buildConfig/SessionServerLinux.txt old mode 100644 new mode 100755 index 3734689..0fcd1ff --- a/buildConfig/SessionServerLinux.txt +++ b/buildConfig/SessionServerLinux.txt @@ -42,10 +42,10 @@ SessionServer = --数据库连接配置 SQL = { - Host = "127.0.0.1", - Port = 3306, + Host = "192.168.25.110", + Port = 3307, DBName = "mir_account", DBUser = "root", - DBPass = "85b5c930502992d4", + DBPass = "mysql_Adkijc", } } \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 1158f5c..7375545 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,10 +1,19 @@ version: '3.8' services: - db: + base: image: chuanqi-server-base:latest - container_name: chuanqi-server-db + networks: + network: + ipv4_address: 172.36.10.25 stdin_open: true + ports: + - 10319:10319 + - 35010:35010 + - 31000:31000 + - 34000:34000 + - 5660:5660 + - 8500:8500 volumes: - ./DBServer:/data/server/s1/DBServer - ./wch:/etc/yum/wch @@ -14,37 +23,50 @@ services: - ./buildConfig/NameServerLinux.txt:/data/server/build/NameServer/NameServerLinux.txt - ./buildConfig/SessionServerLinux.txt:/data/server/build/SessionServer/SessionServerLinux.txt entrypoint: "/data/server/s1/DBServer/start.sh" - network_mode: "host" restart: unless-stopped environment: TZ: Asia/Shanghai logic: image: registry.cn-hangzhou.aliyuncs.com/kubbo/chuanqi-os:latest - container_name: chuanqi-server-logic + networks: + - network + ports: + - 10318:10318 + deploy: + replicas: 1 + restart_policy: + condition: on-failure depends_on: - - db # 等待db服务启动 + - base stdin_open: true volumes: - ./LogicServer:/data/server/s1/LogicServer - ./wch:/etc/yum/wch entrypoint: "/data/server/s1/LogicServer/start.sh" - network_mode: "host" restart: unless-stopped environment: TZ: Asia/Shanghai gate: image: registry.cn-hangzhou.aliyuncs.com/kubbo/chuanqi-os:latest - container_name: chuanqi-server-gate + networks: + - network + ports: + - 10317:10317 depends_on: - - logic # 等待logic服务启动 + - logic stdin_open: true volumes: - ./Gateway:/data/server/s1/Gateway - ./wch:/etc/yum/wch entrypoint: "/data/server/s1/Gateway/start.sh" - network_mode: "host" restart: unless-stopped environment: - TZ: Asia/Shanghai \ No newline at end of file + TZ: Asia/Shanghai +networks: + network: + driver: bridge + ipam: + config: + - subnet: 172.36.10.0/24 \ No newline at end of file