From 6dec8458489e7557611a4f82d780cab9a34411a4 Mon Sep 17 00:00:00 2001
From: zhengkunwang <31820853+zhengkunwang223@users.noreply.github.com>
Date: Wed, 21 Aug 2024 11:46:49 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E5=BA=94=E7=94=A8?=
 =?UTF-8?q?=E5=90=AF=E5=8A=A8=20(#6193)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 agent/app/dto/response/website.go                   | 1 +
 agent/app/service/app_install.go                    | 2 +-
 agent/app/service/website.go                        | 3 +++
 frontend/src/api/interface/website.ts               | 1 +
 frontend/src/views/website/website/delete/index.vue | 2 +-
 frontend/src/views/website/website/index.vue        | 1 +
 6 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/agent/app/dto/response/website.go b/agent/app/dto/response/website.go
index b05c9b0bf..e2cf2d87c 100644
--- a/agent/app/dto/response/website.go
+++ b/agent/app/dto/response/website.go
@@ -33,6 +33,7 @@ type WebsiteRes struct {
 	SSLStatus     string    `json:"sslStatus"`
 	AppInstallID  uint      `json:"appInstallId"`
 	ChildSites    []string  `json:"childSites"`
+	RuntimeType   string    `json:"runtimeType"`
 }
 
 type WebsiteOption struct {
diff --git a/agent/app/service/app_install.go b/agent/app/service/app_install.go
index 70ea0f32a..b334ab885 100644
--- a/agent/app/service/app_install.go
+++ b/agent/app/service/app_install.go
@@ -255,7 +255,7 @@ func (a *AppInstallService) Operate(req request.AppInstalledOperate) error {
 	case constant.Rebuild:
 		return rebuildApp(install)
 	case constant.Start:
-		out, err := compose.Start(dockerComposePath)
+		out, err := compose.Up(dockerComposePath)
 		if err != nil {
 			return handleErr(install, err, out)
 		}
diff --git a/agent/app/service/website.go b/agent/app/service/website.go
index 68e4dfeb8..c4488d9aa 100644
--- a/agent/app/service/website.go
+++ b/agent/app/service/website.go
@@ -159,6 +159,7 @@ func (w WebsiteService) PageWebsite(req request.WebsiteSearch) (int64, []respons
 		var (
 			appName      string
 			runtimeName  string
+			runtimeType  string
 			appInstallID uint
 		)
 		switch web.Type {
@@ -175,6 +176,7 @@ func (w WebsiteService) PageWebsite(req request.WebsiteSearch) (int64, []respons
 				return 0, nil, err
 			}
 			runtimeName = runtime.Name
+			runtimeType = runtime.Type
 			appInstallID = runtime.ID
 		}
 		sitePath := path.Join(constant.AppInstallDir, constant.AppOpenresty, nginxInstall.Name, "www", "sites", web.Alias)
@@ -195,6 +197,7 @@ func (w WebsiteService) PageWebsite(req request.WebsiteSearch) (int64, []respons
 			RuntimeName:   runtimeName,
 			SitePath:      sitePath,
 			AppInstallID:  appInstallID,
+			RuntimeType:   runtimeType,
 		}
 
 		sites, _ := websiteRepo.List(websiteRepo.WithParentID(web.ID))
diff --git a/frontend/src/api/interface/website.ts b/frontend/src/api/interface/website.ts
index 27426568d..f186d59c2 100644
--- a/frontend/src/api/interface/website.ts
+++ b/frontend/src/api/interface/website.ts
@@ -32,6 +32,7 @@ export namespace Website {
         sitePath: string;
         appName: string;
         runtimeName: string;
+        runtimeType: string;
     }
     export interface WebsiteRes extends CommonModel {
         protocol: string;
diff --git a/frontend/src/views/website/website/delete/index.vue b/frontend/src/views/website/website/delete/index.vue
index b646fccc1..0c9f56101 100644
--- a/frontend/src/views/website/website/delete/index.vue
+++ b/frontend/src/views/website/website/delete/index.vue
@@ -87,7 +87,7 @@ const handleClose = () => {
     em('close', false);
 };
 
-const acceptParams = async (website: Website.Website) => {
+const acceptParams = async (website: Website.WebsiteDTO) => {
     deleteReq.value = {
         id: 0,
         deleteApp: false,
diff --git a/frontend/src/views/website/website/index.vue b/frontend/src/views/website/website/index.vue
index 826b9701a..79ae00912 100644
--- a/frontend/src/views/website/website/index.vue
+++ b/frontend/src/views/website/website/index.vue
@@ -188,6 +188,7 @@
                             <el-tag v-if="row.protocol == 'HTTPS'" :type="row.sslStatus">
                                 {{ dateFormatSimple(row.sslExpireDate) }}
                             </el-tag>
+                            <span v-else></span>
                         </template>
                     </el-table-column>
                     <fu-table-operations