Browse Source

fix: 修复编辑证书,秘钥算法没有回显的问题 (#5301)

Refs https://github.com/1Panel-dev/1Panel/issues/5299
pull/5303/head
zhengkunwang 6 months ago committed by GitHub
parent
commit
0118fbb944
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 4
      frontend/src/lang/modules/en.ts
  2. 4
      frontend/src/lang/modules/tw.ts
  3. 4
      frontend/src/lang/modules/zh.ts
  4. 1
      frontend/src/views/website/ssl/create/index.vue
  5. 13
      frontend/src/views/website/website/config/basic/index.vue
  6. 14
      frontend/src/views/website/website/config/basic/site-folder/index.vue

4
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',

4
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: '前端請求路徑',

4
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: '前端请求路径',

1
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();

13
frontend/src/views/website/website/config/basic/index.vue

@ -37,7 +37,7 @@
</template>
<script lang="ts" setup name="Basic">
import { computed, onMounted, ref } from 'vue';
import { computed, onMounted, ref, watch } from 'vue';
import Domain from './domain/index.vue';
import Default from './default-doc/index.vue';
@ -62,5 +62,14 @@ const id = computed(() => {
});
const tabIndex = ref('0');
onMounted(() => {});
watch(tabIndex, (newVal) => {
localStorage.setItem('site-tabIndex', newVal);
});
onMounted(() => {
const storedTabIndex = localStorage.getItem('site-tabIndex');
if (storedTabIndex !== null) {
tabIndex.value = storedTabIndex;
}
});
</script>

14
frontend/src/views/website/website/config/basic/site-folder/index.vue

@ -50,19 +50,11 @@
</el-space>
</el-form-item>
</el-form>
<el-alert :closable="false" v-if="configDir">
<template #default>
<span class="warnHelper">{{ $t('website.runUserHelper') }}</span>
</template>
</el-alert>
<el-alert :closable="false" type="error" v-if="dirConfig.msg != ''">
<template #default>
<span class="warnHelper">{{ dirConfig.msg }}</span>
</template>
</el-alert>
<el-text type="warning" v-if="configDir">{{ $t('website.runUserHelper') }}</el-text>
<br />
<el-text type="danger" v-if="dirConfig.msg != ''">{{ dirConfig.msg }}</el-text>
<br />
<el-descriptions :title="$t('website.folderTitle')" :column="1" border>
<el-descriptions-item label="waf">{{ $t('website.wafFolder') }}</el-descriptions-item>
<el-descriptions-item label="ssl">{{ $t('website.sslFolder') }}</el-descriptions-item>
<el-descriptions-item label="log">{{ $t('website.logFolder') }}</el-descriptions-item>
<el-descriptions-item label="index">{{ $t('website.indexFolder') }}</el-descriptions-item>

Loading…
Cancel
Save