mirror of
https://github.com/1Panel-dev/1Panel.git
synced 2025-03-01 11:34:13 +08:00
feat: 删除部分代码 (#3301)
This commit is contained in:
parent
91a895ea0c
commit
b93ea93cfe
@ -9,7 +9,6 @@ import (
|
|||||||
"encoding/pem"
|
"encoding/pem"
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
"github.com/1Panel-dev/1Panel/backend/utils/common"
|
|
||||||
"os"
|
"os"
|
||||||
"path"
|
"path"
|
||||||
"reflect"
|
"reflect"
|
||||||
@ -1249,7 +1248,6 @@ func (w WebsiteService) ChangePHPVersion(req request.WebsitePHPVersionReq) error
|
|||||||
phpDir = path.Join(constant.RuntimeDir, runtime.Type, runtime.Name, "php")
|
phpDir = path.Join(constant.RuntimeDir, runtime.Type, runtime.Name, "php")
|
||||||
oldFmContent, _ = fileOp.GetContent(fpmConfDir)
|
oldFmContent, _ = fileOp.GetContent(fpmConfDir)
|
||||||
newComposeByte []byte
|
newComposeByte []byte
|
||||||
supervisorDir = path.Join(appInstall.GetPath(), "supervisor")
|
|
||||||
)
|
)
|
||||||
envParams := make(map[string]string, len(envs))
|
envParams := make(map[string]string, len(envs))
|
||||||
handleMap(envs, envParams)
|
handleMap(envs, envParams)
|
||||||
@ -1291,21 +1289,6 @@ func (w WebsiteService) ChangePHPVersion(req request.WebsitePHPVersionReq) error
|
|||||||
return busErr
|
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, err := compose.Up(appInstall.GetComposePath()); err != nil {
|
||||||
if out != "" {
|
if out != "" {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user