1Panel-dev/1Panel
1
1
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2025-11-12 12:40:45 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: 修改密码校验正则表达式

Browse source
This commit is contained in:
ssongliu 2023-03-01 19:11:51 +08:00 • committed by ssongliu
parent 701da484c6
commit 651c269041
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
backend/app/service/cronjob_helper.go
View file

@ -96,8 +96,8 @@ func (u *CronjobService) HandleBackup(cronjob *model.Cronjob, startTime time.Tim
return "", err return "", err
} }
record.Type = "mysql" record.Type = "mysql"
record.Name = "mysql" record.Name = app.Name
record.DetailName = app.Name record.DetailName = cronjob.DBName
case "website": case "website":
fileName = fmt.Sprintf("website_%s_%s.tar.gz", cronjob.Website, startTime.Format("20060102150405")) fileName = fmt.Sprintf("website_%s_%s.tar.gz", cronjob.Website, startTime.Format("20060102150405"))
backupDir = fmt.Sprintf("%s/website/%s", localDir, cronjob.Website) backupDir = fmt.Sprintf("%s/website/%s", localDir, cronjob.Website)

2
frontend/src/global/form-rules.ts
View file

@ -19,7 +19,7 @@ const complexityPassword = (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.complexityPassword'))); callback(new Error(i18n.global.t('commons.rule.complexityPassword')));
} else { } else {
const reg = /^(?=.*\d)(?=.*[a-zA-Z])(?=.*[~!@#$%^&*.-_])[\da-zA-Z~!@#$%^&*.-_]{8,}$/; const reg = /^(?![\d]+$)(?![a-zA-Z]+$)(?![^\da-zA-Z]+$).{8,30}$/;
if (!reg.test(value) && value !== '') { if (!reg.test(value) && value !== '') {
callback(new Error(i18n.global.t('commons.rule.complexityPassword'))); callback(new Error(i18n.global.t('commons.rule.complexityPassword')));
} else { } else {

4
frontend/src/lang/modules/en.ts
View file

@ -126,7 +126,7 @@ export default {
imageName: 'Support English, Chinese, numbers, :.-_, length 1-30', imageName: 'Support English, Chinese, numbers, :.-_, length 1-30',
volumeName: 'Support English, numbers, .-_, length 1-30', volumeName: 'Support English, numbers, .-_, length 1-30',
complexityPassword: complexityPassword:
'Please enter a password with more than 8 characters and must contain letters, digits, and special symbols(~!@#$%^&*.-_)', 'Please enter a password with more than 8 characters and at least two combinations of letters, numbers, and special symbols',
commonPassword: 'Please enter a password with more than 6 characters', commonPassword: 'Please enter a password with more than 6 characters',
email: 'Email format error', email: 'Email format error',
number: 'Please enter the correct number', number: 'Please enter the correct number',
@ -734,7 +734,7 @@ export default {
panel: 'Panel', panel: 'Panel',
user: 'UserName', user: 'UserName',
userChange: 'Change username', userChange: 'Change username',
userChangeHelper: 'Change the user name and restart the service. Do you want to continue?', userChangeHelper: 'Change the user name to log out. Do you want to continue?',
passwd: 'Password', passwd: 'Password',
emailHelper: 'For password retrieval', emailHelper: 'For password retrieval',
title: 'Panel alias', title: 'Panel alias',

4
frontend/src/lang/modules/zh.ts
View file

@ -130,7 +130,7 @@ export default {
dbName: '支持英文、中文、数字、.-_,长度1-16', dbName: '支持英文、中文、数字、.-_,长度1-16',
imageName: '支持英文、中文、数字、:.-_,长度1-30', imageName: '支持英文、中文、数字、:.-_,长度1-30',
volumeName: '支持英文、数字、.-和_,长度1-30', volumeName: '支持英文、数字、.-和_,长度1-30',
complexityPassword: '请输入 8 位以上、必须含有字母、数字、特殊符号(~!@#$%^&*.-_)的密码', complexityPassword: '请输入 8 位以上、必须含有字母、数字、特殊符号至少两种组合的密码',
commonPassword: '请输入 6 位以上长度密码', commonPassword: '请输入 6 位以上长度密码',
linuxName: '长度1-30，名称不能含有{0}等符号', linuxName: '长度1-30，名称不能含有{0}等符号',
email: '请输入正确的邮箱', email: '请输入正确的邮箱',
@ -740,7 +740,7 @@ export default {
panel: '面板', panel: '面板',
user: '用户名称', user: '用户名称',
userChange: '修改用户名', userChange: '修改用户名',
userChangeHelper: '修改用户名将重启服务，是否继续？', userChangeHelper: '修改用户名将退出登陆，是否继续？',
passwd: '用户密码', passwd: '用户密码',
emailHelper: '用于密码找回', emailHelper: '用于密码找回',
title: '面板别名', title: '面板别名',