Compare commits

..

2 Commits

Author SHA1 Message Date
5f6781ca4b refactor(Gateway): 修改服务器类型名称并注释端口配置
- 将 Logic 服务器更名为 Gate 服务器
- 在 docker-compose.yml 中注释掉端口配置
2025-07-27 15:21:19 +08:00
root
fe82801742 feat(server): 更新服务器配置并调整网络设置
- 修改数据库服务器地址和端口
- 更新后台服务器地址
- 调整逻辑服务器和其他相关服务器的地址
- 更改数据库密码
- 在 docker-compose.yml 中添加网络配置和端口映射
2025-07-02 23:05:36 +08:00
12 changed files with 163 additions and 202 deletions

View File

@@ -40,10 +40,10 @@ DBServer = {
--数据库连接配置 --数据库连接配置
SQL = { SQL = {
Host = "127.0.0.1", Host = "192.168.25.110",
Port = 3306, Port = 3308,
DBName = "mir_actor_s1", DBName = "mir_actor_s1",
DBUser = "root", DBUser = "root",
DBPass = "mysql_y8NXNT", DBPass = "mysql_Adkijc",
} }
} }

View File

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

View File

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

View File

@@ -13,37 +13,37 @@ LogicServer = {
--连接:数据服务器 --连接:数据服务器
DbServer = { DbServer = {
Address = "127.0.0.1", Address = "172.36.10.25",
Port = 10319, Port = 10319,
}, },
--连接LocalLog服务器 --连接LocalLog服务器
LocalLogServer = { LocalLogServer = {
Address = "127.0.0.1", Address = "172.36.10.25",
Port = 35010, Port = 35010,
}, },
--连接:会话服务器 --连接:会话服务器
SessionServer = { SessionServer = {
Address = "127.0.0.1", Address = "172.36.10.25",
Port = 31000, Port = 31000,
}, },
--连接Log服务器 --连接Log服务器
LogServer = { LogServer = {
Address = "127.0.0.1", Address = "172.36.10.25",
Port = 34000, Port = 34000,
}, },
--连接AM服务器 --连接AM服务器
AMServer = { AMServer = {
Host = "127.0.0.1", Host = "172.36.10.25",
Port = 5660, Port = 5660,
}, },
--连接:后台服务器 --连接:后台服务器
MgrServer = { MgrServer = {
Host = "127.0.0.1", Host = "172.36.10.25",
Port = 8500, Port = 8500,
}, },
} }

View File

