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 @@ {{ dateFormatSimple(row.sslExpireDate) }} +