TRKJ/EdgeAPI
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeAPI.git synced 2025-11-15 09:10:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

节点组合配置时服务间可以共用证书数据

Browse Source
This commit is contained in:
刘祥超
2023-03-18 22:18:13 +08:00
parent 1ce11a5745
commit f543edac1a
26 changed files with 111 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
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, false, nil)
config, err := models.SharedHTTPLocationDAO.ComposeLocationConfig(tx, req.LocationId, false, nil, nil)
if err != nil {
return nil, err
}
@@ -121,7 +121,7 @@ func (this *HTTPLocationService) FindAndInitHTTPLocationReverseProxyConfig(ctx c
}
}
reverseProxyConfig, err := models.SharedReverseProxyDAO.ComposeReverseProxyConfig(tx, reverseProxyRef.ReverseProxyId, nil)
reverseProxyConfig, err := models.SharedReverseProxyDAO.ComposeReverseProxyConfig(tx, reverseProxyRef.ReverseProxyId, nil, 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, true, false, nil)
config, err := models.SharedHTTPWebDAO.ComposeWebConfig(tx, webId, true, false, nil, nil)
if err != nil {
return nil, rpcutils.Wrap("ComposeWebConfig()", err)
}