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

Refs https://github.com/1Panel-dev/1Panel/issues/5299
pull/5303/head
zhengkunwang 2024-06-05 16:48:10 +08:00 committed by GitHub
parent dba5302d68
commit 0118fbb944
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 21 additions and 19 deletions

View File

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

View File

@ -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: '',

View File

@ -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: '',

View File

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

View File

@ -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>

View File

@ -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>