gh_mirrors/1Panel
1
0
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2025-02-07 17:10:07 +08:00
Code

fix: 解决安装应用同步之后变为失败的 BUG (#525)

Browse Source
This commit is contained in:
zhengkunwang223 2023-04-07 09:16:09 +08:00 committed by GitHub
parent e452dfdb1f
commit a0e4c266a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
backend/app/service/app.go
View File

@ -249,17 +249,12 @@ func (a AppService) Install(ctx context.Context, req request.AppInstallCreate) (
return nil, err return nil, err
} }
paramByte, err := json.Marshal(req.Params)
if err != nil {
return nil, err
}
appInstall := model.AppInstall{ appInstall := model.AppInstall{
Name: req.Name, Name: req.Name,
AppId: appDetail.AppId, AppId: appDetail.AppId,
AppDetailId: appDetail.ID, AppDetailId: appDetail.ID,
Version: appDetail.Version, Version: appDetail.Version,
Status: constant.Installing, Status: constant.Installing,
Env: string(paramByte),
HttpPort: httpPort, HttpPort: httpPort,
HttpsPort: httpsPort, HttpsPort: httpsPort,
App: app, App: app,
@ -301,11 +296,15 @@ func (a AppService) Install(ctx context.Context, req request.AppInstallCreate) (
if err := copyAppData(app.Key, appDetail.Version, req.Name, req.Params); err != nil { if err := copyAppData(app.Key, appDetail.Version, req.Name, req.Params); err != nil {
return nil, err return nil, err
} }
fileOp := files.NewFileOp() fileOp := files.NewFileOp()
if err := fileOp.WriteFile(appInstall.GetComposePath(), strings.NewReader(string(composeByte)), 0775); err != nil { if err := fileOp.WriteFile(appInstall.GetComposePath(), strings.NewReader(string(composeByte)), 0775); err != nil {
return nil, err return nil, err
} }
paramByte, err := json.Marshal(req.Params)
if err != nil {
return nil, err
}
appInstall.Env = string(paramByte)
if err := appInstallRepo.Create(ctx, &appInstall); err != nil { if err := appInstallRepo.Create(ctx, &appInstall); err != nil {
return nil, err return nil, err