From 05029a3edabb8bdff14782fe23e99509fd3cb5c8 Mon Sep 17 00:00:00 2001 From: ssongliu <73214554+ssongliu@users.noreply.github.com> Date: Wed, 1 Nov 2023 22:25:08 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=B0=83=E6=95=B4=E9=9D=A2=E6=9D=BF?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E6=A0=B7=E5=BC=8F=20(#2765)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/server/server.go | 8 +- frontend/src/lang/modules/en.ts | 1 + frontend/src/lang/modules/tw.ts | 1 + frontend/src/lang/modules/zh.ts | 1 + frontend/src/views/cronjob/record/index.vue | 102 +++++++++----------- frontend/src/views/setting/safe/index.vue | 42 ++++---- 6 files changed, 72 insertions(+), 83 deletions(-) diff --git a/backend/server/server.go b/backend/server/server.go index 075639d11..7d67b1575 100644 --- a/backend/server/server.go +++ b/backend/server/server.go @@ -63,11 +63,13 @@ func Start() { *net.TCPListener } if global.CONF.System.SSL == "enable" { - certificate, err := os.ReadFile(path.Join(global.CONF.System.BaseDir, "1panel/secret/server.crt")) + certPath := path.Join(global.CONF.System.BaseDir, "1panel/secret/server.crt") + keyPath := path.Join(global.CONF.System.BaseDir, "1panel/secret/server.key") + certificate, err := os.ReadFile(certPath) if err != nil { panic(err) } - key, err := os.ReadFile(path.Join(global.CONF.System.BaseDir, "1panel/secret/server.key")) + key, err := os.ReadFile(keyPath) if err != nil { panic(err) } @@ -80,7 +82,7 @@ func Start() { } global.LOG.Infof("listen at https://%s:%s [%s]", global.CONF.System.BindAddress, global.CONF.System.Port, tcpItem) - if err := server.ServeTLS(tcpKeepAliveListener{ln.(*net.TCPListener)}, "", ""); err != nil { + if err := server.ServeTLS(tcpKeepAliveListener{ln.(*net.TCPListener)}, certPath, keyPath); err != nil { panic(err) } } else { diff --git a/frontend/src/lang/modules/en.ts b/frontend/src/lang/modules/en.ts index 267db9967..43b419f0f 100644 --- a/frontend/src/lang/modules/en.ts +++ b/frontend/src/lang/modules/en.ts @@ -1162,6 +1162,7 @@ const message = { bindDomain: 'Bind Domain', unBindDomain: 'Unbind domain', + panelSSL: 'Panel SSL', unBindDomainHelper: 'The action of unbinding a domain name may cause system insecurity. Do you want to continue?', bindDomainHelper: diff --git a/frontend/src/lang/modules/tw.ts b/frontend/src/lang/modules/tw.ts index be3e1198c..a4a14ce72 100644 --- a/frontend/src/lang/modules/tw.ts +++ b/frontend/src/lang/modules/tw.ts @@ -1150,6 +1150,7 @@ const message = { complexityHelper: '開啟後密碼必須滿足密碼長度大於 8 位且包含字母、數字及特殊字符', bindDomain: '域名綁定', unBindDomain: '域名解綁', + panelSSL: '面板 SSL', unBindDomainHelper: '解除域名綁定可能造成系統不安全，是否繼續？', bindDomainHelper: '設置域名綁定後，僅能通過設置中域名訪問 1Panel 服務', bindDomainHelper1: '綁定域名為空時，則取消域名綁定', diff --git a/frontend/src/lang/modules/zh.ts b/frontend/src/lang/modules/zh.ts index 3c5abbc5d..f834dbd49 100644 --- a/frontend/src/lang/modules/zh.ts +++ b/frontend/src/lang/modules/zh.ts @@ -1151,6 +1151,7 @@ const message = { complexityHelper: '开启后密码必须满足密码长度大于 8 位且包含字母、数字及特殊字符', bindDomain: '域名绑定', unBindDomain: '域名解绑', + panelSSL: '面板 SSL', unBindDomainHelper: '解除域名绑定可能造成系统不安全，是否继续？', bindDomainHelper: '设置域名绑定后，仅能通过设置中域名访问 1Panel 服务', bindDomainHelper1: '绑定域名为空时，则取消域名绑定', diff --git a/frontend/src/views/cronjob/record/index.vue b/frontend/src/views/cronjob/record/index.vue index c3b0fba81..806f2f233 100644 --- a/frontend/src/views/cronjob/record/index.vue +++ b/frontend/src/views/cronjob/record/index.vue @@ -126,41 +126,39 @@
-
-
    - - - {{ $t('commons.status.success') }} - - - {{ $t('commons.status.waiting') }} - - - {{ $t('commons.status.failed') }} - - - {{ dateFormat(0, 0, item.startTime) }} - - -
-
- -
+
+ + + + + +
+
+
@@ -318,7 +316,7 @@ :placeholder="$t('cronjob.noLogs')" :indent-with-tab="true" :tabSize="4" - style="height: calc(100vh - 484px); width: 100%; margin-top: 5px" + style="height: calc(100vh - 488px); width: 100%; margin-top: 5px" :lineWrapping="true" :matchBrackets="true" theme="cobalt" @@ -719,36 +717,22 @@ defineExpose({