fix: 解决应用一直安装中的 BUG (#522)

backend/app/service/app.go

@@ -316,7 +316,7 @@ func (a AppService) Install(ctx context.Context, req request.AppInstallCreate) (
 	if err := upAppPre(app, appInstall); err != nil {
 		return nil, err
 	}
-	go upApp(ctx, appInstall.GetComposePath(), appInstall)
+	go upApp(ctx, appInstall)
 	go updateToolApp(appInstall)
 	ports := []int{appInstall.HttpPort}
 	if appInstall.HttpsPort > 0 {

backend/app/service/app_utils.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"github.com/compose-spec/compose-go/types"
 	"github.com/subosito/gotenv"
 	"math"
 	"os"
@@ -381,15 +382,35 @@ func upAppPre(app model.App, appInstall model.AppInstall) error {
 	return nil
 }
 
-func upApp(ctx context.Context, composeFilePath string, appInstall model.AppInstall) {
+func upApp(ctx context.Context, appInstall model.AppInstall) {
-	out, err := compose.Up(composeFilePath)
+	upProject := func(appInstall model.AppInstall) (err error) {
-	if err != nil {
+		envStr, err := coverEnvJsonToStr(appInstall.Env)
-		if out != "" {
+		if err == nil {
-			appInstall.Message = out
+			var (
+				project        *types.Project
+				composeService *composeV2.ComposeService
+			)
+			project, err = composeV2.GetComposeProject(appInstall.Name, appInstall.GetPath(), []byte(appInstall.DockerCompose), []byte(envStr))
+			if err != nil {
+				return err
+			}
+			composeService, err = composeV2.NewComposeService()
+			if err != nil {
+				return
+			}
+			composeService.SetProject(project)
+			err = composeService.ComposeUp()
+			if err != nil {
+				return err
+			}
+			return
 		} else {
-			appInstall.Message = err.Error()
+			return
 		}
+	}
+	if err := upProject(appInstall); err != nil {
 		appInstall.Status = constant.Error
+		appInstall.Message = err.Error()
 	} else {
 		appInstall.Status = constant.Running
 	}