From 9f7c6b07e2c9338daca5afbe8d40169a20076d24 Mon Sep 17 00:00:00 2001
From: zhengkunwang223 <zhengkun@fit2cloud.com>
Date: Fri, 25 Nov 2022 15:37:24 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E7=BD=91=E7=AB=99=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/app/model/website.go                 |  1 +
 backend/app/repo/website.go                  |  2 +-
 frontend/src/api/interface/website.ts        |  1 +
 frontend/src/lang/modules/zh.ts              |  4 +++-
 frontend/src/views/website/website/index.vue | 11 ++++++++++-
 5 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/backend/app/model/website.go b/backend/app/model/website.go
index 3a026e72f..ea225990f 100644
--- a/backend/app/model/website.go
+++ b/backend/app/model/website.go
@@ -15,6 +15,7 @@ type WebSite struct {
 	WebSiteGroupID uint            `gorm:"type:integer" json:"webSiteGroupId"`
 	WebSiteSSLID   uint            `gorm:"type:integer" json:"webSiteSSLId"`
 	Domains        []WebSiteDomain `json:"domains"`
+	WebSiteSSL     WebSiteSSL      `json:"webSiteSSL"`
 }
 
 func (w WebSite) TableName() string {
diff --git a/backend/app/repo/website.go b/backend/app/repo/website.go
index 7d7420545..7c64700d5 100644
--- a/backend/app/repo/website.go
+++ b/backend/app/repo/website.go
@@ -21,7 +21,7 @@ func (w WebSiteRepo) Page(page, size int, opts ...DBOption) (int64, []model.WebS
 	db := getDb(opts...).Model(&model.WebSite{})
 	count := int64(0)
 	db = db.Count(&count)
-	err := db.Debug().Limit(size).Offset(size * (page - 1)).Find(&websites).Error
+	err := db.Debug().Limit(size).Offset(size * (page - 1)).Preload("WebSiteSSL").Find(&websites).Error
 	return count, websites, err
 }
 
diff --git a/frontend/src/api/interface/website.ts b/frontend/src/api/interface/website.ts
index fcd56894c..a3a961e34 100644
--- a/frontend/src/api/interface/website.ts
+++ b/frontend/src/api/interface/website.ts
@@ -12,6 +12,7 @@ export namespace WebSite {
         webSiteGroupId: number;
         otherDomains: string;
         appinstall?: NewAppInstall;
+        webSiteSSL: SSL;
     }
 
     export interface WebSiteDTO extends CommonModel {
diff --git a/frontend/src/lang/modules/zh.ts b/frontend/src/lang/modules/zh.ts
index cd60c76f1..6a0cb2ad3 100644
--- a/frontend/src/lang/modules/zh.ts
+++ b/frontend/src/lang/modules/zh.ts
@@ -738,7 +738,7 @@ export default {
         acmeAccount: 'Acme 账户',
         provider: '验证方式',
         dnsCommon: '手动解析',
-        expireDate: '到期时间',
+        expireDate: '过期时间',
         brand: '品牌',
         deploySSL: '部署',
         deploySSLHelper: '确定部署证书？',
@@ -760,6 +760,8 @@ export default {
         backup: '备份',
         log: '日志',
         nginxPer: '性能调整',
+        neverExpire: '永不过期',
+        protocol: '协议',
     },
     nginx: {
         serverNamesHashBucketSizeHelper: '服务器名字的hash表大小',
diff --git a/frontend/src/views/website/website/index.vue b/frontend/src/views/website/website/index.vue
index f5fcdfdf4..032e4a5fd 100644
--- a/frontend/src/views/website/website/index.vue
+++ b/frontend/src/views/website/website/index.vue
@@ -26,7 +26,15 @@
                         </el-table-column>
                         <el-table-column :label="$t('commons.table.status')" prop="status"></el-table-column>
                         <!-- <el-table-column :label="'备份'" prop="backup"></el-table-column> -->
-                        <el-table-column :label="'备注'" prop="remark"></el-table-column>
+                        <el-table-column :label="$t('website.remark')" prop="remark"></el-table-column>
+                        <el-table-column :label="$t('website.protocol')" prop="protocol"></el-table-column>
+                        <el-table-column :label="$t('website.expireDate')">
+                            <template #default="{ row }">
+                                <span v-if="row.protocol === 'HTTP'">{{ $t('website.neverExpire') }}</span>
+                                <!-- <span v-else>{{ row.webSiteSSL.id }}</span> -->
+                                <span v-else>{{ dateFromat(1, 1, row.webSiteSSL.expireDate) }}</span>
+                            </template>
+                        </el-table-column>
                         <!-- <el-table-column :label="'SSL证书'" prop="ssl"></el-table-column> -->
                         <fu-table-operations
                             :ellipsis="1"
@@ -60,6 +68,7 @@ import { SearchWebSites } from '@/api/modules/website';
 import { WebSite } from '@/api/interface/website';
 import AppStatus from '@/components/app-status/index.vue';
 import NginxConfig from './nginx/index.vue';
+import { dateFromat } from '@/utils/util';
 
 import i18n from '@/lang';
 import router from '@/routers';