diff --git a/backend/app/service/cronjob_helper.go b/backend/app/service/cronjob_helper.go index 94f278f30..89d488422 100644 --- a/backend/app/service/cronjob_helper.go +++ b/backend/app/service/cronjob_helper.go @@ -96,8 +96,8 @@ func (u *CronjobService) HandleBackup(cronjob *model.Cronjob, startTime time.Tim return "", err } record.Type = "mysql" - record.Name = "mysql" - record.DetailName = app.Name + record.Name = app.Name + record.DetailName = cronjob.DBName case "website": fileName = fmt.Sprintf("website_%s_%s.tar.gz", cronjob.Website, startTime.Format("20060102150405")) backupDir = fmt.Sprintf("%s/website/%s", localDir, cronjob.Website) diff --git a/frontend/src/global/form-rules.ts b/frontend/src/global/form-rules.ts index 0194a5d52..f025dd0f7 100644 --- a/frontend/src/global/form-rules.ts +++ b/frontend/src/global/form-rules.ts @@ -19,7 +19,7 @@ const complexityPassword = (rule: any, value: any, callback: any) => { if (value === '' || typeof value === 'undefined' || value == null) { callback(new Error(i18n.global.t('commons.rule.complexityPassword'))); } 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 !== '') { callback(new Error(i18n.global.t('commons.rule.complexityPassword'))); } else { diff --git a/frontend/src/lang/modules/en.ts b/frontend/src/lang/modules/en.ts index 0278297e4..48b4cbf02 100644 --- a/frontend/src/lang/modules/en.ts +++ b/frontend/src/lang/modules/en.ts @@ -126,7 +126,7 @@ export default { imageName: 'Support English, Chinese, numbers, :.-_, length 1-30', volumeName: 'Support English, numbers, .-_, length 1-30', 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', email: 'Email format error', number: 'Please enter the correct number', @@ -734,7 +734,7 @@ export default { panel: 'Panel', user: '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', emailHelper: 'For password retrieval', title: 'Panel alias', diff --git a/frontend/src/lang/modules/zh.ts b/frontend/src/lang/modules/zh.ts index 754f40284..86655da19 100644 --- a/frontend/src/lang/modules/zh.ts +++ b/frontend/src/lang/modules/zh.ts @@ -130,7 +130,7 @@ export default { dbName: '支持英文、中文、数字、.-_,长度1-16', imageName: '支持英文、中文、数字、:.-_,长度1-30', volumeName: '支持英文、数字、.-和_,长度1-30', - complexityPassword: '请输入 8 位以上、必须含有字母、数字、特殊符号(~!@#$%^&*.-_)的密码', + complexityPassword: '请输入 8 位以上、必须含有字母、数字、特殊符号至少两种组合的密码', commonPassword: '请输入 6 位以上长度密码', linuxName: '长度1-30,名称不能含有{0}等符号', email: '请输入正确的邮箱', @@ -740,7 +740,7 @@ export default { panel: '面板', user: '用户名称', userChange: '修改用户名', - userChangeHelper: '修改用户名将重启服务,是否继续?', + userChangeHelper: '修改用户名将退出登陆,是否继续?', passwd: '用户密码', emailHelper: '用于密码找回', title: '面板别名',