refactor(Gateway): 修改服务器类型名称并注释端口配置

- 将 Logic 服务器更名为 Gate 服务器
- 在 docker-compose.yml 中注释掉端口配置

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",

Gateway/GateWay.txt

@@ -10,7 +10,7 @@ GateServer = {
                 },
                 --后台服务器的地址和端口
                 BackServer = {
-                        Host = "127.0.0.1",
+                        Host = "logic",
                         Port = 10318,
                 },
         },

Gateway/start.sh

@@ -6,6 +6,6 @@ path=`pwd`
 echo "======================【启动】========================"
 datetime=`date "+%Y-%m-%d.%H:%M:%S"`
 
-echo "["$datetime"] 正在启动 Logic 服务器 [gateway_r]..."
+echo "["$datetime"] 正在启动 Gate 服务器 [gateway_r]..."
 
 $path/gateway_r $path/GateWay.txt

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,
 	},
 }

buildConfig/AMServerLinux.txt

@@ -9,10 +9,10 @@ amconfig=
 			codeid=1,  							--产品的编号
 			code="djrm",  						--产品的code
 			db="mir_amdb",					--数据库名
-			host="127.0.0.1",					--数据库主机
+			host="192.168.25.110",					--数据库主机
-			port=3306,							--数据库端口
+			port=3307,							--数据库端口
 			user="root",					--数据库账号
-			pass="85b5c930502992d4",						--数据库密码
+			pass="mysql_Adkijc",						--数据库密码
 			paykey="GAmqXI8ao8kGAOIQmjFVqg==",	--
 			awdkey="GAmqXI8ao8kGAOIQmjFVqg==",	--
 			bianma="utf8",						--

buildConfig/BackStageServerLinux.txt

@@ -1,4 +1,4 @@
-BackServer = 
+BackServer = 
 {
 	spguid = 1,		--默认的spid
 
@@ -14,11 +14,11 @@
 	--数据库连接相关
 	SQL = 
 	{ 
-		Host = "127.0.0.1",
+		Host = "192.168.25.110",
-		Port = 3306, 
+		Port = 3307, 
 		DBName = "mir_command", 
 		DBUser = "root", 
-		DBPass = "85b5c930502992d4",
+		DBPass = "mysql_Adkijc",
 		utf8=1,
 	},
 }

buildConfig/LoggerServerLinux.txt

@@ -1,4 +1,4 @@
-LoggerServer = 
+LoggerServer = 
 {
 	--监听：服务器参数配置
 	Server = 
@@ -19,11 +19,11 @@
 	--数据库连接相关
 	SQL = 
 	{
-		Host = "127.0.0.1", 	
+		Host = "192.168.25.110", 	
-		Port = 3306, 
+		Port = 3307, 
 		DBName = "mir_log_s1", 
 		DBUser = "root", 
-		DBPass = "85b5c930502992d4",
+		DBPass = "mysql_Adkijc",
 		utf8=1,
 	},
 }

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", 
+		Host = "192.168.25.110", 
-		Port = 3306, 
+		Port = 3307, 
 		DBName = "mir_name", 
 		DBUser = "root", 
-		DBPass = "85b5c930502992d4" 
+		DBPass = "mysql_Adkijc" 
 	}
 }

buildConfig/SessionServerLinux.txt

@@ -42,10 +42,10 @@ SessionServer =
 	--数据库连接配置
 	SQL = 
 	{ 
-		Host = "127.0.0.1", 	
+		Host = "192.168.25.110", 	
-		Port = 3306, 
+		Port = 3307, 
 		DBName = "mir_account",
 		DBUser = "root",
-		DBPass = "85b5c930502992d4",
+		DBPass = "mysql_Adkijc",
 	}
 }

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
+networks:
+  network:
+    driver: bridge
+    ipam:
+      config:
+        - subnet: 172.36.10.0/24