liuxiaobo/game
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复bug

Browse Source
This commit is contained in:
liuxiaobo 2025-06-15 20:28:28 +08:00
parent 6feadbfeef
commit 8941e94eec
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/client/config/config.go
View File

@ -13,7 +13,8 @@ const (
) )
var Command *config.Command var Command *config.Command
var Cfg *config.Common[ClientConfig] var Cfg *config.Common
var ClientCfg = &ClientConfig{}
type ClientConfig struct { type ClientConfig struct {
Address []string `json:"address"` // 网关地址 Address []string `json:"address"` // 网关地址
@ -32,11 +33,12 @@ func LoadConfig(GitCommit, GitBranch, BuildDate string) {
return return
} }
defer func() { _ = rdb.Close() }() defer func() { _ = rdb.Close() }()
Cfg, err = config.LoadCommonConfig[ClientConfig](rdb, GitCommit, GitBranch, BuildDate) Cfg, err = config.LoadCommonConfig(rdb, GitCommit, GitBranch, BuildDate)
if err != nil { if err != nil {
log.Error(err.Error()) log.Error(err.Error())
return return
} }
Cfg.Special.Address = append(Cfg.Special.Address, gateAddress1, gateAddress2)
ClientCfg.Address = append(ClientCfg.Address, gateAddress1, gateAddress2)
log.DebugF("load common config success") log.DebugF("load common config success")
} }

4
server/client/server/service.go
View File

@ -46,8 +46,8 @@ func newClientService(serviceId int) *ClientService {
s.username = fmt.Sprintf("test%04d", serviceId) s.username = fmt.Sprintf("test%04d", serviceId)
s.password = "123456" s.password = "123456"
size := len(config.Cfg.Special.Address) size := len(config.ClientCfg.Address)
addr := config.Cfg.Special.Address[serviceId%size] addr := config.ClientCfg.Address[serviceId%size]
wsAddr := fmt.Sprintf("ws://%v", addr) wsAddr := fmt.Sprintf("ws://%v", addr)
if s.client, err = ws.NewClient(wsAddr, s); err != nil { if s.client, err = ws.NewClient(wsAddr, s); err != nil {
log.FatalF("connect url:%v err:%v", wsAddr, err.Error()) log.FatalF("connect url:%v err:%v", wsAddr, err.Error())