diff --git a/Api/Ewide.Core/Service/Auth/AuthService.cs b/Api/Ewide.Core/Service/Auth/AuthService.cs index 08c6da5..5728f2d 100644 --- a/Api/Ewide.Core/Service/Auth/AuthService.cs +++ b/Api/Ewide.Core/Service/Auth/AuthService.cs @@ -107,12 +107,7 @@ namespace Ewide.Core.Service var pattern = App.Configuration.GetSection("SimplePassword:Pattern").Value; if (!Regex.Match(newPassword, pattern).Success) { - return new LoginOutput - { - Passed = false, - Pattern = pattern, - Descriptions = App.Configuration.GetSection("SimplePassword:Descriptions").Value - }; + throw Oops.Oh("新密码强度不符合规则"); } newPassword = MD5Encryption.Encrypt(newPassword); diff --git a/web-react/src/views/login/index.jsx b/web-react/src/views/login/index.jsx index ce8ca80..0e9b331 100644 --- a/web-react/src/views/login/index.jsx +++ b/web-react/src/views/login/index.jsx @@ -197,7 +197,7 @@ export default class index extends Component { label="新密码" rules={[ { required: true, message: '请输入新密码' }, - // { pattern, message: '密码格式错误' }, + { pattern, message: '密码格式错误' }, ]} name="newPassword" tooltip={descriptions}