From 9bfc159e9e681a9fedc2eeab9a84b757c5619d8b Mon Sep 17 00:00:00 2001 From: zhengkunwang <31820853+zhengkunwang223@users.noreply.github.com> Date: Tue, 12 Dec 2023 15:14:08 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E7=BD=91=E7=AB=99?= =?UTF-8?q?=E6=89=8B=E5=8A=A8=E5=AF=BC=E5=85=A5=E8=AF=81=E4=B9=A6=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98=20(#3284)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/app/service/website.go | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/backend/app/service/website.go b/backend/app/service/website.go index 6e9604385..80f2f33e1 100644 --- a/backend/app/service/website.go +++ b/backend/app/service/website.go @@ -646,7 +646,7 @@ func (w WebsiteService) OpWebsiteHTTPS(ctx context.Context, req request.WebsiteH } var ( res response.WebsiteHTTPS - websiteSSL *model.WebsiteSSL + websiteSSL model.WebsiteSSL ) res.Enable = req.Enable res.SSLProtocol = req.SSLProtocol @@ -691,12 +691,13 @@ func (w WebsiteService) OpWebsiteHTTPS(ctx context.Context, req request.WebsiteH } if req.Type == constant.SSLExisted { - websiteSSL, err = websiteSSLRepo.GetFirst(commonRepo.WithByID(req.WebsiteSSLID)) + websiteModel, err := websiteSSLRepo.GetFirst(commonRepo.WithByID(req.WebsiteSSLID)) if err != nil { return nil, err } - website.WebsiteSSLID = websiteSSL.ID - res.SSL = *websiteSSL + website.WebsiteSSLID = websiteModel.ID + res.SSL = *websiteModel + websiteSSL = *websiteModel } if req.Type == constant.SSLManual { var ( @@ -756,16 +757,16 @@ func (w WebsiteService) OpWebsiteHTTPS(ctx context.Context, req request.WebsiteH websiteSSL.PrivateKey = privateKey websiteSSL.Pem = certificate - res.SSL = *websiteSSL + res.SSL = websiteSSL } website.Protocol = constant.ProtocolHTTPS - if err := applySSL(website, *websiteSSL, req); err != nil { + if err := applySSL(website, websiteSSL, req); err != nil { return nil, err } website.HttpConfig = req.HttpConfig if websiteSSL.ID == 0 { - if err := websiteSSLRepo.Create(ctx, websiteSSL); err != nil { + if err := websiteSSLRepo.Create(ctx, &websiteSSL); err != nil { return nil, err } website.WebsiteSSLID = websiteSSL.ID