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

优化证书数量很多时的页面加载速度

Browse Source
This commit is contained in:
刘祥超
2022-12-31 17:12:39 +08:00
parent 8d3043d0fe
commit e356707db7
10 changed files with 37 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -846,7 +846,7 @@ func (this *ServerService) ListEnabledServersMatch(ctx context.Context, req *pb.
}
// 配置
config, err := models.SharedServerDAO.ComposeServerConfig(tx, server, nil, false, true)
config, err := models.SharedServerDAO.ComposeServerConfig(tx, server, false, nil, false, true)
if err != nil {
return nil, err
}
@@ -969,9 +969,9 @@ func (this *ServerService) FindEnabledServer(ctx context.Context, req *pb.FindEn
}
// 分组信息
pbGroups := []*pb.ServerGroup{}
var pbGroups = []*pb.ServerGroup{}
if len(server.GroupIds) > 0 {
groupIds := []int64{}
var groupIds = []int64{}
err = json.Unmarshal(server.GroupIds, &groupIds)
if err != nil {
return nil, err
@@ -1009,7 +1009,7 @@ func (this *ServerService) FindEnabledServer(ctx context.Context, req *pb.FindEn
}
// 配置
config, err := models.SharedServerDAO.ComposeServerConfig(tx, server, nil, userId > 0, false)
config, err := models.SharedServerDAO.ComposeServerConfig(tx, server, req.IgnoreSSLCertData, nil, userId > 0, false)
if err != nil {
return nil, err
}
@@ -1069,7 +1069,7 @@ func (this *ServerService) FindEnabledServerConfig(ctx context.Context, req *pb.
}
}
config, err := models.SharedServerDAO.ComposeServerConfigWithServerId(tx, req.ServerId, false)
config, err := models.SharedServerDAO.ComposeServerConfigWithServerId(tx, req.ServerId, false, false)
if err != nil {
return nil, err
}
@@ -1520,7 +1520,7 @@ func (this *ServerService) ComposeAllUserServersConfig(ctx context.Context, req
var configs = []*serverconfigs.ServerConfig{}
var cacheMap = utils.NewCacheMap()
for _, server := range servers {
config, err := models.SharedServerDAO.ComposeServerConfig(tx, server, cacheMap, true, false)
config, err := models.SharedServerDAO.ComposeServerConfig(tx, server, false, cacheMap, true, false)
if err != nil {
return nil, err
}
@@ -2227,7 +2227,7 @@ func (this *ServerService) ComposeServerConfig(ctx context.Context, req *pb.Comp
return &pb.ComposeServerConfigResponse{ServerConfigJSON: nil}, nil
}
serverConfig, err := models.SharedServerDAO.ComposeServerConfigWithServerId(tx, req.ServerId, true)
serverConfig, err := models.SharedServerDAO.ComposeServerConfigWithServerId(tx, req.ServerId, false, true)
if err != nil {
if err == models.ErrNotFound {
return &pb.ComposeServerConfigResponse{ServerConfigJSON: nil}, nil

4
internal/rpc/services/service_ssl_cert.go
View File

@@ -92,7 +92,7 @@ func (this *SSLCertService) FindEnabledSSLCertConfig(ctx context.Context, req *p
}
}
config, err := models.SharedSSLCertDAO.ComposeCertConfig(tx, req.SslCertId, nil)
config, err := models.SharedSSLCertDAO.ComposeCertConfig(tx, req.SslCertId, false, nil)
if err != nil {
return nil, err
}
@@ -179,7 +179,7 @@ func (this *SSLCertService) ListSSLCerts(ctx context.Context, req *pb.ListSSLCer
certConfigs := []*sslconfigs.SSLCertConfig{}
for _, certId := range certIds {
certConfig, err := models.SharedSSLCertDAO.ComposeCertConfig(tx, certId, nil)
certConfig, err := models.SharedSSLCertDAO.ComposeCertConfig(tx, certId, false, nil)
if err != nil {
return nil, err
}

2
internal/rpc/services/service_ssl_policy.go
View File

@@ -88,7 +88,7 @@ func (this *SSLPolicyService) FindEnabledSSLPolicyConfig(ctx context.Context, re
var tx = this.NullTx()
config, err := models.SharedSSLPolicyDAO.ComposePolicyConfig(tx, req.SslPolicyId, nil)
config, err := models.SharedSSLPolicyDAO.ComposePolicyConfig(tx, req.SslPolicyId, req.IgnoreData, nil)
if err != nil {
return nil, err
}