mirrors2/hk4e
1
0
Fork 0
mirror of https://github.com/FlourishingWorld/hk4e.git synced 2026-02-04 14:12:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

更新文档

Browse Source
This commit is contained in:
flswld
2023-01-31 00:10:18 +08:00
parent 5a175722d7
commit bd8a68b8d6
12 changed files with 56 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
node/api/api.proto
View File

@@ -35,24 +35,24 @@ message GetServerAppIdRsp {
}
message RegisterServerReq {
string server_type = 1;
GateServerAddr gate_server_addr = 2;
string version = 3;
string server_type = 1;
GateServerAddr gate_server_addr = 2;
repeated string version = 3;
}
message RegisterServerRsp {
string app_id = 1;
uint32 gs_id = 2;
uint32 gs_id = 2;
}
message CancelServerReq {
string server_type = 1;
string app_id = 2;
string app_id = 2;
}
message KeepaliveServerReq {
string server_type = 1;
string app_id = 2;
string app_id = 2;
}
message GetGateServerAddrReq {
@@ -70,12 +70,12 @@ message RegionEc2b {
message GateServerAddr {
string kcp_addr = 1;
uint32 kcp_port = 2;
string mq_addr = 3;
uint32 mq_port = 4;
string mq_addr = 3;
uint32 mq_port = 4;
}
message GateServerInfo {
string app_id = 1;
string app_id = 1;
string mq_addr = 2;
uint32 mq_port = 3;
}

10
node/service/discovery.go
View File

@@ -43,7 +43,7 @@ type ServerInstance struct {
gateServerKcpPort uint32
gateServerMqAddr string
gateServerMqPort uint32
version string
version []string
lastAliveTime int64
gsId uint32
}
@@ -186,10 +186,12 @@ func (s *DiscoveryService) GetGateServerAddr(ctx context.Context, req *api.GetGa
versionInstMap := sync.Map{}
instMap.Range(func(key, value any) bool {
serverInstance := value.(*ServerInstance)
if serverInstance.version != req.Version {
return true
for _, version := range serverInstance.version {
if version == req.Version {
versionInstMap.Store(key, serverInstance)
return true
}
}
versionInstMap.Store(key, serverInstance)
return true
})
if s.getServerInstanceMapLen(&versionInstMap) == 0 {