mirror of
https://github.com/TeaOSLab/EdgeAPI.git
synced 2025-12-20 02:36:36 +08:00
优化服务列表返回速度
This commit is contained in:
@@ -840,21 +840,38 @@ func (this *ServerService) ListEnabledServersMatch(ctx context.Context, req *pb.
|
||||
}
|
||||
|
||||
// 配置
|
||||
config, err := models.SharedServerDAO.ComposeServerConfig(tx, server, nil, false)
|
||||
config, err := models.SharedServerDAO.ComposeServerConfig(tx, server, nil, false, true)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
var countServerNames int32 = 0
|
||||
for _, serverName := range config.ServerNames {
|
||||
if len(serverName.SubNames) > 0 {
|
||||
countServerNames += int32(len(serverName.SubNames))
|
||||
} else {
|
||||
countServerNames++
|
||||
}
|
||||
}
|
||||
if req.IgnoreServerNames && len(config.ServerNames) > 0 {
|
||||
config.ServerNames = config.ServerNames[:1]
|
||||
}
|
||||
configJSON, err := json.Marshal(config)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
// 忽略信息
|
||||
if req.IgnoreServerNames {
|
||||
server.ServerNames = nil
|
||||
}
|
||||
|
||||
result = append(result, &pb.Server{
|
||||
Id: int64(server.Id),
|
||||
IsOn: server.IsOn,
|
||||
Type: server.Type,
|
||||
Config: configJSON,
|
||||
Name: server.Name,
|
||||
CountServerNames: countServerNames,
|
||||
Description: server.Description,
|
||||
HttpJSON: server.Http,
|
||||
HttpsJSON: server.Https,
|
||||
@@ -986,7 +1003,7 @@ func (this *ServerService) FindEnabledServer(ctx context.Context, req *pb.FindEn
|
||||
}
|
||||
|
||||
// 配置
|
||||
config, err := models.SharedServerDAO.ComposeServerConfig(tx, server, nil, userId > 0)
|
||||
config, err := models.SharedServerDAO.ComposeServerConfig(tx, server, nil, userId > 0, false)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user