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

修复无法将OSS源站修改为http/https源站的问题

Browse Source
This commit is contained in:
刘祥超
2023-11-04 08:28:08 +08:00
parent f6e725781c
commit 4ce347738f
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -227,6 +227,8 @@ func (this *OriginDAO) UpdateOrigin(tx *dbs.Tx,
return err return err
} }
op.Oss = ossConfigJSON op.Oss = ossConfigJSON
} else {
op.Oss = dbs.SQL("NULL")
} }
op.Description = description op.Description = description
@@ -400,6 +402,7 @@ func (this *OriginDAO) ComposeOriginConfig(tx *dbs.Tx, originId int64, dataMap *
} }
// addr // addr
var isOSS = false
if IsNotNull(origin.Addr) { if IsNotNull(origin.Addr) {
var addr = &serverconfigs.NetworkAddressConfig{} var addr = &serverconfigs.NetworkAddressConfig{}
err = json.Unmarshal(origin.Addr, addr) err = json.Unmarshal(origin.Addr, addr)
@@ -407,10 +410,11 @@ func (this *OriginDAO) ComposeOriginConfig(tx *dbs.Tx, originId int64, dataMap *
return nil, err return nil, err
} }
config.Addr = addr config.Addr = addr
isOSS = ossconfigs.IsOSSProtocol(string(addr.Protocol))
} }
// oss // oss
if IsNotNull(origin.Oss) { if isOSS && IsNotNull(origin.Oss) {
var ossConfig = ossconfigs.NewOSSConfig() var ossConfig = ossconfigs.NewOSSConfig()
err = json.Unmarshal(origin.Oss, ossConfig) err = json.Unmarshal(origin.Oss, ossConfig)
if err != nil { if err != nil {