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

优化服务配置组合

Browse Source
This commit is contained in:
刘祥超
2023-03-18 19:52:42 +08:00
parent ab56c7451a
commit 1ce11a5745
8 changed files with 240 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -60,7 +60,7 @@ func (this *HTTPLocationService) FindEnabledHTTPLocationConfig(ctx context.Conte
var tx = this.NullTx()
config, err := models.SharedHTTPLocationDAO.ComposeLocationConfig(tx, req.LocationId, nil)
config, err := models.SharedHTTPLocationDAO.ComposeLocationConfig(tx, req.LocationId, false, nil)
if err != nil {
return nil, err
}
@@ -167,7 +167,7 @@ func (this *HTTPLocationService) FindAndInitHTTPLocationWebConfig(ctx context.Co
}
}
config, err := models.SharedHTTPWebDAO.ComposeWebConfig(tx, webId, nil)
config, err := models.SharedHTTPWebDAO.ComposeWebConfig(tx, webId, true, false, nil)
if err != nil {
return nil, rpcutils.Wrap("ComposeWebConfig()", err)
}

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

@@ -83,7 +83,7 @@ func (this *HTTPWebService) FindEnabledHTTPWebConfig(ctx context.Context, req *p
var tx = this.NullTx()
config, err := models.SharedHTTPWebDAO.ComposeWebConfig(tx, req.HttpWebId, nil)
config, err := models.SharedHTTPWebDAO.ComposeWebConfig(tx, req.HttpWebId, false, false, nil)
if err != nil {
return nil, err
}

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

@@ -1191,7 +1191,7 @@ func (this *ServerService) FindAndInitServerWebConfig(ctx context.Context, req *
}
}
config, err := models.SharedHTTPWebDAO.ComposeWebConfig(tx, webId, nil)
config, err := models.SharedHTTPWebDAO.ComposeWebConfig(tx, webId, false, false, nil)
if err != nil {
return nil, err
}

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

@@ -463,7 +463,7 @@ func (this *ServerGroupService) FindEnabledServerGroupConfigInfo(ctx context.Con
result.HasUDPReverseProxy = ref.IsPrior
}
config, err := models.SharedServerGroupDAO.ComposeGroupConfig(tx, int64(group.Id), false, nil)
config, err := models.SharedServerGroupDAO.ComposeGroupConfig(tx, int64(group.Id), false, false, nil)
if err != nil {
return nil, err
}
@@ -510,7 +510,7 @@ func (this *ServerGroupService) FindAndInitServerGroupWebConfig(ctx context.Cont
}
}
webConfig, err := models.SharedHTTPWebDAO.ComposeWebConfig(tx, webId, nil)
webConfig, err := models.SharedHTTPWebDAO.ComposeWebConfig(tx, webId, true, false, nil)
if err != nil {
return nil, err
}