mirrors/nginx-ui
1
0
Fork 0
mirror of https://github.com/0xJacky/nginx-ui.git synced 2025-05-12 10:55:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

feat: modify certification content #29, #52

Browse source
This commit is contained in:
0xJacky 2023-01-03 11:22:54 +08:00
parent 8a9d59cd03
commit 6ee9eefa8b
No known key found for this signature in database
GPG key ID: B6E4A6E4A561BAF0
11 changed files with 428 additions and 250 deletions
Download patch file Download diff file Expand all files Collapse all files

9
frontend/src/components/CodeEditor/CodeEditor.vue
View file

@ -4,16 +4,13 @@ import 'ace-builds/src-noconflict/mode-nginx'
import 'ace-builds/src-noconflict/theme-monokai' import 'ace-builds/src-noconflict/theme-monokai'
import {computed} from 'vue' import {computed} from 'vue'
const props = defineProps<{ const props = defineProps(['content', 'defaultHeight'])
content: string
defaultHeight?: string
}>()
const emit = defineEmits(['update:content']) const emit = defineEmits(['update:content'])
const value = computed({ const value = computed({
get() { get() {
return props.content return props.content ?? ''
}, },
set(value) { set(value) {
emit('update:content', value) emit('update:content', value)
@ -27,7 +24,7 @@ const value = computed({
lang="nginx" lang="nginx"
theme="monokai" theme="monokai"
:style="{ :style="{
minHeight: props.defaultHeight || '100vh' minHeight: defaultHeight || '100vh'
}"/> }"/>
</template> </template>

46
frontend/src/language/en/app.po
View file

@ -17,7 +17,7 @@ msgstr "About"
msgid "Access Logs" msgid "Access Logs"
msgstr "" msgstr ""
#: src/views/cert/Cert.vue:75 src/views/config/config.ts:36 #: src/views/cert/Cert.vue:78 src/views/config/config.ts:36
#: src/views/domain/DomainList.vue:47 src/views/user/User.vue:43 #: src/views/domain/DomainList.vue:47 src/views/user/User.vue:43
msgid "Action" msgid "Action"
msgstr "Action" msgstr "Action"
@ -68,10 +68,14 @@ msgstr "Are you sure you want to remove this directive?"
msgid "Auto" msgid "Auto"
msgstr "" msgstr ""
#: src/views/cert/Cert.vue:38 #: src/views/cert/Cert.vue:41
msgid "Auto Cert" msgid "Auto Cert"
msgstr "" msgstr ""
#: src/views/cert/Cert.vue:8
msgid "Auto cert is enabled, please do not modify this certification."
msgstr ""
#: src/views/nginx_log/NginxLog.vue:4 #: src/views/nginx_log/NginxLog.vue:4
msgid "Auto Refresh" msgid "Auto Refresh"
msgstr "" msgstr ""
@ -123,15 +127,15 @@ msgstr "Build with"
msgid "Cancel" msgid "Cancel"
msgstr "Cancel" msgstr "Cancel"
#: src/views/domain/cert/CertInfo.vue:24 #: src/views/domain/cert/CertInfo.vue:19
msgid "Certificate has expired" msgid "Certificate has expired"
msgstr "Certificate has expired" msgstr "Certificate has expired"
#: src/views/domain/cert/CertInfo.vue:28 #: src/views/domain/cert/CertInfo.vue:23
msgid "Certificate is valid" msgid "Certificate is valid"
msgstr "Certificate is valid" msgstr "Certificate is valid"
#: src/views/domain/cert/CertInfo.vue:14 #: src/views/cert/Cert.vue:12 src/views/domain/cert/Cert.vue:31
msgid "Certificate Status" msgid "Certificate Status"
msgstr "Certificate Status" msgstr "Certificate Status"
@ -232,7 +236,7 @@ msgstr "Directives"
msgid "Disable auto-renewal failed for %{name}" msgid "Disable auto-renewal failed for %{name}"
msgstr "Disable auto-renewal failed for %{name}" msgstr "Disable auto-renewal failed for %{name}"
#: src/views/cert/Cert.vue:48 src/views/domain/DomainEdit.vue:10 #: src/views/cert/Cert.vue:51 src/views/domain/DomainEdit.vue:10
#: src/views/domain/DomainEdit.vue:9 src/views/domain/DomainList.vue:16 #: src/views/domain/DomainEdit.vue:9 src/views/domain/DomainList.vue:16
#: src/views/domain/DomainList.vue:34 src/views/domain/DomainList.vue:7 #: src/views/domain/DomainList.vue:34 src/views/domain/DomainList.vue:7
#: src/views/domain/DomainList.vue:8 src/views/domain/DomainList.vue:9 #: src/views/domain/DomainList.vue:8 src/views/domain/DomainList.vue:9
@ -247,7 +251,7 @@ msgstr "Disabled successfully"
msgid "Disk IO" msgid "Disk IO"
msgstr "Disk IO" msgstr "Disk IO"
#: src/views/cert/Cert.vue:29 #: src/views/cert/Cert.vue:32
msgid "Domain" msgid "Domain"
msgstr "" msgstr ""
@ -283,7 +287,7 @@ msgstr "Enable failed"
msgid "Enable TLS" msgid "Enable TLS"
msgstr "Enable TLS" msgstr "Enable TLS"
#: src/views/cert/Cert.vue:45 src/views/domain/DomainEdit.vue:33 #: src/views/cert/Cert.vue:48 src/views/domain/DomainEdit.vue:33
#: src/views/domain/DomainEdit.vue:6 src/views/domain/DomainEdit.vue:7 #: src/views/domain/DomainEdit.vue:6 src/views/domain/DomainEdit.vue:7
#: src/views/domain/DomainList.vue:10 src/views/domain/DomainList.vue:11 #: src/views/domain/DomainList.vue:10 src/views/domain/DomainList.vue:11
#: src/views/domain/DomainList.vue:12 src/views/domain/DomainList.vue:19 #: src/views/domain/DomainList.vue:12 src/views/domain/DomainList.vue:19
@ -304,7 +308,7 @@ msgstr "Encrypt website with Let's Encrypt"
msgid "Error Logs" msgid "Error Logs"
msgstr "" msgstr ""
#: src/views/domain/cert/CertInfo.vue:17 #: src/views/domain/cert/CertInfo.vue:12
msgid "Expiration Date: %{date}" msgid "Expiration Date: %{date}"
msgstr "Expiration Date: %{date}" msgstr "Expiration Date: %{date}"
@ -377,7 +381,7 @@ msgstr "Install"
msgid "Install successfully" msgid "Install successfully"
msgstr "Enabled successfully" msgstr "Enabled successfully"
#: src/views/domain/cert/CertInfo.vue:15 #: src/views/domain/cert/CertInfo.vue:10
msgid "Intermediate Certification Authorities: %{issuer}" msgid "Intermediate Certification Authorities: %{issuer}"
msgstr "Intermediate Certification Authorities: %{issuer}" msgstr "Intermediate Certification Authorities: %{issuer}"
@ -467,7 +471,7 @@ msgstr "Modify Config"
msgid "Modify Config" msgid "Modify Config"
msgstr "Modify Config" msgstr "Modify Config"
#: src/views/cert/Cert.vue:13 src/views/config/config.ts:9 #: src/views/cert/Cert.vue:16 src/views/config/config.ts:9
#: src/views/domain/DomainEdit.vue:36 src/views/domain/DomainList.vue:15 #: src/views/domain/DomainEdit.vue:36 src/views/domain/DomainList.vue:15
msgid "Name" msgid "Name"
msgstr "Name" msgstr "Name"
@ -515,7 +519,7 @@ msgstr "No"
msgid "Not Found" msgid "Not Found"
msgstr "Not Found" msgstr "Not Found"
#: src/views/domain/cert/CertInfo.vue:19 #: src/views/domain/cert/CertInfo.vue:14
msgid "Not Valid Before: %{date}" msgid "Not Valid Before: %{date}"
msgstr "Not Valid Before: %{date}" msgstr "Not Valid Before: %{date}"
@ -705,16 +709,26 @@ msgstr "Sites List"
msgid "Sites List" msgid "Sites List"
msgstr "Sites List" msgstr "Sites List"
#: src/views/cert/Cert.vue:62 #: src/views/cert/Cert.vue:65
#, fuzzy #, fuzzy
msgid "SSL Certificate Key Path" msgid "SSL Certificate Key Path"
msgstr "Certificate Status" msgstr "Certificate Status"
#: src/views/cert/Cert.vue:55 #: src/views/cert/Cert.vue:58
#, fuzzy #, fuzzy
msgid "SSL Certificate Path" msgid "SSL Certificate Path"
msgstr "Certificate Status" msgstr "Certificate Status"
#: src/views/cert/Cert.vue:19
#, fuzzy
msgid "SSL Certification Content"
msgstr "Certificate Status"
#: src/views/cert/Cert.vue:22
#, fuzzy
msgid "SSL Certification Key Content"
msgstr "Certificate Status"
#: src/views/domain/DomainList.vue:24 #: src/views/domain/DomainList.vue:24
msgid "Status" msgid "Status"
msgstr "Status" msgstr "Status"
@ -723,7 +737,7 @@ msgstr "Status"
msgid "Storage" msgid "Storage"
msgstr "Storage" msgstr "Storage"
#: src/views/domain/cert/CertInfo.vue:16 #: src/views/domain/cert/CertInfo.vue:11
msgid "Subject Name: %{name}" msgid "Subject Name: %{name}"
msgstr "Subject Name: %{name}" msgstr "Subject Name: %{name}"
@ -768,7 +782,7 @@ msgstr ""
msgid "Type" msgid "Type"
msgstr "" msgstr ""
#: src/views/cert/Cert.vue:69 src/views/config/config.ts:29 #: src/views/cert/Cert.vue:72 src/views/config/config.ts:29
#: src/views/domain/DomainList.vue:41 src/views/user/User.vue:37 #: src/views/domain/DomainList.vue:41 src/views/user/User.vue:37
msgid "Updated at" msgid "Updated at"
msgstr "Updated at" msgstr "Updated at"

45
frontend/src/language/messages.pot
View file

@ -11,7 +11,7 @@ msgstr ""
msgid "Access Logs" msgid "Access Logs"
msgstr "" msgstr ""
#: src/views/cert/Cert.vue:75 #: src/views/cert/Cert.vue:78
#: src/views/config/config.ts:36 #: src/views/config/config.ts:36
#: src/views/domain/DomainList.vue:47 #: src/views/domain/DomainList.vue:47
#: src/views/user/User.vue:43 #: src/views/user/User.vue:43
@ -64,10 +64,14 @@ msgstr ""
msgid "Auto" msgid "Auto"
msgstr "" msgstr ""
#: src/views/cert/Cert.vue:38 #: src/views/cert/Cert.vue:41
msgid "Auto Cert" msgid "Auto Cert"
msgstr "" msgstr ""
#: src/views/cert/Cert.vue:8
msgid "Auto cert is enabled, please do not modify this certification."
msgstr ""
#: src/views/nginx_log/NginxLog.vue:4 #: src/views/nginx_log/NginxLog.vue:4
msgid "Auto Refresh" msgid "Auto Refresh"
msgstr "" msgstr ""
@ -121,15 +125,16 @@ msgstr ""
msgid "Cancel" msgid "Cancel"
msgstr "" msgstr ""
#: src/views/domain/cert/CertInfo.vue:24 #: src/views/domain/cert/CertInfo.vue:19
msgid "Certificate has expired" msgid "Certificate has expired"
msgstr "" msgstr ""
#: src/views/domain/cert/CertInfo.vue:28 #: src/views/domain/cert/CertInfo.vue:23
msgid "Certificate is valid" msgid "Certificate is valid"
msgstr "" msgstr ""
#: src/views/domain/cert/CertInfo.vue:14 #: src/views/cert/Cert.vue:12
#: src/views/domain/cert/Cert.vue:31
msgid "Certificate Status" msgid "Certificate Status"
msgstr "" msgstr ""
@ -231,7 +236,7 @@ msgstr ""
msgid "Disable auto-renewal failed for %{name}" msgid "Disable auto-renewal failed for %{name}"
msgstr "" msgstr ""
#: src/views/cert/Cert.vue:48 #: src/views/cert/Cert.vue:51
#: src/views/domain/DomainEdit.vue:10 #: src/views/domain/DomainEdit.vue:10
#: src/views/domain/DomainEdit.vue:9 #: src/views/domain/DomainEdit.vue:9
#: src/views/domain/DomainList.vue:16 #: src/views/domain/DomainList.vue:16
@ -251,7 +256,7 @@ msgstr ""
msgid "Disk IO" msgid "Disk IO"
msgstr "" msgstr ""
#: src/views/cert/Cert.vue:29 #: src/views/cert/Cert.vue:32
msgid "Domain" msgid "Domain"
msgstr "" msgstr ""
@ -289,7 +294,7 @@ msgstr ""
msgid "Enable TLS" msgid "Enable TLS"
msgstr "" msgstr ""
#: src/views/cert/Cert.vue:45 #: src/views/cert/Cert.vue:48
#: src/views/domain/DomainEdit.vue:33 #: src/views/domain/DomainEdit.vue:33
#: src/views/domain/DomainEdit.vue:6 #: src/views/domain/DomainEdit.vue:6
#: src/views/domain/DomainEdit.vue:7 #: src/views/domain/DomainEdit.vue:7
@ -316,7 +321,7 @@ msgstr ""
msgid "Error Logs" msgid "Error Logs"
msgstr "" msgstr ""
#: src/views/domain/cert/CertInfo.vue:17 #: src/views/domain/cert/CertInfo.vue:12
msgid "Expiration Date: %{date}" msgid "Expiration Date: %{date}"
msgstr "" msgstr ""
@ -393,7 +398,7 @@ msgstr ""
msgid "Install successfully" msgid "Install successfully"
msgstr "" msgstr ""
#: src/views/domain/cert/CertInfo.vue:15 #: src/views/domain/cert/CertInfo.vue:10
msgid "Intermediate Certification Authorities: %{issuer}" msgid "Intermediate Certification Authorities: %{issuer}"
msgstr "" msgstr ""
@ -481,7 +486,7 @@ msgstr ""
msgid "Modify Config" msgid "Modify Config"
msgstr "" msgstr ""
#: src/views/cert/Cert.vue:13 #: src/views/cert/Cert.vue:16
#: src/views/config/config.ts:9 #: src/views/config/config.ts:9
#: src/views/domain/DomainEdit.vue:36 #: src/views/domain/DomainEdit.vue:36
#: src/views/domain/DomainList.vue:15 #: src/views/domain/DomainList.vue:15
@ -533,7 +538,7 @@ msgstr ""
msgid "Not Found" msgid "Not Found"
msgstr "" msgstr ""
#: src/views/domain/cert/CertInfo.vue:19 #: src/views/domain/cert/CertInfo.vue:14
msgid "Not Valid Before: %{date}" msgid "Not Valid Before: %{date}"
msgstr "" msgstr ""
@ -729,14 +734,22 @@ msgstr ""
msgid "Sites List" msgid "Sites List"
msgstr "" msgstr ""
#: src/views/cert/Cert.vue:62 #: src/views/cert/Cert.vue:65
msgid "SSL Certificate Key Path" msgid "SSL Certificate Key Path"
msgstr "" msgstr ""
#: src/views/cert/Cert.vue:55 #: src/views/cert/Cert.vue:58
msgid "SSL Certificate Path" msgid "SSL Certificate Path"
msgstr "" msgstr ""
#: src/views/cert/Cert.vue:19
msgid "SSL Certification Content"
msgstr ""
#: src/views/cert/Cert.vue:22
msgid "SSL Certification Key Content"
msgstr ""
#: src/views/domain/DomainList.vue:24 #: src/views/domain/DomainList.vue:24
msgid "Status" msgid "Status"
msgstr "" msgstr ""
@ -745,7 +758,7 @@ msgstr ""
msgid "Storage" msgid "Storage"
msgstr "" msgstr ""
#: src/views/domain/cert/CertInfo.vue:16 #: src/views/domain/cert/CertInfo.vue:11
msgid "Subject Name: %{name}" msgid "Subject Name: %{name}"
msgstr "" msgstr ""
@ -786,7 +799,7 @@ msgstr ""
msgid "Type" msgid "Type"
msgstr "" msgstr ""
#: src/views/cert/Cert.vue:69 #: src/views/cert/Cert.vue:72
#: src/views/config/config.ts:29 #: src/views/config/config.ts:29
#: src/views/domain/DomainList.vue:41 #: src/views/domain/DomainList.vue:41
#: src/views/user/User.vue:37 #: src/views/user/User.vue:37

2
frontend/src/language/translations.json
View file

File diff suppressed because one or more lines are too long

BIN
frontend/src/language/zh_CN/app.mo
View file

Binary file not shown.

44
frontend/src/language/zh_CN/app.po
View file

@ -20,7 +20,7 @@ msgstr "关于"
msgid "Access Logs" msgid "Access Logs"
msgstr "访问日志" msgstr "访问日志"
#: src/views/cert/Cert.vue:75 src/views/config/config.ts:36 #: src/views/cert/Cert.vue:78 src/views/config/config.ts:36
#: src/views/domain/DomainList.vue:47 src/views/user/User.vue:43 #: src/views/domain/DomainList.vue:47 src/views/user/User.vue:43
msgid "Action" msgid "Action"
msgstr "操作" msgstr "操作"
@ -69,10 +69,14 @@ msgstr "您确定要删除这个 Location？"
msgid "Auto" msgid "Auto"
msgstr "自动" msgstr "自动"
#: src/views/cert/Cert.vue:38 #: src/views/cert/Cert.vue:41
msgid "Auto Cert" msgid "Auto Cert"
msgstr "自动更新" msgstr "自动更新"
#: src/views/cert/Cert.vue:8
msgid "Auto cert is enabled, please do not modify this certification."
msgstr "自动更新已启用，请勿修改此证书配置。"
#: src/views/nginx_log/NginxLog.vue:4 #: src/views/nginx_log/NginxLog.vue:4
msgid "Auto Refresh" msgid "Auto Refresh"
msgstr "自动刷新" msgstr "自动刷新"
@ -122,15 +126,15 @@ msgstr "构建基于"
msgid "Cancel" msgid "Cancel"
msgstr "取消" msgstr "取消"
#: src/views/domain/cert/CertInfo.vue:24 #: src/views/domain/cert/CertInfo.vue:19
msgid "Certificate has expired" msgid "Certificate has expired"
msgstr "此证书已过期" msgstr "此证书已过期"
#: src/views/domain/cert/CertInfo.vue:28 #: src/views/domain/cert/CertInfo.vue:23
msgid "Certificate is valid" msgid "Certificate is valid"
msgstr "此证书有效" msgstr "此证书有效"
#: src/views/domain/cert/CertInfo.vue:14 #: src/views/cert/Cert.vue:12 src/views/domain/cert/Cert.vue:31
msgid "Certificate Status" msgid "Certificate Status"
msgstr "证书状态" msgstr "证书状态"
@ -230,7 +234,7 @@ msgstr "指令"
msgid "Disable auto-renewal failed for %{name}" msgid "Disable auto-renewal failed for %{name}"
msgstr "关闭 %{name} 自动续签失败" msgstr "关闭 %{name} 自动续签失败"
#: src/views/cert/Cert.vue:48 src/views/domain/DomainEdit.vue:10 #: src/views/cert/Cert.vue:51 src/views/domain/DomainEdit.vue:10
#: src/views/domain/DomainEdit.vue:9 src/views/domain/DomainList.vue:16 #: src/views/domain/DomainEdit.vue:9 src/views/domain/DomainList.vue:16
#: src/views/domain/DomainList.vue:34 src/views/domain/DomainList.vue:7 #: src/views/domain/DomainList.vue:34 src/views/domain/DomainList.vue:7
#: src/views/domain/DomainList.vue:8 src/views/domain/DomainList.vue:9 #: src/views/domain/DomainList.vue:8 src/views/domain/DomainList.vue:9
@ -245,7 +249,7 @@ msgstr "禁用成功"
msgid "Disk IO" msgid "Disk IO"
msgstr "磁盘 IO" msgstr "磁盘 IO"
#: src/views/cert/Cert.vue:29 #: src/views/cert/Cert.vue:32
msgid "Domain" msgid "Domain"
msgstr "域名" msgstr "域名"
@ -281,7 +285,7 @@ msgstr "启用失败"
msgid "Enable TLS" msgid "Enable TLS"
msgstr "启用 TLS" msgstr "启用 TLS"
#: src/views/cert/Cert.vue:45 src/views/domain/DomainEdit.vue:33 #: src/views/cert/Cert.vue:48 src/views/domain/DomainEdit.vue:33
#: src/views/domain/DomainEdit.vue:6 src/views/domain/DomainEdit.vue:7 #: src/views/domain/DomainEdit.vue:6 src/views/domain/DomainEdit.vue:7
#: src/views/domain/DomainList.vue:10 src/views/domain/DomainList.vue:11 #: src/views/domain/DomainList.vue:10 src/views/domain/DomainList.vue:11
#: src/views/domain/DomainList.vue:12 src/views/domain/DomainList.vue:19 #: src/views/domain/DomainList.vue:12 src/views/domain/DomainList.vue:19
@ -302,7 +306,7 @@ msgstr "用 Let's Encrypt 对网站进行加密"
msgid "Error Logs" msgid "Error Logs"
msgstr "错误日志" msgstr "错误日志"
#: src/views/domain/cert/CertInfo.vue:17 #: src/views/domain/cert/CertInfo.vue:12
msgid "Expiration Date: %{date}" msgid "Expiration Date: %{date}"
msgstr "过期时间: %{date}" msgstr "过期时间: %{date}"
@ -374,7 +378,7 @@ msgstr "安装"
msgid "Install successfully" msgid "Install successfully"
msgstr "安装成功" msgstr "安装成功"
#: src/views/domain/cert/CertInfo.vue:15 #: src/views/domain/cert/CertInfo.vue:10
msgid "Intermediate Certification Authorities: %{issuer}" msgid "Intermediate Certification Authorities: %{issuer}"
msgstr "中级证书颁发机构: %{issuer}" msgstr "中级证书颁发机构: %{issuer}"
@ -462,7 +466,7 @@ msgstr "修改"
msgid "Modify Config" msgid "Modify Config"
msgstr "修改配置文件" msgstr "修改配置文件"
#: src/views/cert/Cert.vue:13 src/views/config/config.ts:9 #: src/views/cert/Cert.vue:16 src/views/config/config.ts:9
#: src/views/domain/DomainEdit.vue:36 src/views/domain/DomainList.vue:15 #: src/views/domain/DomainEdit.vue:36 src/views/domain/DomainList.vue:15
msgid "Name" msgid "Name"
msgstr "名称" msgstr "名称"
@ -510,7 +514,7 @@ msgstr "取消"
msgid "Not Found" msgid "Not Found"
msgstr "找不到页面" msgstr "找不到页面"
#: src/views/domain/cert/CertInfo.vue:19 #: src/views/domain/cert/CertInfo.vue:14
msgid "Not Valid Before: %{date}" msgid "Not Valid Before: %{date}"
msgstr "此前无效: %{date}" msgstr "此前无效: %{date}"
@ -693,14 +697,22 @@ msgstr "站点列表"
msgid "Sites List" msgid "Sites List"
msgstr "站点列表" msgstr "站点列表"
#: src/views/cert/Cert.vue:62 #: src/views/cert/Cert.vue:65
msgid "SSL Certificate Key Path" msgid "SSL Certificate Key Path"
msgstr "SSL证书密钥路径" msgstr "SSL证书密钥路径"
#: src/views/cert/Cert.vue:55 #: src/views/cert/Cert.vue:58
msgid "SSL Certificate Path" msgid "SSL Certificate Path"
msgstr "SSL证书路径" msgstr "SSL证书路径"
#: src/views/cert/Cert.vue:19
msgid "SSL Certification Content"
msgstr "SSL证书内容"
#: src/views/cert/Cert.vue:22
msgid "SSL Certification Key Content"
msgstr "SSL证书密钥内容"
#: src/views/domain/DomainList.vue:24 #: src/views/domain/DomainList.vue:24
msgid "Status" msgid "Status"
msgstr "状态" msgstr "状态"
@ -709,7 +721,7 @@ msgstr "状态"
msgid "Storage" msgid "Storage"
msgstr "存储" msgstr "存储"
#: src/views/domain/cert/CertInfo.vue:16 #: src/views/domain/cert/CertInfo.vue:11
msgid "Subject Name: %{name}" msgid "Subject Name: %{name}"
msgstr "主体名称: %{name}" msgstr "主体名称: %{name}"
@ -752,7 +764,7 @@ msgstr "主题"
msgid "Type" msgid "Type"
msgstr "类型" msgstr "类型"
#: src/views/cert/Cert.vue:69 src/views/config/config.ts:29 #: src/views/cert/Cert.vue:72 src/views/config/config.ts:29
#: src/views/domain/DomainList.vue:41 src/views/user/User.vue:37 #: src/views/domain/DomainList.vue:41 src/views/user/User.vue:37
msgid "Updated at" msgid "Updated at"
msgstr "修改时间" msgstr "修改时间"

46
frontend/src/language/zh_TW/app.po
View file

@ -21,7 +21,7 @@ msgstr "關於"
msgid "Access Logs" msgid "Access Logs"
msgstr "訪問日誌" msgstr "訪問日誌"
#: src/views/cert/Cert.vue:75 src/views/config/config.ts:36 #: src/views/cert/Cert.vue:78 src/views/config/config.ts:36
#: src/views/domain/DomainList.vue:47 src/views/user/User.vue:43 #: src/views/domain/DomainList.vue:47 src/views/user/User.vue:43
msgid "Action" msgid "Action"
msgstr "操作" msgstr "操作"
@ -70,11 +70,15 @@ msgstr "您確定要刪除此 Location 嗎？"
msgid "Auto" msgid "Auto"
msgstr "自動" msgstr "自動"
#: src/views/cert/Cert.vue:38 #: src/views/cert/Cert.vue:41
#, fuzzy #, fuzzy
msgid "Auto Cert" msgid "Auto Cert"
msgstr "自動刷新" msgstr "自動刷新"
#: src/views/cert/Cert.vue:8
msgid "Auto cert is enabled, please do not modify this certification."
msgstr ""
#: src/views/nginx_log/NginxLog.vue:4 #: src/views/nginx_log/NginxLog.vue:4
msgid "Auto Refresh" msgid "Auto Refresh"
msgstr "自動刷新" msgstr "自動刷新"
@ -124,15 +128,15 @@ msgstr "構建基於"
msgid "Cancel" msgid "Cancel"
msgstr "取消" msgstr "取消"
#: src/views/domain/cert/CertInfo.vue:24 #: src/views/domain/cert/CertInfo.vue:19
msgid "Certificate has expired" msgid "Certificate has expired"
msgstr "此憑證已過期" msgstr "此憑證已過期"
#: src/views/domain/cert/CertInfo.vue:28 #: src/views/domain/cert/CertInfo.vue:23
msgid "Certificate is valid" msgid "Certificate is valid"
msgstr "此憑證有效" msgstr "此憑證有效"
#: src/views/domain/cert/CertInfo.vue:14 #: src/views/cert/Cert.vue:12 src/views/domain/cert/Cert.vue:31
msgid "Certificate Status" msgid "Certificate Status"
msgstr "憑證狀態" msgstr "憑證狀態"
@ -233,7 +237,7 @@ msgstr "指令"
msgid "Disable auto-renewal failed for %{name}" msgid "Disable auto-renewal failed for %{name}"
msgstr "關閉 %{name} 自動續簽失敗" msgstr "關閉 %{name} 自動續簽失敗"
#: src/views/cert/Cert.vue:48 src/views/domain/DomainEdit.vue:10 #: src/views/cert/Cert.vue:51 src/views/domain/DomainEdit.vue:10
#: src/views/domain/DomainEdit.vue:9 src/views/domain/DomainList.vue:16 #: src/views/domain/DomainEdit.vue:9 src/views/domain/DomainList.vue:16
#: src/views/domain/DomainList.vue:34 src/views/domain/DomainList.vue:7 #: src/views/domain/DomainList.vue:34 src/views/domain/DomainList.vue:7
#: src/views/domain/DomainList.vue:8 src/views/domain/DomainList.vue:9 #: src/views/domain/DomainList.vue:8 src/views/domain/DomainList.vue:9
@ -248,7 +252,7 @@ msgstr "禁用成功"
msgid "Disk IO" msgid "Disk IO"
msgstr "磁碟 IO" msgstr "磁碟 IO"
#: src/views/cert/Cert.vue:29 #: src/views/cert/Cert.vue:32
msgid "Domain" msgid "Domain"
msgstr "" msgstr ""
@ -284,7 +288,7 @@ msgstr "啟用失敗"
msgid "Enable TLS" msgid "Enable TLS"
msgstr "啟用 TLS" msgstr "啟用 TLS"
#: src/views/cert/Cert.vue:45 src/views/domain/DomainEdit.vue:33 #: src/views/cert/Cert.vue:48 src/views/domain/DomainEdit.vue:33
#: src/views/domain/DomainEdit.vue:6 src/views/domain/DomainEdit.vue:7 #: src/views/domain/DomainEdit.vue:6 src/views/domain/DomainEdit.vue:7
#: src/views/domain/DomainList.vue:10 src/views/domain/DomainList.vue:11 #: src/views/domain/DomainList.vue:10 src/views/domain/DomainList.vue:11
#: src/views/domain/DomainList.vue:12 src/views/domain/DomainList.vue:19 #: src/views/domain/DomainList.vue:12 src/views/domain/DomainList.vue:19
@ -305,7 +309,7 @@ msgstr "用 Let's Encrypt 對網站進行加密"
msgid "Error Logs" msgid "Error Logs"
msgstr "錯誤日志" msgstr "錯誤日志"
#: src/views/domain/cert/CertInfo.vue:17 #: src/views/domain/cert/CertInfo.vue:12
msgid "Expiration Date: %{date}" msgid "Expiration Date: %{date}"
msgstr "過期時間: %{date}" msgstr "過期時間: %{date}"
@ -379,7 +383,7 @@ msgstr "安裝"
msgid "Install successfully" msgid "Install successfully"
msgstr "安裝成功" msgstr "安裝成功"
#: src/views/domain/cert/CertInfo.vue:15 #: src/views/domain/cert/CertInfo.vue:10
msgid "Intermediate Certification Authorities: %{issuer}" msgid "Intermediate Certification Authorities: %{issuer}"
msgstr "中級憑證頒發機構: %{issuer}" msgstr "中級憑證頒發機構: %{issuer}"
@ -467,7 +471,7 @@ msgstr "修改"
msgid "Modify Config" msgid "Modify Config"
msgstr "修改配置" msgstr "修改配置"
#: src/views/cert/Cert.vue:13 src/views/config/config.ts:9 #: src/views/cert/Cert.vue:16 src/views/config/config.ts:9
#: src/views/domain/DomainEdit.vue:36 src/views/domain/DomainList.vue:15 #: src/views/domain/DomainEdit.vue:36 src/views/domain/DomainList.vue:15
msgid "Name" msgid "Name"
msgstr "名稱" msgstr "名稱"
@ -517,7 +521,7 @@ msgstr "取消"
msgid "Not Found" msgid "Not Found"
msgstr "找不到頁面" msgstr "找不到頁面"
#: src/views/domain/cert/CertInfo.vue:19 #: src/views/domain/cert/CertInfo.vue:14
msgid "Not Valid Before: %{date}" msgid "Not Valid Before: %{date}"
msgstr "此前無效: %{date}" msgstr "此前無效: %{date}"
@ -701,16 +705,26 @@ msgstr "網站日誌"
msgid "Sites List" msgid "Sites List"
msgstr "站點列表" msgstr "站點列表"
#: src/views/cert/Cert.vue:62 #: src/views/cert/Cert.vue:65
#, fuzzy #, fuzzy
msgid "SSL Certificate Key Path" msgid "SSL Certificate Key Path"
msgstr "憑證狀態" msgstr "憑證狀態"
#: src/views/cert/Cert.vue:55 #: src/views/cert/Cert.vue:58
#, fuzzy #, fuzzy
msgid "SSL Certificate Path" msgid "SSL Certificate Path"
msgstr "憑證狀態" msgstr "憑證狀態"
#: src/views/cert/Cert.vue:19
#, fuzzy
msgid "SSL Certification Content"
msgstr "憑證狀態"
#: src/views/cert/Cert.vue:22
#, fuzzy
msgid "SSL Certification Key Content"
msgstr "憑證狀態"
#: src/views/domain/DomainList.vue:24 #: src/views/domain/DomainList.vue:24
msgid "Status" msgid "Status"
msgstr "狀態" msgstr "狀態"
@ -719,7 +733,7 @@ msgstr "狀態"
msgid "Storage" msgid "Storage"
msgstr "儲存" msgstr "儲存"
#: src/views/domain/cert/CertInfo.vue:16 #: src/views/domain/cert/CertInfo.vue:11
msgid "Subject Name: %{name}" msgid "Subject Name: %{name}"
msgstr "主體名稱: %{name}" msgstr "主體名稱: %{name}"
@ -763,7 +777,7 @@ msgstr "外觀樣式"
msgid "Type" msgid "Type"
msgstr "" msgstr ""
#: src/views/cert/Cert.vue:69 src/views/config/config.ts:29 #: src/views/cert/Cert.vue:72 src/views/config/config.ts:29
#: src/views/domain/DomainList.vue:41 src/views/user/User.vue:37 #: src/views/domain/DomainList.vue:41 src/views/user/User.vue:37
msgid "Updated at" msgid "Updated at"
msgstr "修改時間" msgstr "修改時間"

30
frontend/src/views/cert/Cert.vue
View file

@ -6,6 +6,9 @@ import {h} from 'vue'
import {Badge} from 'ant-design-vue' import {Badge} from 'ant-design-vue'
import cert from '@/api/cert' import cert from '@/api/cert'
import StdCurd from '@/components/StdDataDisplay/StdCurd.vue' import StdCurd from '@/components/StdDataDisplay/StdCurd.vue'
import Template from '@/views/template/Template.vue'
import CodeEditor from '@/components/CodeEditor/CodeEditor.vue'
import CertInfo from '@/views/domain/cert/CertInfo.vue'
const {$gettext} = useGettext() const {$gettext} = useGettext()
@ -44,7 +47,7 @@ const columns = [{
template.push(<Badge status="success"/>) template.push(<Badge status="success"/>)
template.push($gettext('Enabled')) template.push($gettext('Enabled'))
} else { } else {
template.push(<Badge status="error"/>) template.push(<Badge status="warning"/>)
template.push($gettext('Disabled')) template.push($gettext('Disabled'))
} }
return h('div', template) return h('div', template)
@ -80,7 +83,30 @@ const columns = [{
<template> <template>
<std-curd :title="$gettext('Certification')" :api="cert" :columns="columns" <std-curd :title="$gettext('Certification')" :api="cert" :columns="columns"
row-key="name" row-key="name"
/> >
<template #beforeEdit="{data}">
<div v-if="data.auto_cert===1" style="margin-bottom: 15px">
<a-alert
:message="$gettext('Auto cert is enabled, please do not modify this certification.')" type="info"
show-icon/>
</div>
<a-form layout="vertical" v-if="data.certificate_info">
<a-form-item :label="$gettext('Certificate Status')">
<cert-info :cert="data.certificate_info"/>
</a-form-item>
</a-form>
</template>
<template #edit="{data}">
<a-form layout="vertical">
<a-form-item :label="$gettext('SSL Certification Content')">
<code-editor v-model:content="data.ssl_certification" default-height="200px"/>
</a-form-item>
<a-form-item :label="$gettext('SSL Certification Key Content')">
<code-editor v-model:content="data.ssl_certification_key" default-height="200px"/>
</a-form-item>
</a-form>
</template>
</std-curd>
</template> </template>
<style lang="less" scoped> <style lang="less" scoped>

1
frontend/src/views/domain/cert/Cert.vue
View file

@ -28,6 +28,7 @@ const enabled = computed({
<template> <template>
<div> <div>
<h2 v-translate>Certificate Status</h2>
<cert-info ref="info" :cert="props.cert_info"/> <cert-info ref="info" :cert="props.cert_info"/>
<issue-cert <issue-cert

5
frontend/src/views/domain/cert/CertInfo.vue
View file

@ -1,17 +1,12 @@
<script setup lang="ts"> <script setup lang="ts">
import {CloseCircleOutlined, CheckCircleOutlined} from '@ant-design/icons-vue' import {CloseCircleOutlined, CheckCircleOutlined} from '@ant-design/icons-vue'
import dayjs from 'dayjs' import dayjs from 'dayjs'
import {reactive, ref} from 'vue'
import domain from '@/api/domain'
const props = defineProps(['cert']) const props = defineProps(['cert'])
const cert = props.cert
</script> </script>
<template> <template>
<div class="cert-info" v-if="cert"> <div class="cert-info" v-if="cert">
<h2 v-translate>Certificate Status</h2>
<p v-translate="{issuer: cert.issuer_name}">Intermediate Certification Authorities: %{issuer}</p> <p v-translate="{issuer: cert.issuer_name}">Intermediate Certification Authorities: %{issuer}</p>
<p v-translate="{name: cert.subject_name}">Subject Name: %{name}</p> <p v-translate="{name: cert.subject_name}">Subject Name: %{name}</p>
<p v-translate="{date: dayjs(cert.not_after).format('YYYY-MM-DD HH:mm:ss').toString()}"> <p v-translate="{date: dayjs(cert.not_after).format('YYYY-MM-DD HH:mm:ss').toString()}">

118
server/api/cert.go
View file

@ -9,6 +9,8 @@ import (
"github.com/spf13/cast" "github.com/spf13/cast"
"log" "log"
"net/http" "net/http"
"os"
"path/filepath"
"strings" "strings"
) )
@ -148,6 +150,50 @@ func GetCertList(c *gin.Context) {
}) })
} }
func getCert(c *gin.Context, certModel model.Cert) {
type resp struct {
model.Cert
SSLCertification string `json:"ssl_certification"`
SSLCertificationKey string `json:"ssl_certification_key"`
CertificateInfo *CertificateInfo `json:"certificate_info,omitempty"`
}
var sslCertificationBytes, sslCertificationKeyBytes []byte
var certificateInfo *CertificateInfo
if certModel.SSLCertificatePath != "" {
if _, err := os.Stat(certModel.SSLCertificatePath); err == nil {
sslCertificationBytes, _ = os.ReadFile(certModel.SSLCertificatePath)
}
pubKey, err := cert.GetCertInfo(certModel.SSLCertificatePath)
if err != nil {
ErrHandler(c, err)
return
}
certificateInfo = &CertificateInfo{
SubjectName: pubKey.Subject.CommonName,
IssuerName: pubKey.Issuer.CommonName,
NotAfter: pubKey.NotAfter,
NotBefore: pubKey.NotBefore,
}
}
if certModel.SSLCertificateKeyPath != "" {
if _, err := os.Stat(certModel.SSLCertificateKeyPath); err == nil {
sslCertificationKeyBytes, _ = os.ReadFile(certModel.SSLCertificateKeyPath)
}
}
c.JSON(http.StatusOK, resp{
certModel,
string(sslCertificationBytes),
string(sslCertificationKeyBytes),
certificateInfo,
})
}
func GetCert(c *gin.Context) { func GetCert(c *gin.Context) {
certModel, err := model.FirstCertByID(cast.ToInt(c.Param("id"))) certModel, err := model.FirstCertByID(cast.ToInt(c.Param("id")))
@ -156,15 +202,17 @@ func GetCert(c *gin.Context) {
return return
} }
c.JSON(http.StatusOK, certModel) getCert(c, certModel)
} }
func AddCert(c *gin.Context) { func AddCert(c *gin.Context) {
var json struct { var json struct {
Name string `json:"name" binding:"required"` Name string `json:"name"`
Domain string `json:"domain" binding:"required"` Domain string `json:"domain" binding:"required"`
SSLCertificatePath string `json:"ssl_certificate_path" binding:"required"` SSLCertificatePath string `json:"ssl_certificate_path" binding:"required"`
SSLCertificateKeyPath string `json:"ssl_certificate_key_path" binding:"required"` SSLCertificateKeyPath string `json:"ssl_certificate_key_path" binding:"required"`
SSLCertification string `json:"ssl_certification"`
SSLCertificationKey string `json:"ssl_certification_key"`
} }
if !BindAndValid(c, &json) { if !BindAndValid(c, &json) {
return return
@ -188,7 +236,35 @@ func AddCert(c *gin.Context) {
return return
} }
c.JSON(http.StatusOK, nil) err = os.MkdirAll(filepath.Dir(json.SSLCertificatePath), 0644)
if err != nil {
ErrHandler(c, err)
return
}
err = os.MkdirAll(filepath.Dir(json.SSLCertificateKeyPath), 0644)
if err != nil {
ErrHandler(c, err)
return
}
if json.SSLCertification != "" {
err = os.WriteFile(json.SSLCertificatePath, []byte(json.SSLCertification), 0644)
if err != nil {
ErrHandler(c, err)
return
}
}
if json.SSLCertificationKey != "" {
err = os.WriteFile(json.SSLCertificateKeyPath, []byte(json.SSLCertificationKey), 0644)
if err != nil {
ErrHandler(c, err)
return
}
}
getCert(c, certModel)
} }
func ModifyCert(c *gin.Context) { func ModifyCert(c *gin.Context) {
@ -196,10 +272,12 @@ func ModifyCert(c *gin.Context) {
certModel, err := model.FirstCertByID(id) certModel, err := model.FirstCertByID(id)
var json struct { var json struct {
Name string `json:"name" binding:"required"` Name string `json:"name"`
Domain string `json:"domain" binding:"required"` Domain string `json:"domain" binding:"required"`
SSLCertificatePath string `json:"ssl_certificate_path" binding:"required"` SSLCertificatePath string `json:"ssl_certificate_path" binding:"required"`
SSLCertificateKeyPath string `json:"ssl_certificate_key_path" binding:"required"` SSLCertificateKeyPath string `json:"ssl_certificate_key_path" binding:"required"`
SSLCertification string `json:"ssl_certification"`
SSLCertificationKey string `json:"ssl_certification_key"`
} }
if !BindAndValid(c, &json) { if !BindAndValid(c, &json) {
@ -223,7 +301,35 @@ func ModifyCert(c *gin.Context) {
return return
} }
c.JSON(http.StatusOK, certModel) err = os.MkdirAll(filepath.Dir(json.SSLCertificatePath), 0644)
if err != nil {
ErrHandler(c, err)
return
}
err = os.MkdirAll(filepath.Dir(json.SSLCertificateKeyPath), 0644)
if err != nil {
ErrHandler(c, err)
return
}
if json.SSLCertification != "" {
err = os.WriteFile(json.SSLCertificatePath, []byte(json.SSLCertification), 0644)
if err != nil {
ErrHandler(c, err)
return
}
}
if json.SSLCertificationKey != "" {
err = os.WriteFile(json.SSLCertificateKeyPath, []byte(json.SSLCertificationKey), 0644)
if err != nil {
ErrHandler(c, err)
return
}
}
GetCert(c)
} }
func RemoveCert(c *gin.Context) { func RemoveCert(c *gin.Context) {
@ -242,5 +348,5 @@ func RemoveCert(c *gin.Context) {
return return
} }
c.JSON(http.StatusOK, nil) c.JSON(http.StatusNoContent, nil)
} }