@@ -1,163 +1,102 @@
MonthCardConfig = { --AB-特权.xlsx 特权
[1] = { MonthCardConfig={
idx = 1, [1] = {
name = "免费特权", idx = 1,
dailyAward = {}, name = "免费特权",
buyAward = { { id = 474, type = 0, count = 1 } }, consume = {type=2,id=2,count=10000},
consume = { id = 2, type = 2, count = 10000 }, buyAward = {{type=0,id=474,count=1}},
}, dailyAward = {},
[2] = { },
idx = 2, [2] = {
name = "月卡", idx = 2,
dailyAward = { { id = 302, type = 0, count = 1 }, { id = 269, type = 0, count = 1 }, { id = 261, type = 0, count = 5 } }, name = "月卡",
buyAward = { { id = 249, type = 0, count = 1 }, { id = 302, type = 0, count = 8 } }, consume = {type=4,id=4,count=280},
consume = { id = 4, type = 4, count = 280 }, buyAward = {{type=0,id=249,count=1},{type=0,id=302,count=8}},
}, dailyAward = {{type=0,id=302,count=1},{type=0,id=269,count=1},{type=0,id=261,count=5}},
[3] = { },
idx = 3, [3] = {
name = "大药月卡", idx = 3,
dailyAward = { { id = 311, type = 0, count = 1 } }, name = "大药月卡",
buyAward = { { id = 3, type = 3, count = 66 }, { id = 11, type = 11, count = 5 } }, consume = {type=4,id=4,count=1000},
consume = { id = 4, type = 4, count = 1000 }, buyAward = {{type=3,id=3,count=66},{type=11,id=11,count=5}},
}, dailyAward = {{type=0,id=311,count=1}},
[4] = { },
idx = 4, [4] = {
name = "永久卡", idx = 4,
dailyAward = { { id = 7, type = 7, count = 10 }, { id = 2, type = 2, count = 200000 } }, name = "永久卡",
buyAward = { { id = 462, type = 0, count = 1 }, { id = 468, type = 0, count = 1 } }, consume = {type=4,id=4,count=1580},
consume = { id = 4, type = 4, count = 1580 }, buyAward = {{type=0,id=462,count=1},{type=0,id=468,count=1}},
}, dailyAward = {{type=7,id=7,count=10},{type=2,id=2,count=200000}},
[5] = { },
idx = 5, [5] = {
dailyAward = {}, idx = 5,
Ybprice = 2, name = "白卡",
superRightLV = 1, superRightLV = 1,
name = "白卡", consume = {type=0,id=1242,count=2},
ViewType = 2, buyAward = {{type=0,id=474,count=1},{type=0,id=261,count=50},{type=0,id=926,count=1},{type=3,id=3,count=18},{type=0,id=1058,count=1},{type=0,id=300,count=2}},
buyAward = { dailyAward = {},
{ id = 474, type = 0, count = 1 }, },
{ id = 261, type = 0, count = 50 }, [6] = {
{ id = 926, type = 0, count = 1 }, idx = 6,
{ id = 3, type = 3, count = 18 }, name = "绿卡",
{ id = 1058, type = 0, count = 1 }, superRightLV = 2,
{ id = 300, type = 0, count = 2 }, consume = {type=0,id=1242,count=10},
}, buyAward = {{type=0,id=475,count=1},{type=0,id=823,count=1},{type=0,id=261,count=100},{type=0,id=367,count=1},{type=0,id=249,count=2},{type=0,id=927,count=1}},
pictures = { "tq_p_1_1", "tq_p_1_2", "tq_p_1_3" }, dailyAward = {},
consume = { id = 1242, type = 0, count = 2 }, },
}, [7] = {
[6] = { idx = 7,
idx = 6, name = "蓝卡",
dailyAward = {}, superRightLV = 3,
Ybprice = 10, consume = {type=0,id=1242,count=20},
superRightLV = 2, buyAward = {{type=0,id=468,count=1},{type=0,id=507,count=1},{type=0,id=853,count=113},{type=0,id=854,count=113},{type=0,id=249,count=2},{type=0,id=928,count=1}},
name = "绿卡", dailyAward = {},
ViewType = 2, JiShouCount = 1,
buyAward = { },
{ id = 475, type = 0, count = 1 }, [8] = {
{ id = 823, type = 0, count = 1 }, idx = 8,
{ id = 261, type = 0, count = 100 }, name = "紫卡",
{ id = 367, type = 0, count = 1 }, superRightLV = 4,
{ id = 249, type = 0, count = 2 }, consume = {type=0,id=1242,count=70},
{ id = 927, type = 0, count = 1 }, buyAward = {{type=0,id=929,count=1},{type=0,id=976,count=1},{type=0,id=852,count=30},{type=0,id=250,count=2},{type=0,id=853,count=450},{type=0,id=854,count=450}},
}, dailyAward = {},
pictures = { "tq_p_2_2", "tq_p_2_1", "tq_p_2_3" }, JiShouCount = 2,
consume = { id = 1242, type = 0, count = 6 }, },
}, [9] = {
[7] = { idx = 9,
idx = 7, name = "橙卡",
dailyAward = {}, superRightLV = 5,
Ybprice = 20, consume = {type=0,id=1242,count=220},
superRightLV = 3, buyAward = {{type=0,id=930,count=1},{type=0,id=824,count=1},{type=0,id=953,count=14},{type=0,id=977,count=1},{type=0,id=300,count=50},{type=0,id=250,count=10},},
name = "蓝卡", dailyAward = {},
ViewType = 2, JiShouCount = 3,
buyAward = { },
{ id = 468, type = 0, count = 1 }, [10] = {
{ id = 507, type = 0, count = 1 }, idx = 10,
{ id = 853, type = 0, count = 113 }, name = "首充卡",
{ id = 854, type = 0, count = 113 }, superRightLV = -1,
{ id = 249, type = 0, count = 2 }, AtvPaoDianPlus = 20,
{ id = 928, type = 0, count = 1 }, },
}, [11] = {
pictures = { "tq_p_4_3", "tq_p_3_1", "tq_p_3_3" }, idx = 11,
consume = { id = 1242, type = 0, count = 16 }, name = "白卡",
}, },
[8] = { [12] = {
idx = 8, idx = 12,
dailyAward = {}, name = "橙星",
Ybprice = 70, superRightLV = 6,
superRightLV = 4, consume = {type=0,id=1242,count=250},
name = "紫卡", buyAward = {{type=0,id=1073,count=1},{type=0,id=1146,count=1},{type=0,id=1066,count=300},{type=0,id=1115,count=1},{type=0,id=970,count=666},{type=0,id=300,count=100},},
ViewType = 2, dailyAward = {},
buyAward = { JiShouCount = 3,
{ id = 929, type = 0, count = 1 }, },
{ id = 976, type = 0, count = 1 }, [13] = {
{ id = 852, type = 0, count = 30 }, idx = 13,
{ id = 250, type = 0, count = 2 }, name = "橙月",
{ id = 853, type = 0, count = 450 }, superRightLV = 7,
{ id = 854, type = 0, count = 450 }, consume = {type=0,id=1242,count=350},
}, buyAward = {{type=0,id=1273,count=1},{type=0,id=1272,count=1},{type=0,id=1241,count=1},{type=0,id=265,count=1888},{type=0,id=970,count=666},{type=0,id=852,count=158},},
pictures = { "tq_p_4_2", "tq_p_4_1", "tq_p_3_2" }, dailyAward = {},
consume = { id = 1242, type = 0, count = 40 }, JiShouCount = 3,
}, },
[9] = { }
idx = 9,
dailyAward = {},
Ybprice = 220,
superRightLV = 5,
name = "橙卡",
ViewType = 2,
heraldid = "tq_btnt14_2",
buyAward = {
{ id = 930, type = 0, count = 1 },
{ id = 824, type = 0, count = 1 },
{ id = 953, type = 0, count = 14 },
{ id = 977, type = 0, count = 1 },
{ id = 300, type = 0, count = 50 },
{ id = 250, type = 0, count = 10 },
},
pictures = { "tq_p_5_2", "tq_p_5_1", "tq_p_5_3" },
consume = { id = 1242, type = 0, count = 100 },
},
[10] = { idx = 10, name = "首充卡", superRightLV = -1 },
[11] = { idx = 11, name = "白卡" },
[12] = {
idx = 12,
dailyAward = {},
Ybprice = 250,
superRightLV = 6,
displaylimit = { openDay = 1, vip = 0, zsLevel = 11 },
name = "橙星",
ViewType = 2,
heraldid = "tq_btnt14_4",
buyAward = {
{ id = 1073, type = 0, count = 1 },
{ id = 1146, type = 0, count = 1 },
{ id = 1066, type = 0, count = 300 },
{ id = 1115, type = 0, count = 1 },
{ id = 970, type = 0, count = 666 },
{ id = 300, type = 0, count = 100 },
},
pictures = { "tq_p_6_2", "tq_p_6_1", "tq_p_6_3" },
consume = { id = 1242, type = 0, count = 250 },
},
[13] = {
idx = 13,
dailyAward = {},
Ybprice = 350,
superRightLV = 7,
displaylimit = { openDay = 1, vip = 0, zsLevel = 12 },
name = "橙月",
ViewType = 2,
heraldid = "tq_btnt14_3",
buyAward = {
{ id = 1273, type = 0, count = 1 },
{ id = 1272, type = 0, count = 1 },
{ id = 1241, type = 0, count = 1 },
{ id = 265, type = 0, count = 1888 },
{ id = 970, type = 0, count = 666 },
{ id = 852, type = 0, count = 158 },
},
pictures = { "tq_p_7_2", "tq_p_7_1", "tq_p_7_3" },
consume = { id = 1242, type = 0, count = 350 },
},
}

