From b93ea93cfe522ae23e98131e7d071a7370718bdf Mon Sep 17 00:00:00 2001 From: zhengkunwang <31820853+zhengkunwang223@users.noreply.github.com> Date: Wed, 13 Dec 2023 13:54:46 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=88=A0=E9=99=A4=E9=83=A8=E5=88=86?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=20(#3301)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/app/service/website.go | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/backend/app/service/website.go b/backend/app/service/website.go index 80f2f33e1..5c3161a62 100644 --- a/backend/app/service/website.go +++ b/backend/app/service/website.go @@ -9,7 +9,6 @@ import ( "encoding/pem" "errors" "fmt" - "github.com/1Panel-dev/1Panel/backend/utils/common" "os" "path" "reflect" @@ -1249,7 +1248,6 @@ func (w WebsiteService) ChangePHPVersion(req request.WebsitePHPVersionReq) error phpDir = path.Join(constant.RuntimeDir, runtime.Type, runtime.Name, "php") oldFmContent, _ = fileOp.GetContent(fpmConfDir) newComposeByte []byte - supervisorDir = path.Join(appInstall.GetPath(), "supervisor") ) envParams := make(map[string]string, len(envs)) handleMap(envs, envParams) @@ -1291,21 +1289,6 @@ func (w WebsiteService) ChangePHPVersion(req request.WebsitePHPVersionReq) error return busErr } } - if common.CompareVersion(appDetail.Version, "7.0") && !fileOp.Stat(supervisorDir) { - if appDetail.Update { - app, err := appRepo.GetFirst(commonRepo.WithByID(appDetail.AppId)) - if err != nil { - busErr = err - return busErr - } - if busErr = downloadApp(app, appDetail, nil); err != nil { - return busErr - } - } - if busErr = fileOp.CopyDir(path.Join(phpDir, "supervisor"), appInstall.GetPath()); err != nil { - return busErr - } - } if out, err := compose.Up(appInstall.GetComposePath()); err != nil { if out != "" {