feat: 应用创建增加端口的检测范围 (#1581)

backend/app/service/app.go

@@ -24,6 +24,7 @@ import (
 	"os"
 	"path"
 	"strconv"
+	"strings"
 )
 
 type AppService struct {
@@ -269,14 +270,23 @@ func (a AppService) Install(ctx context.Context, req request.AppInstallCreate) (
 		appDetail model.AppDetail
 		app       model.App
 	)
-	httpPort, err = checkPort("PANEL_APP_PORT_HTTP", req.Params)
-	if err != nil {
-		return
-	}
-	httpsPort, err = checkPort("PANEL_APP_PORT_HTTPS", req.Params)
-	if err != nil {
-		return
+	for key := range req.Params {
+		if !strings.Contains(key, "PORT") {
+			continue
+		}
+		var port int
+		if port, err = checkPort(key, req.Params); err == nil {
+			if key == "PANEL_APP_PORT_HTTP" {
+				httpPort = port
+			}
+			if key == "PANEL_APP_PORT_HTTPS" {
+				httpsPort = port
+			}
+		} else {
+			return
+		}
 	}
+
 	appDetail, err = appDetailRepo.GetFirst(commonRepo.WithByID(req.AppDetailId))
 	if err != nil {
 		return

backend/app/service/app_utils.go

@@ -8,7 +8,6 @@ import (
 	"github.com/1Panel-dev/1Panel/backend/app/api/v1/helper"
 	"github.com/1Panel-dev/1Panel/backend/app/dto/request"
 	"github.com/1Panel-dev/1Panel/backend/i18n"
-	"github.com/compose-spec/compose-go/types"
 	"github.com/subosito/gotenv"
 	"gopkg.in/yaml.v3"
 	"math"
@@ -521,27 +520,6 @@ func upAppPre(app model.App, appInstall *model.AppInstall) error {
 	return nil
 }
 
-func getServiceFromInstall(appInstall *model.AppInstall) (service *composeV2.ComposeService, err error) {
-	var (
-		project *types.Project
-		envStr  string
-	)
-	envStr, err = coverEnvJsonToStr(appInstall.Env)
-	if err != nil {
-		return
-	}
-	project, err = composeV2.GetComposeProject(appInstall.Name, appInstall.GetPath(), []byte(appInstall.DockerCompose), []byte(envStr), true)
-	if err != nil {
-		return
-	}
-	service, err = composeV2.NewComposeService()
-	if err != nil {
-		return
-	}
-	service.SetProject(project)
-	return
-}
-
 func checkContainerNameIsExist(containerName, appDir string) (bool, error) {
 	client, err := composeV2.NewDockerClient()
 	if err != nil {
@@ -574,18 +552,20 @@ func upApp(appInstall *model.AppInstall) {
 				out    string
 				errMsg string
 			)
-			out, err = compose.Pull(appInstall.GetComposePath())
-			if err != nil {
-				if out != "" {
-					if strings.Contains(out, "no such host") {
-						errMsg = i18n.GetMsgByKey("ErrNoSuchHost") + ":"
+			if appInstall.App.Type != "php" {
+				out, err = compose.Pull(appInstall.GetComposePath())
+				if err != nil {
+					if out != "" {
+						if strings.Contains(out, "no such host") {
+							errMsg = i18n.GetMsgByKey("ErrNoSuchHost") + ":"
+						}
+						if strings.Contains(out, "timeout") {
+							errMsg = i18n.GetMsgByKey("ErrImagePullTimeOut") + ":"
+						}
+						appInstall.Message = errMsg + out
 					}
-					if strings.Contains(out, "timeout") {
-						errMsg = i18n.GetMsgByKey("ErrImagePullTimeOut") + ":"
-					}
-					appInstall.Message = errMsg + out
+					return err
 				}
-				return err
 			}
 			out, err = compose.Up(appInstall.GetComposePath())
 			if err != nil {

frontend/src/lang/modules/en.ts

@@ -1201,6 +1201,7 @@ const message = {
         showIgnore: 'View ignore application',
         cancelIgnore: 'Cancel ignore',
         ignoreList: 'ignore list',
+        appHelper: 'Please view the installation instructions of some applications on the application details page',
     },
     website: {
         website: 'Website',

frontend/src/lang/modules/tw.ts

@@ -1142,6 +1142,7 @@ const message = {
         showIgnore: '查看忽略應用',
         cancelIgnore: '取消忽略',
         ignoreList: '忽略列表',
+        appHelper: '部分應用的安裝使用說明請在應用詳情頁查看',
     },
     website: {
         website: '網站',

frontend/src/lang/modules/zh.ts

@@ -1148,6 +1148,7 @@ const message = {
         showIgnore: '查看忽略应用',
         cancelIgnore: '取消忽略',
         ignoreList: '忽略列表',
+        appHelper: '部分应用的安装使用说明请在应用详情页查看',
     },
     website: {
         website: '网站',

frontend/src/views/app-store/apps/index.vue

@@ -44,6 +44,7 @@
             </el-badge>
         </template>
         <template #main>
+            <el-alert type="info" :title="$t('app.appHelper')" :closable="false" />
             <el-row :gutter="5">
                 <el-col
                     class="app-col-12"