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

实现TLS配置

Browse Source
This commit is contained in:
刘祥超
2020-10-01 16:51:28 +08:00
parent ba95c5618e
commit c76f941064
1 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
internal/db/models/origin_dao.go
View File

@@ -121,7 +121,7 @@ func (this *OriginDAO) ComposeOriginConfig(originId int64) (*serverconfigs.Origi
return nil, err return nil, err
} }
if origin == nil { if origin == nil {
return nil, errors.New("not found") return nil, nil
} }
config := &serverconfigs.OriginConfig{ config := &serverconfigs.OriginConfig{
@@ -139,7 +139,7 @@ func (this *OriginDAO) ComposeOriginConfig(originId int64) (*serverconfigs.Origi
RequestHost: origin.Host, RequestHost: origin.Host,
} }
if len(origin.Addr) > 0 && origin.Addr != "null" { if IsNotNull(origin.Addr) {
addr := &serverconfigs.NetworkAddressConfig{} addr := &serverconfigs.NetworkAddressConfig{}
err = json.Unmarshal([]byte(origin.Addr), addr) err = json.Unmarshal([]byte(origin.Addr), addr)
if err != nil { if err != nil {
@@ -148,7 +148,7 @@ func (this *OriginDAO) ComposeOriginConfig(originId int64) (*serverconfigs.Origi
config.Addr = addr config.Addr = addr
} }
if len(origin.ConnTimeout) > 0 && origin.ConnTimeout != "null" { if IsNotNull(origin.ConnTimeout) {
connTimeout := &shared.TimeDuration{} connTimeout := &shared.TimeDuration{}
err = json.Unmarshal([]byte(origin.ConnTimeout), &connTimeout) err = json.Unmarshal([]byte(origin.ConnTimeout), &connTimeout)
if err != nil { if err != nil {
@@ -157,7 +157,7 @@ func (this *OriginDAO) ComposeOriginConfig(originId int64) (*serverconfigs.Origi
config.ConnTimeout = connTimeout config.ConnTimeout = connTimeout
} }
if len(origin.ReadTimeout) > 0 && origin.ReadTimeout != "null" { if IsNotNull(origin.ReadTimeout) {
readTimeout := &shared.TimeDuration{} readTimeout := &shared.TimeDuration{}
err = json.Unmarshal([]byte(origin.ReadTimeout), &readTimeout) err = json.Unmarshal([]byte(origin.ReadTimeout), &readTimeout)
if err != nil { if err != nil {
@@ -166,7 +166,7 @@ func (this *OriginDAO) ComposeOriginConfig(originId int64) (*serverconfigs.Origi
config.ReadTimeout = readTimeout config.ReadTimeout = readTimeout
} }
if len(origin.IdleTimeout) > 0 && origin.IdleTimeout != "null" { if IsNotNull(origin.IdleTimeout) {
idleTimeout := &shared.TimeDuration{} idleTimeout := &shared.TimeDuration{}
err = json.Unmarshal([]byte(origin.IdleTimeout), &idleTimeout) err = json.Unmarshal([]byte(origin.IdleTimeout), &idleTimeout)
if err != nil { if err != nil {
@@ -214,7 +214,7 @@ func (this *OriginDAO) ComposeOriginConfig(originId int64) (*serverconfigs.Origi
} }
} }
if len(origin.HealthCheck) > 0 && origin.HealthCheck != "null" { if IsNotNull(origin.HealthCheck) {
healthCheck := &serverconfigs.HealthCheckConfig{} healthCheck := &serverconfigs.HealthCheckConfig{}
err = json.Unmarshal([]byte(origin.HealthCheck), healthCheck) err = json.Unmarshal([]byte(origin.HealthCheck), healthCheck)
if err != nil { if err != nil {
@@ -223,22 +223,24 @@ func (this *OriginDAO) ComposeOriginConfig(originId int64) (*serverconfigs.Origi
config.HealthCheck = healthCheck config.HealthCheck = healthCheck
} }
if len(origin.Cert) > 0 && origin.Cert != "null" { if IsNotNull(origin.Cert) {
cert := &sslconfigs.SSLCertConfig{} ref := &sslconfigs.SSLCertRef{}
err = json.Unmarshal([]byte(origin.Cert), cert) err = json.Unmarshal([]byte(origin.Cert), ref)
if err != nil { if err != nil {
return nil, err return nil, err
} }
config.Cert = cert config.CertRef = ref
if ref.CertId > 0 {
certConfig, err := SharedSSLCertDAO.ComposeCertConfig(ref.CertId)
if err != nil {
return nil, err
}
config.Cert = certConfig
}
} }
if len(origin.Ftp) > 0 && origin.Ftp != "null" { if IsNotNull(origin.Ftp) {
ftp := &serverconfigs.OriginFTPConfig{} // TODO
err = json.Unmarshal([]byte(origin.Ftp), ftp)
if err != nil {
return nil, err
}
config.FTP = ftp
} }
return config, nil return config, nil