View File

@@ -6,7 +6,7 @@ ShopConfig = {
shopid = 1, shopid = 1,
shoptype = 1, shoptype = 1,
Tabshop = 1, Tabshop = 1,
shop = { id = 4, type = 4, count = 5 }, shop = { id = 4, type = 4, count = 100 },
buytype = {}, buytype = {},
daylimit = 0, daylimit = 0,
levellimit = 1, levellimit = 1,
@@ -110,7 +110,7 @@ ShopConfig = {
buytype = {}, buytype = {},
daylimit = 0, daylimit = 0,
levellimit = 1, levellimit = 1,
price = { id = 4, type = 4, count = 500 }, price = { id = 4, type = 4, count = 88 },
}, },
[94] = { [94] = {
reincarnationlimit = 0, reincarnationlimit = 0,
@@ -122,7 +122,7 @@ ShopConfig = {
buytype = { { limit = { { value = 0, times = 1 } }, type = 3 } }, buytype = { { limit = { { value = 0, times = 1 } }, type = 3 } },
daylimit = 0, daylimit = 0,
levellimit = 1, levellimit = 1,
price = { id = 3, type = 3, count = 88888 }, price = { id = 3, type = 3, count = 188 },
}, },
}, },
[2] = { [2] = {

6
buildConfig/AMServerLinux.txt Normal file → Executable file
View File

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

6
buildConfig/BackStageServerLinux.txt Normal file → Executable file
View File

@@ -14,11 +14,11 @@ BackServer =
--数据库连接相关 --数据库连接相关
SQL = SQL =
{ {
Host = "127.0.0.1", Host = "192.168.25.110",
Port = 3306, Port = 3307,
DBName = "mir_command", DBName = "mir_command",
DBUser = "root", DBUser = "root",
DBPass = "mysql_y8NXNT", DBPass = "mysql_Adkijc",
utf8=1, utf8=1,
}, },
} }

