diff --git a/server/client/config/config.go b/server/client/config/config.go index d6233d3..e04951c 100644 --- a/server/client/config/config.go +++ b/server/client/config/config.go @@ -13,7 +13,8 @@ const ( ) var Command *config.Command -var Cfg *config.Common[ClientConfig] +var Cfg *config.Common +var ClientCfg = &ClientConfig{} type ClientConfig struct { Address []string `json:"address"` // 网关地址 @@ -32,11 +33,12 @@ func LoadConfig(GitCommit, GitBranch, BuildDate string) { return } defer func() { _ = rdb.Close() }() - Cfg, err = config.LoadCommonConfig[ClientConfig](rdb, GitCommit, GitBranch, BuildDate) + Cfg, err = config.LoadCommonConfig(rdb, GitCommit, GitBranch, BuildDate) if err != nil { log.Error(err.Error()) return } - Cfg.Special.Address = append(Cfg.Special.Address, gateAddress1, gateAddress2) + + ClientCfg.Address = append(ClientCfg.Address, gateAddress1, gateAddress2) log.DebugF("load common config success") } diff --git a/server/client/server/service.go b/server/client/server/service.go index 3fdff09..96eb18c 100644 --- a/server/client/server/service.go +++ b/server/client/server/service.go @@ -46,8 +46,8 @@ func newClientService(serviceId int) *ClientService { s.username = fmt.Sprintf("test%04d", serviceId) s.password = "123456" - size := len(config.Cfg.Special.Address) - addr := config.Cfg.Special.Address[serviceId%size] + size := len(config.ClientCfg.Address) + addr := config.ClientCfg.Address[serviceId%size] wsAddr := fmt.Sprintf("ws://%v", addr) if s.client, err = ws.NewClient(wsAddr, s); err != nil { log.FatalF("connect url:%v err:%v", wsAddr, err.Error())