From 38ad13f53ebc7ccc54a74186efaab6773a7d4397 Mon Sep 17 00:00:00 2001 From: GoEdgeLab Date: Sat, 4 Nov 2023 08:28:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=97=A0=E6=B3=95=E5=B0=86OS?= =?UTF-8?q?S=E6=BA=90=E7=AB=99=E4=BF=AE=E6=94=B9=E4=B8=BAhttp/https?= =?UTF-8?q?=E6=BA=90=E7=AB=99=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/db/models/origin_dao.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/internal/db/models/origin_dao.go b/internal/db/models/origin_dao.go index 3fee404c..de82632b 100644 --- a/internal/db/models/origin_dao.go +++ b/internal/db/models/origin_dao.go @@ -227,6 +227,8 @@ func (this *OriginDAO) UpdateOrigin(tx *dbs.Tx, return err } op.Oss = ossConfigJSON + } else { + op.Oss = dbs.SQL("NULL") } op.Description = description @@ -400,6 +402,7 @@ func (this *OriginDAO) ComposeOriginConfig(tx *dbs.Tx, originId int64, dataMap * } // addr + var isOSS = false if IsNotNull(origin.Addr) { var addr = &serverconfigs.NetworkAddressConfig{} err = json.Unmarshal(origin.Addr, addr) @@ -407,10 +410,11 @@ func (this *OriginDAO) ComposeOriginConfig(tx *dbs.Tx, originId int64, dataMap * return nil, err } config.Addr = addr + isOSS = ossconfigs.IsOSSProtocol(string(addr.Protocol)) } // oss - if IsNotNull(origin.Oss) { + if isOSS && IsNotNull(origin.Oss) { var ossConfig = ossconfigs.NewOSSConfig() err = json.Unmarshal(origin.Oss, ossConfig) if err != nil {