1
0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2025-02-12 11:30:07 +08:00

feat: 基本名称名称长度限制增加到 128 (#1658)

This commit is contained in:
zhengkunwang 2023-07-14 11:48:11 +08:00 committed by GitHub
parent cd6e5f7905
commit c9ffd2564e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 10 deletions

View File

@ -174,7 +174,7 @@ const checkLinuxName = (rule: any, value: any, callback: any) => {
if (value === '' || typeof value === 'undefined' || value == null) { if (value === '' || typeof value === 'undefined' || value == null) {
callback(new Error(i18n.global.t('commons.rule.linuxName', ['/\\:*?\'"<>|']))); callback(new Error(i18n.global.t('commons.rule.linuxName', ['/\\:*?\'"<>|'])));
} else { } else {
const reg = /^[^/\\\"'|<>?*]{1,30}$/; const reg = /^[^/\\\"'|<>?*]{1,128}$/;
if (!reg.test(value) && value !== '') { if (!reg.test(value) && value !== '') {
callback(new Error(i18n.global.t('commons.rule.linuxName', ['/\\:*?\'"<>|']))); callback(new Error(i18n.global.t('commons.rule.linuxName', ['/\\:*?\'"<>|'])));
} else { } else {
@ -402,7 +402,7 @@ const checkParamSimple = (rule: any, value: any, callback: any) => {
if (value === '' || typeof value === 'undefined' || value == null) { if (value === '' || typeof value === 'undefined' || value == null) {
callback(); callback();
} else { } else {
const reg = /^[a-z0-9][a-z0-9]{1,64}$/; const reg = /^[a-z0-9][a-z0-9]{1,128}$/;
if (!reg.test(value) && value !== '') { if (!reg.test(value) && value !== '') {
callback(new Error(i18n.global.t('commons.rule.paramSimple'))); callback(new Error(i18n.global.t('commons.rule.paramSimple')));
} else { } else {

View File

@ -159,6 +159,7 @@ const message = {
complexityPassword: complexityPassword:
'Longer than eight characters and contains at least two combinations of letters, digits, and special characters', 'Longer than eight characters and contains at least two combinations of letters, digits, and special characters',
commonPassword: 'Please enter a password with more than 6 characters', commonPassword: 'Please enter a password with more than 6 characters',
linuxName: 'Length 1-128, the name cannot contain symbols such as {0}',
email: 'Email format error', email: 'Email format error',
number: 'Please enter the correct number', number: 'Please enter the correct number',
integer: 'Please enter the correct positive integer', integer: 'Please enter the correct positive integer',
@ -180,7 +181,7 @@ const message = {
'Supports letters, numbers, underscores, hyphens and dots, cannot end with hyphen- or dot.1-127', 'Supports letters, numbers, underscores, hyphens and dots, cannot end with hyphen- or dot.1-127',
disableFunction: 'Only support letters and,', disableFunction: 'Only support letters and,',
leechExts: 'Only support letters, numbers and,', leechExts: 'Only support letters, numbers and,',
paramSimple: 'Support lowercase letters and numbers, length 1-64', paramSimple: 'Support lowercase letters and numbers, length 1-128',
}, },
res: { res: {
paramError: 'The request failed, please try again later!', paramError: 'The request failed, please try again later!',
@ -1614,7 +1615,7 @@ const message = {
laddr: 'Source address/port', laddr: 'Source address/port',
raddr: 'Destination address/port', raddr: 'Destination address/port',
stopProcess: 'End', stopProcess: 'End',
stopProcessWarn: 'Are you sure you want to end this process (PID:{0})? This operation cannot be rolled back', stopProcessWarn: 'Are you sure you want to end this process (PID:{0})? ',
}, },
}; };

View File

@ -159,7 +159,7 @@ const message = {
volumeName: '支持英文數字.-和_,長度2-30', volumeName: '支持英文數字.-和_,長度2-30',
complexityPassword: '請輸入長度大於 8 位且包含字母數字特殊字符至少兩項的密碼組合', complexityPassword: '請輸入長度大於 8 位且包含字母數字特殊字符至少兩項的密碼組合',
commonPassword: '請輸入 6 位以上長度密碼', commonPassword: '請輸入 6 位以上長度密碼',
linuxName: '長度1-30名稱不能含有{0}等符號', linuxName: '長度1-128名稱不能含有{0}等符號',
email: '請輸入正確的郵箱', email: '請輸入正確的郵箱',
number: '請輸入正確的數字', number: '請輸入正確的數字',
integer: '請輸入正確的正整數', integer: '請輸入正確的正整數',
@ -179,7 +179,7 @@ const message = {
containerName: '支持字母數字下劃線連字符和點,不能以連字符-或點.結尾,長度1-127', containerName: '支持字母數字下劃線連字符和點,不能以連字符-或點.結尾,長度1-127',
disableFunction: '僅支持字母和,', disableFunction: '僅支持字母和,',
leechExts: '僅支持字母數字和,', leechExts: '僅支持字母數字和,',
paramSimple: '支持小寫字母和數字,長度1-64', paramSimple: '支持小寫字母和數字,長度 1-128',
}, },
res: { res: {
paramError: '請求失敗,請稍後重試!', paramError: '請求失敗,請稍後重試!',
@ -1530,7 +1530,7 @@ const message = {
laddr: '源地址/端口', laddr: '源地址/端口',
raddr: '目標地址/端口', raddr: '目標地址/端口',
stopProcess: '結束', stopProcess: '結束',
stopProcessWarn: '是否確定結束此進程 (PID:{0})此操作不可回滾', stopProcessWarn: '是否確定結束此進程 (PID:{0})',
}, },
}; };
export default { export default {

View File

@ -159,7 +159,7 @@ const message = {
volumeName: '支持英文数字.-和_,长度2-30', volumeName: '支持英文数字.-和_,长度2-30',
complexityPassword: '请输入长度大于 8 位且包含字母数字特殊字符至少两项的密码组合', complexityPassword: '请输入长度大于 8 位且包含字母数字特殊字符至少两项的密码组合',
commonPassword: '请输入 6 位以上长度密码', commonPassword: '请输入 6 位以上长度密码',
linuxName: '长度1-30名称不能含有{0}等符号', linuxName: '长度1-128名称不能含有{0}等符号',
email: '请输入正确的邮箱', email: '请输入正确的邮箱',
number: '请输入正确的数字', number: '请输入正确的数字',
integer: '请输入正确的正整数', integer: '请输入正确的正整数',
@ -179,7 +179,7 @@ const message = {
containerName: '支持字母数字下划线连字符和点,不能以连字符-或点.结尾,长度1-127', containerName: '支持字母数字下划线连字符和点,不能以连字符-或点.结尾,长度1-127',
disableFunction: '仅支持字母和,', disableFunction: '仅支持字母和,',
leechExts: '仅支持字母数字和,', leechExts: '仅支持字母数字和,',
paramSimple: '支持小写字母和数字,长度1-64', paramSimple: '支持小写字母和数字,长度1-128',
}, },
res: { res: {
paramError: '请求失败,请稍后重试!', paramError: '请求失败,请稍后重试!',
@ -1538,7 +1538,7 @@ const message = {
laddr: '源地址/端口', laddr: '源地址/端口',
raddr: '目标地址/端口', raddr: '目标地址/端口',
stopProcess: '结束', stopProcess: '结束',
stopProcessWarn: '是否确定结束此进程 (PID:{0})此操作不可回滚', stopProcessWarn: '是否确定结束此进程 (PID:{0})',
processName: '进程名称', processName: '进程名称',
}, },
}; };