From 63374ac2c8af12274381f9e4abffae9e1aa4e9e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=87=AA=E5=B8=A6=E5=A4=A7=E4=BD=AC=E6=B0=94=E5=9C=BA?= <188633308@qq.com> Date: Fri, 2 Jul 2021 20:17:41 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E5=85=81=E8=AE=B8=E6=89=8B=E6=9C=BA?= =?UTF-8?q?=E5=8F=B7/=E9=82=AE=E7=AE=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Api/Ewide.Core/Service/Auth/AuthService.cs | 4 +-- Api/Ewide.Core/Service/User/SysUserService.cs | 32 +++++++++++++++++-- .../src/assets/style/dark/lib/modal.less | 3 ++ .../src/assets/style/dark/pages/login.less | 11 ++++--- .../src/assets/style/default/lib/modal.less | 3 ++ .../src/assets/style/default/pages/login.less | 5 ++- web-react/src/pages/system/user/index.jsx | 6 ++-- web-react/src/views/login/index.jsx | 2 ++ .../src/views/main/_layout/header/notice.jsx | 2 +- 9 files changed, 55 insertions(+), 13 deletions(-) diff --git a/Api/Ewide.Core/Service/Auth/AuthService.cs b/Api/Ewide.Core/Service/Auth/AuthService.cs index b1e7d0f..08c6da5 100644 --- a/Api/Ewide.Core/Service/Auth/AuthService.cs +++ b/Api/Ewide.Core/Service/Auth/AuthService.cs @@ -136,10 +136,10 @@ namespace Ewide.Core.Service var encryptPasswod = MD5Encryption.Encrypt(password); #if DEBUG - var user = await _sysUserRep.FirstOrDefaultAsync(u => u.Account.Equals(input.Account)); + var user = await _sysUserRep.FirstOrDefaultAsync(u => u.Account.Equals(input.Account) || u.Phone.Equals(input.Account) || u.Email.Equals(input.Account)); #else // 判断用户名和密码是否正确 - var user = await _sysUserRep.FirstOrDefaultAsync(u => u.Account.Equals(input.Account) && u.Password.Equals(encryptPasswod)); + var user = await _sysUserRep.FirstOrDefaultAsync(u => (u.Account.Equals(input.Account) || u.Phone.Equals(input.Account) || u.Email.Equals(input.Account)) && u.Password.Equals(encryptPasswod)); _ = user ?? throw Oops.Oh(ErrorCode.D1000); #endif diff --git a/Api/Ewide.Core/Service/User/SysUserService.cs b/Api/Ewide.Core/Service/User/SysUserService.cs index 2a36cb5..74e8478 100644 --- a/Api/Ewide.Core/Service/User/SysUserService.cs +++ b/Api/Ewide.Core/Service/User/SysUserService.cs @@ -111,7 +111,21 @@ namespace Ewide.Core.Service // 数据范围检查 await CheckDataScope(input); - var isExist = await _sysUserRep.AnyAsync(u => u.Account == input.Account, false); + var email = input.Email?.ToLower(); + + var isExist = await _sysUserRep.AnyAsync(u => + input.Account.Equals(u.Account) || + input.Account.Equals(u.Phone) || + input.Account.Equals(u.Email) || + (!string.IsNullOrWhiteSpace(input.Phone) && ( + input.Phone.Equals(u.Account) || + input.Phone.Equals(u.Phone) + )) || + (!string.IsNullOrWhiteSpace(email) && ( + email.Equals(u.Account) || + email.Equals(u.Email) + )) + , false); if (isExist) throw Oops.Oh(ErrorCode.D1003); input.Password = CommonConst.DEFAULT_PASSWORD; var user = input.Adapt(); @@ -171,8 +185,22 @@ namespace Ewide.Core.Service // 数据范围检查 await CheckDataScope(input); + var email = input.Email?.ToLower(); + // 排除自己并且判断与其他是否相同 - var isExist = await _sysUserRep.AnyAsync(u => u.Account == input.Account && u.Id != input.Id, false); + var isExist = await _sysUserRep.AnyAsync(u => + (input.Account.Equals(u.Account) && !input.Id.Equals(u.Id)) || + input.Account.Equals(u.Phone) || + input.Account.Equals(u.Email) || + (!string.IsNullOrWhiteSpace(input.Phone) && ( + input.Phone.Equals(u.Account) || + (input.Phone.Equals(u.Phone) && !input.Id.Equals(u.Id)) + )) || + (!string.IsNullOrWhiteSpace(email) && ( + email.Equals(u.Account) || + (email.Equals(u.Email) && !input.Id.Equals(u.Id)) + )) + , false); if (isExist) throw Oops.Oh(ErrorCode.D1003); var user = input.Adapt(); diff --git a/web-react/src/assets/style/dark/lib/modal.less b/web-react/src/assets/style/dark/lib/modal.less index 8c9c850..f87defd 100644 --- a/web-react/src/assets/style/dark/lib/modal.less +++ b/web-react/src/assets/style/dark/lib/modal.less @@ -36,3 +36,6 @@ width: 26px; height: 26px; } +.ant-modal-mask { + backdrop-filter: blur(3px); +} diff --git a/web-react/src/assets/style/dark/pages/login.less b/web-react/src/assets/style/dark/pages/login.less index b2e8e8e..d4a7bcd 100644 --- a/web-react/src/assets/style/dark/pages/login.less +++ b/web-react/src/assets/style/dark/pages/login.less @@ -46,7 +46,7 @@ padding: @padding-lg; border-radius: @border-radius-base + 2px; - background: linear-gradient(45deg, @white, fade(@white, 80%)); + background: linear-gradient(45deg, @component-background, fade(@component-background, 80%)); } .ant-form-item { margin-bottom: 0; @@ -59,7 +59,7 @@ >label { font-weight: normal !important; - color: fade(@black, 40%); + color: fade(@white, 40%); } } &--label { @@ -69,9 +69,9 @@ } .ant-input, .ant-input-affix-wrapper { - color: fade(@black, 85%); + color: fade(@white, 85%); border-width: 0 0 @border-width-base 0 !important; - border-color: fade(@black, 10%); + border-color: fade(@white, 10%); background-color: transparent; } .ant-input:hover, @@ -83,4 +83,7 @@ border-color: @primary-color; box-shadow: none !important; } + .ant-input::placeholder { + font-size: @font-size-base; + } } diff --git a/web-react/src/assets/style/default/lib/modal.less b/web-react/src/assets/style/default/lib/modal.less index 8c9c850..f87defd 100644 --- a/web-react/src/assets/style/default/lib/modal.less +++ b/web-react/src/assets/style/default/lib/modal.less @@ -36,3 +36,6 @@ width: 26px; height: 26px; } +.ant-modal-mask { + backdrop-filter: blur(3px); +} diff --git a/web-react/src/assets/style/default/pages/login.less b/web-react/src/assets/style/default/pages/login.less index b2e8e8e..636988c 100644 --- a/web-react/src/assets/style/default/pages/login.less +++ b/web-react/src/assets/style/default/pages/login.less @@ -46,7 +46,7 @@ padding: @padding-lg; border-radius: @border-radius-base + 2px; - background: linear-gradient(45deg, @white, fade(@white, 80%)); + background: linear-gradient(45deg, @component-background, fade(@component-background, 80%)); } .ant-form-item { margin-bottom: 0; @@ -83,4 +83,7 @@ border-color: @primary-color; box-shadow: none !important; } + .ant-input::placeholder { + font-size: @font-size-base; + } } diff --git a/web-react/src/pages/system/user/index.jsx b/web-react/src/pages/system/user/index.jsx index 080b4e0..3a29671 100644 --- a/web-react/src/pages/system/user/index.jsx +++ b/web-react/src/pages/system/user/index.jsx @@ -183,10 +183,10 @@ export default class index extends Component { /** * 删除 - * @param {*} record + * @param {*} id */ - onDelete(record) { - this.onAction(apiAction.delete(record), '删除成功') + onDelete(id) { + this.onAction(apiAction.delete({ id }), '删除成功') } //#region 自定义方法 diff --git a/web-react/src/views/login/index.jsx b/web-react/src/views/login/index.jsx index ef7dfa2..ce8ca80 100644 --- a/web-react/src/views/login/index.jsx +++ b/web-react/src/views/login/index.jsx @@ -142,6 +142,7 @@ export default class index extends Component { }} size="large" autoComplete="off" + placeholder={focusUser && '请输入用户名/手机号/邮箱'} /> diff --git a/web-react/src/views/main/_layout/header/notice.jsx b/web-react/src/views/main/_layout/header/notice.jsx index b6f7d9d..d0d2ec6 100644 --- a/web-react/src/views/main/_layout/header/notice.jsx +++ b/web-react/src/views/main/_layout/header/notice.jsx @@ -122,7 +122,7 @@ export default class notice extends Component { > - +