diff --git a/backend/app/service/app.go b/backend/app/service/app.go index 5241e13cf..f8915161a 100644 --- a/backend/app/service/app.go +++ b/backend/app/service/app.go @@ -305,10 +305,10 @@ func (a AppService) SyncInstalled(installId uint) error { } func (a AppService) SyncAppList() error { - //if err := getAppFromOss(); err != nil { - // global.LOG.Errorf("get app from oss error: %s", err.Error()) - // return err - //} + if err := getAppFromOss(); err != nil { + global.LOG.Errorf("get app from oss error: %s", err.Error()) + return err + } appDir := constant.AppResourceDir listFile := path.Join(appDir, "list.json") diff --git a/backend/app/service/app_utils.go b/backend/app/service/app_utils.go index 85c89fc0c..cc400af06 100644 --- a/backend/app/service/app_utils.go +++ b/backend/app/service/app_utils.go @@ -138,15 +138,6 @@ func createLink(ctx context.Context, app model.App, appInstall *model.AppInstall if err := mysqlRepo.Create(ctx, &database); err != nil { return err } - //var database model.AppDatabase - //database.Dbname = dbConfig.DbName - //database.Username = dbConfig.DbUser - //database.Password = dbConfig.Password - //database.AppInstallId = dbInstall.ID - //database.Key = dbInstall.App.Key - //if err := dataBaseRepo.Create(ctx, &database); err != nil { - // return err - //} var installResource model.AppInstallResource installResource.ResourceId = database.ID installResource.AppInstallId = appInstall.ID diff --git a/backend/app/service/website_utils.go b/backend/app/service/website_utils.go index 1b00e3bbc..5d5270052 100644 --- a/backend/app/service/website_utils.go +++ b/backend/app/service/website_utils.go @@ -352,14 +352,14 @@ func createPemFile(websiteSSL model.WebSiteSSL) error { func getParamArray(key string, param interface{}) []string { var res []string - switch param.(type) { + switch p := param.(type) { case string: if key == "index" { - res = strings.Split(param.(string), "\n") + res = strings.Split(p, "\n") return res } - res = strings.Split(param.(string), " ") + res = strings.Split(p, " ") return res } return res @@ -388,19 +388,15 @@ func handleParamMap(paramMap map[string]string, keys []string) []dto.NginxParam func getNginxParams(params interface{}, keys []string) []dto.NginxParam { var nginxParams []dto.NginxParam - switch params.(type) { + switch p := params.(type) { case map[string]interface{}: - return handleParamMap(toMapStr(params.(map[string]interface{})), keys) + return handleParamMap(toMapStr(p), keys) case []interface{}: - - if mArray, ok := params.([]interface{}); ok { - for _, mA := range mArray { - if m, ok := mA.(map[string]interface{}); ok { - nginxParams = append(nginxParams, handleParamMap(toMapStr(m), keys)...) - } + for _, mA := range p { + if m, ok := mA.(map[string]interface{}); ok { + nginxParams = append(nginxParams, handleParamMap(toMapStr(m), keys)...) } } - } return nginxParams } diff --git a/backend/utils/cmd/cmd.go b/backend/utils/cmd/cmd.go index f470387dd..e41b45a5a 100644 --- a/backend/utils/cmd/cmd.go +++ b/backend/utils/cmd/cmd.go @@ -12,7 +12,7 @@ func Exec(cmdStr string) (string, error) { cmd.Stderr = &stderr err := cmd.Run() if err != nil { - return string(stderr.Bytes()), err + return stderr.String(), err } - return string(stdout.Bytes()), nil + return stdout.String(), nil } diff --git a/backend/utils/files/file_op.go b/backend/utils/files/file_op.go index 38f923507..75f37bfdd 100644 --- a/backend/utils/files/file_op.go +++ b/backend/utils/files/file_op.go @@ -422,9 +422,9 @@ func (f FileOp) Backup(srcFile string) (string, error) { info, _ := f.Fs.Stat(backupPath) if info != nil { if info.IsDir() { - f.DeleteDir(backupPath) + _ = f.DeleteDir(backupPath) } else { - f.DeleteFile(backupPath) + _ = f.DeleteFile(backupPath) } } if err := f.Rename(srcFile, backupPath); err != nil { diff --git a/backend/utils/websocket/client.go b/backend/utils/websocket/client.go index 3d17df6d5..6623b0902 100644 --- a/backend/utils/websocket/client.go +++ b/backend/utils/websocket/client.go @@ -70,7 +70,7 @@ func ProcessData(c *Client, msg *WsMsg) { } process := &files.Process{} - json.Unmarshal(value, process) + _ = json.Unmarshal(value, process) res = append(res, *process) } reByte, _ := json.Marshal(res)