TRKJ/EdgeAPI
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeAPI.git synced 2025-12-15 07:06:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

优化服务配置更新机制

Browse Source
This commit is contained in:
刘祥超
2021-08-21 17:24:29 +08:00
parent ab7b2fee3a
commit 56000a8b8a
3 changed files with 22 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
internal/rpc/services/service_server.go
View File

@@ -554,11 +554,21 @@ func (this *ServerService) ListEnabledServersMatch(ctx context.Context, req *pb.
auditingResult.IsOk = true
}
// 配置
config, err := models.SharedServerDAO.ComposeServerConfig(tx, server)
if err != nil {
return nil, err
}
configJSON, err := json.Marshal(config)
if err != nil {
return nil, err
}
result = append(result, &pb.Server{
Id: int64(server.Id),
IsOn: server.IsOn == 1,
Type: server.Type,
Config: []byte(server.Config),
Config: configJSON,
Name: server.Name,
Description: server.Description,
HttpJSON: []byte(server.Http),
@@ -685,6 +695,16 @@ func (this *ServerService) FindEnabledServer(ctx context.Context, req *pb.FindEn
}
}
// 配置
config, err := models.SharedServerDAO.ComposeServerConfig(tx, server)
if err != nil {
return nil, err
}
configJSON, err := json.Marshal(config)
if err != nil {
return nil, err
}
return &pb.FindEnabledServerResponse{Server: &pb.Server{
Id: int64(server.Id),
IsOn: server.IsOn == 1,
@@ -692,7 +712,7 @@ func (this *ServerService) FindEnabledServer(ctx context.Context, req *pb.FindEn
Name: server.Name,
Description: server.Description,
DnsName: server.DnsName,
Config: []byte(server.Config),
Config: configJSON,
ServerNamesJSON: []byte(server.ServerNames),
HttpJSON: []byte(server.Http),
HttpsJSON: []byte(server.Https),