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 @@
-
+
+
+
+
+ {{ $t('website.neverExpire') }}
+
+ {{ dateFromat(1, 1, row.webSiteSSL.expireDate) }}
+
+