From 0118fbb9444a4359bb41f05f632b960869772d7d Mon Sep 17 00:00:00 2001 From: zhengkunwang <31820853+zhengkunwang223@users.noreply.github.com> Date: Wed, 5 Jun 2024 16:48:10 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E8=AF=81=E4=B9=A6=EF=BC=8C=E7=A7=98=E9=92=A5=E7=AE=97=E6=B3=95?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=9B=9E=E6=98=BE=E7=9A=84=E9=97=AE=E9=A2=98?= =?UTF-8?q?=20(#5301)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Refs https://github.com/1Panel-dev/1Panel/issues/5299 --- frontend/src/lang/modules/en.ts | 4 ++-- frontend/src/lang/modules/tw.ts | 4 ++-- frontend/src/lang/modules/zh.ts | 4 ++-- frontend/src/views/website/ssl/create/index.vue | 1 + .../views/website/website/config/basic/index.vue | 13 +++++++++++-- .../website/config/basic/site-folder/index.vue | 14 +++----------- 6 files changed, 21 insertions(+), 19 deletions(-) diff --git a/frontend/src/lang/modules/en.ts b/frontend/src/lang/modules/en.ts index 3692a66f0..029ea8a4a 100644 --- a/frontend/src/lang/modules/en.ts +++ b/frontend/src/lang/modules/en.ts @@ -1874,7 +1874,7 @@ const message = { sitePath: 'Website Directory', siteAlias: 'Site Alias', primaryPath: 'Root directory', - folderTitle: 'The website mainly contains four folders', + folderTitle: 'The website mainly contains the following folders', wafFolder: 'Firewall Rules', indexFolder: 'Website root directory', logFolder: 'website log', @@ -1938,7 +1938,7 @@ const message = { 'If the website cannot be accessed normally after setting pseudo-static, please try to set it back to default', runDir: 'Run Directory', runUserHelper: - 'For websites deployed through the PHP runtime environment, all files, folder owners, and user groups under the index and subdirectories need to be set to 1000, command: chown -R 1000:1000 index', + 'For websites deployed through the PHP container runtime environment, you need to set the owner and user group of all files and folders under index and subdirectories to 1000. For the local PHP environment, refer to the local PHP-FPM user and user group settings', userGroup: 'User/Group', uGroup: 'Group', proxyPath: 'Proxy Path', diff --git a/frontend/src/lang/modules/tw.ts b/frontend/src/lang/modules/tw.ts index 84efca355..f2195046f 100644 --- a/frontend/src/lang/modules/tw.ts +++ b/frontend/src/lang/modules/tw.ts @@ -1746,7 +1746,7 @@ const message = { sitePath: '網站目錄', siteAlias: '網站代號', primaryPath: 'root 目錄', - folderTitle: '網站主要包含四個文件夾', + folderTitle: '網站主要包含以下資料夾', wafFolder: '防火墻規則', indexFolder: '網站root目錄', logFolder: '網站日誌', @@ -1807,7 +1807,7 @@ const message = { rewriteHelper: '若設置偽靜態後，網站無法正常訪問，請嘗試設置回default', runDir: '運行目錄', runUserHelper: - '通過 PHP 運行環境部署的網站，需要將 index 和子目錄下的所有文件、文件夾所有者和用戶組設置為 1000', + '透過 PHP 容器運行環境部署的網站，需要將 index 和子目錄下的所有檔案、資料夾擁有者和使用者群組設定為 1000，本地 PHP 環境需要參考本機 PHP-FPM 使用者和使用者群組設定', userGroup: '運行用戶/組', uGroup: '用戶組', proxyPath: '前端請求路徑', diff --git a/frontend/src/lang/modules/zh.ts b/frontend/src/lang/modules/zh.ts index 5f8caff2d..eb1af8ac4 100644 --- a/frontend/src/lang/modules/zh.ts +++ b/frontend/src/lang/modules/zh.ts @@ -1747,7 +1747,7 @@ const message = { sitePath: '网站目录', siteAlias: '网站代号', primaryPath: 'root 目录', - folderTitle: '网站主要包含四个文件夹', + folderTitle: '网站主要包含以下文件夹', wafFolder: '防火墙规则', indexFolder: '网站 root 目录（PHP 运行环境 静态网站代码存放目录）', logFolder: '网站日志', @@ -1808,7 +1808,7 @@ const message = { rewriteHelper: '若设置伪静态后，网站无法正常访问，请尝试设置回default', runDir: '运行目录', runUserHelper: - '通过 PHP 运行环境部署的网站，需要将 index 和子目录下的所有文件、文件夹所有者和用户组设置为 1000', + '通过 PHP 容器运行环境部署的网站，需要将 index 和子目录下的所有文件、文件夹所有者和用户组设置为 1000，本地 PHP 环境需要参考本地 PHP-FPM 用户和用户组设置', userGroup: '运行用户/组', uGroup: '用户组', proxyPath: '前端请求路径', diff --git a/frontend/src/views/website/ssl/create/index.vue b/frontend/src/views/website/ssl/create/index.vue index 383f271d4..8ab28bb48 100644 --- a/frontend/src/views/website/ssl/create/index.vue +++ b/frontend/src/views/website/ssl/create/index.vue @@ -264,6 +264,7 @@ const acceptParams = (op: string, websiteSSL: Website.SSLDTO) => { ssl.value.disableCNAME = websiteSSL.disableCNAME; ssl.value.nameserver1 = websiteSSL.nameserver1; ssl.value.nameserver2 = websiteSSL.nameserver2; + ssl.value.keyType = websiteSSL.keyType; } ssl.value.websiteId = Number(id.value); getAcmeAccounts(); diff --git a/frontend/src/views/website/website/config/basic/index.vue b/frontend/src/views/website/website/config/basic/index.vue index de8ded5f5..3d5fb99ec 100644 --- a/frontend/src/views/website/website/config/basic/index.vue +++ b/frontend/src/views/website/website/config/basic/index.vue @@ -37,7 +37,7 @@ diff --git a/frontend/src/views/website/website/config/basic/site-folder/index.vue b/frontend/src/views/website/website/config/basic/site-folder/index.vue index 9439c200c..50a5af458 100644 --- a/frontend/src/views/website/website/config/basic/site-folder/index.vue +++ b/frontend/src/views/website/website/config/basic/site-folder/index.vue @@ -50,19 +50,11 @@ - - - - - - + {{ $t('website.runUserHelper') }} +
+ {{ dirConfig.msg }}
- {{ $t('website.wafFolder') }} {{ $t('website.sslFolder') }} {{ $t('website.logFolder') }} {{ $t('website.indexFolder') }}