6
buildConfig/LoggerServerLinux.txt Normal file → Executable file
View File

@@ -19,11 +19,11 @@ LoggerServer =
--数据库连接相关 --数据库连接相关
SQL = SQL =
{ {
Host = "127.0.0.1", Host = "192.168.25.110",
Port = 3306, Port = 3307,
DBName = "mir_log_s1", DBName = "mir_log_s1",
DBUser = "root", DBUser = "root",
DBPass = "mysql_y8NXNT", DBPass = "mysql_Adkijc",
utf8=1, utf8=1,
}, },
} }

6
buildConfig/NameServerLinux.txt Normal file → Executable file
View File

@@ -15,10 +15,10 @@ NameServer =
SQL = SQL =
{ {
--Host = "192.168.0.173", --Host = "192.168.0.173",
Host = "127.0.0.1", Host = "192.168.25.110",
Port = 3306, Port = 3307,
DBName = "mir_name", DBName = "mir_name",
DBUser = "root", DBUser = "root",
DBPass = "mysql_y8NXNT" DBPass = "mysql_Adkijc"
} }
} }

6
buildConfig/SessionServerLinux.txt Normal file → Executable file
View File

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

View File

@@ -1,10 +1,19 @@
version: '3.8' version: '3.8'
services: services:
db: base:
image: chuanqi-server-base:latest image: chuanqi-server-base:latest
container_name: chuanqi-server-db networks:
network:
ipv4_address: 172.36.10.25
stdin_open: true stdin_open: true
# ports:
# - 10319:10319
# - 35010:35010
# - 31000:31000
# - 34000:34000
# - 5660:5660
# - 8500:8500
volumes: volumes:
- ./DBServer:/data/server/s1/DBServer - ./DBServer:/data/server/s1/DBServer
- ./wch:/etc/yum/wch - ./wch:/etc/yum/wch
@@ -14,37 +23,50 @@ services:
- ./buildConfig/NameServerLinux.txt:/data/server/build/NameServer/NameServerLinux.txt - ./buildConfig/NameServerLinux.txt:/data/server/build/NameServer/NameServerLinux.txt
- ./buildConfig/SessionServerLinux.txt:/data/server/build/SessionServer/SessionServerLinux.txt - ./buildConfig/SessionServerLinux.txt:/data/server/build/SessionServer/SessionServerLinux.txt
entrypoint: "/data/server/s1/DBServer/start.sh" entrypoint: "/data/server/s1/DBServer/start.sh"
network_mode: "host"
restart: unless-stopped restart: unless-stopped
environment: environment:
TZ: Asia/Shanghai TZ: Asia/Shanghai
logic: logic:
image: registry.cn-hangzhou.aliyuncs.com/kubbo/chuanqi-os:latest 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: depends_on:
- db # 等待db服务启动 - base
stdin_open: true stdin_open: true
volumes: volumes:
- ./LogicServer:/data/server/s1/LogicServer - ./LogicServer:/data/server/s1/LogicServer
- ./wch:/etc/yum/wch - ./wch:/etc/yum/wch
entrypoint: "/data/server/s1/LogicServer/start.sh" entrypoint: "/data/server/s1/LogicServer/start.sh"
network_mode: "host"
restart: unless-stopped restart: unless-stopped
environment: environment:
TZ: Asia/Shanghai TZ: Asia/Shanghai
gate: gate:
image: registry.cn-hangzhou.aliyuncs.com/kubbo/chuanqi-os:latest image: registry.cn-hangzhou.aliyuncs.com/kubbo/chuanqi-os:latest
container_name: chuanqi-server-gate networks:
- network
ports:
- 10317:10317
depends_on: depends_on:
- logic # 等待logic服务启动 - logic
stdin_open: true stdin_open: true
volumes: volumes:
- ./Gateway:/data/server/s1/Gateway - ./Gateway:/data/server/s1/Gateway
- ./wch:/etc/yum/wch - ./wch:/etc/yum/wch
entrypoint: "/data/server/s1/Gateway/start.sh" entrypoint: "/data/server/s1/Gateway/start.sh"
network_mode: "host"
restart: unless-stopped restart: unless-stopped
environment: environment:
TZ: Asia/Shanghai TZ: Asia/Shanghai
networks:
network:
driver: bridge
ipam:
config:
- subnet: 172.36.10.0/24