diff --git a/backend/app/dto/response/website.go b/backend/app/dto/response/website.go
index 1f9f80d9d..4e842dad7 100644
--- a/backend/app/dto/response/website.go
+++ b/backend/app/dto/response/website.go
@@ -10,6 +10,7 @@ type WebsiteDTO struct {
AccessLogPath string `json:"accessLogPath"`
SitePath string `json:"sitePath"`
AppName string `json:"appName"`
+ RuntimeName string `json:"runtimeName"`
}
type WebsitePreInstallCheck struct {
diff --git a/backend/app/service/website.go b/backend/app/service/website.go
index 1159a5afc..78bc70089 100644
--- a/backend/app/service/website.go
+++ b/backend/app/service/website.go
@@ -78,17 +78,28 @@ func (w WebsiteService) PageWebsite(req request.WebsiteSearch) (int64, []respons
return 0, nil, err
}
for _, web := range websites {
- var appName string
- if web.Type == constant.Deployment {
+ var (
+ appName string
+ runtimeName string
+ )
+ switch web.Type {
+ case constant.Deployment:
appInstall, err := appInstallRepo.GetFirst(commonRepo.WithByID(web.AppInstallID))
if err != nil {
return 0, nil, err
}
appName = appInstall.Name
+ case constant.Runtime:
+ runtime, err := runtimeRepo.GetFirst(commonRepo.WithByID(web.RuntimeID))
+ if err != nil {
+ return 0, nil, err
+ }
+ runtimeName = runtime.Name
}
websiteDTOs = append(websiteDTOs, response.WebsiteDTO{
- Website: web,
- AppName: appName,
+ Website: web,
+ AppName: appName,
+ RuntimeName: runtimeName,
})
}
return total, websiteDTOs, nil
diff --git a/frontend/src/api/interface/website.ts b/frontend/src/api/interface/website.ts
index be734914c..6123cd8a8 100644
--- a/frontend/src/api/interface/website.ts
+++ b/frontend/src/api/interface/website.ts
@@ -24,6 +24,7 @@ export namespace Website {
accessLogPath: string;
sitePath: string;
appName: string;
+ runtimeName: string;
}
export interface NewAppInstall {
diff --git a/frontend/src/views/website/website/index.vue b/frontend/src/views/website/website/index.vue
index 103f3edd4..7257a7ff0 100644
--- a/frontend/src/views/website/website/index.vue
+++ b/frontend/src/views/website/website/index.vue
@@ -76,6 +76,7 @@
{{ $t('website.' + row.type) }}
[{{ row.appName }}]
+ [{{ row.runtimeName }}]
@@ -203,11 +204,11 @@ const maskShow = ref(true);
const createRef = ref();
const deleteRef = ref();
const groupRef = ref();
-let openNginxConfig = ref(false);
-let nginxIsExist = ref(false);
-let containerName = ref('');
-let nginxStatus = ref('');
-let installPath = ref('');
+const openNginxConfig = ref(false);
+const nginxIsExist = ref(false);
+const containerName = ref('');
+const nginxStatus = ref('');
+const installPath = ref('');
const uploadRef = ref();
const dialogBackupRef = ref();
const defaultRef = ref();