update 验证密码强度,并修改密码,在debug模式下登录不需要正确密码

Api/Ewide.Core/Ewide.Core.xml

@@ -3228,122 +3228,132 @@
             </summary>
             <example>123456</example>
         </member>
-        <member name="T:Ewide.Core.Service.LoginOutput">
+        <member name="P:Ewide.Core.Service.LoginPassInput.NewPassword">
+            <summary>
+            新密码
+            </summary>
+        </member>
+        <member name="P:Ewide.Core.Service.LoginPassInput.Confirm">
+            <summary>
+            确认密码
+            </summary>
+        </member>
+        <member name="T:Ewide.Core.Service.LoginUserOutput">
             <summary>
             用户登录输出参数
             </summary>
         </member>
-        <member name="P:Ewide.Core.Service.LoginOutput.Id">
+        <member name="P:Ewide.Core.Service.LoginUserOutput.Id">
             <summary>
             主键
             </summary>
         </member>
-        <member name="P:Ewide.Core.Service.LoginOutput.Account">
+        <member name="P:Ewide.Core.Service.LoginUserOutput.Account">
             <summary>
             账号
             </summary>
         </member>
-        <member name="P:Ewide.Core.Service.LoginOutput.SecurityLevel">
+        <member name="P:Ewide.Core.Service.LoginUserOutput.SecurityLevel">
             <summary>
             密码安全级别
             </summary>
         </member>
-        <member name="P:Ewide.Core.Service.LoginOutput.NickName">
+        <member name="P:Ewide.Core.Service.LoginUserOutput.NickName">
             <summary>
             昵称
             </summary>
         </member>
-        <member name="P:Ewide.Core.Service.LoginOutput.Name">
+        <member name="P:Ewide.Core.Service.LoginUserOutput.Name">
             <summary>
             姓名
             </summary>
         </member>
-        <member name="P:Ewide.Core.Service.LoginOutput.Avatar">
+        <member name="P:Ewide.Core.Service.LoginUserOutput.Avatar">
             <summary>
             头像
             </summary>
         </member>
-        <member name="P:Ewide.Core.Service.LoginOutput.Birthday">
+        <member name="P:Ewide.Core.Service.LoginUserOutput.Birthday">
             <summary>
             生日
             </summary>
         </member>
-        <member name="P:Ewide.Core.Service.LoginOutput.Sex">
+        <member name="P:Ewide.Core.Service.LoginUserOutput.Sex">
             <summary>
             性别(字典 1男 2女)
             </summary>
         </member>
-        <member name="P:Ewide.Core.Service.LoginOutput.Email">
+        <member name="P:Ewide.Core.Service.LoginUserOutput.Email">
             <summary>
             邮箱
             </summary>
         </member>
-        <member name="P:Ewide.Core.Service.LoginOutput.Phone">
+        <member name="P:Ewide.Core.Service.LoginUserOutput.Phone">
             <summary>
             手机
             </summary>
         </member>
-        <member name="P:Ewide.Core.Service.LoginOutput.Tel">
+        <member name="P:Ewide.Core.Service.LoginUserOutput.Tel">
             <summary>
             电话
             </summary>
         </member>
-        <member name="P:Ewide.Core.Service.LoginOutput.AdminType">
+        <member name="P:Ewide.Core.Service.LoginUserOutput.AdminType">
             <summary>
             管理员类型（0超级管理员 1非管理员）
             </summary>
         </member>
-        <member name="P:Ewide.Core.Service.LoginOutput.LastLoginIp">
+        <member name="P:Ewide.Core.Service.LoginUserOutput.LastLoginIp">
             <summary>
             最后登陆IP
             </summary>
         </member>
-        <member name="P:Ewide.Core.Service.LoginOutput.LastLoginTime">
+        <member name="P:Ewide.Core.Service.LoginUserOutput.LastLoginTime">
             <summary>
             最后登陆时间
             </summary>
         </member>
-        <member name="P:Ewide.Core.Service.LoginOutput.LastLoginAddress">
+        <member name="P:Ewide.Core.Service.LoginUserOutput.LastLoginAddress">
             <summary>
             最后登陆地址
             </summary>
         </member>
-        <member name="P:Ewide.Core.Service.LoginOutput.LastLoginBrowser">
+        <member name="P:Ewide.Core.Service.LoginUserOutput.LastLoginBrowser">
             <summary>
             最后登陆所用浏览器
             </summary>
         </member>
-        <member name="P:Ewide.Core.Service.LoginOutput.LastLoginOs">
+        <member name="P:Ewide.Core.Service.LoginUserOutput.LastLoginOs">
             <summary>
             最后登陆所用系统
             </summary>
         </member>
-        <member name="P:Ewide.Core.Service.LoginOutput.LoginEmpInfo">
+        <member name="P:Ewide.Core.Service.LoginUserOutput.LoginEmpInfo">
             <summary>
             员工信息
             </summary>
         </member>
-        <member name="P:Ewide.Core.Service.LoginOutput.Apps">
+        <member name="P:Ewide.Core.Service.LoginUserOutput.Apps">
             <summary>
             具备应用信息
             </summary>
         </member>
-        <member name="P:Ewide.Core.Service.LoginOutput.Roles">
+        <member name="P:Ewide.Core.Service.LoginUserOutput.Roles">
             <summary>
             角色信息
             </summary>
         </member>
-        <member name="P:Ewide.Core.Service.LoginOutput.Permissions">
+        <member name="P:Ewide.Core.Service.LoginUserOutput.Permissions">
             <summary>
             权限信息
             </summary>
         </member>
-        <member name="P:Ewide.Core.Service.LoginOutput.Menus">
+        <member name="P:Ewide.Core.Service.LoginUserOutput.Menus">
             <summary>
             登录菜单信息---AntDesign版本菜单
             </summary>
         </member>
-        <member name="P:Ewide.Core.Service.LoginOutput.DataScopes">
+        <member name="P:Ewide.Core.Service.LoginUserOutput.DataScopes">
             <summary>
             数据范围（机构）信息
             </summary>

Api/Ewide.Core/Service/Auth/AuthService.cs

@@ -14,6 +14,7 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
+using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using UAParser;
 
@@ -68,20 +69,90 @@ namespace Ewide.Core.Service
         /// <returns></returns>
         [HttpPost("/login")]
         [AllowAnonymous]
-        public async Task<string> LoginAsync([Required] LoginInput input)
+        public async Task<LoginOutput> LoginAsync([Required] LoginInput input)
         {
-            string pwd = RSAHandler.RSADecrypt(input.Password);
+            var password = RSAHandler.RSADecrypt(input.Password);
-            // 获取加密后的密码
-            var encryptPasswod = MD5Encryption.Encrypt(pwd);
 
+            var user = await GetUser(input);
+
+#if !DEBUG
+            // 验证密码强度
+            var pattern = App.Configuration.GetSection("SimplePassword:Pattern").Value;
+            if (!Regex.Match(password, pattern).Success)
+            {
+                return new LoginOutput
+                {
+                    Passed = false,
+                    Pattern = pattern,
+                    Descriptions = App.Configuration.GetSection("SimplePassword:Descriptions").Value
+                };
+            }
+#endif
+
+            return new LoginOutput
+            {
+                Passed = true,
+                Token = await HandlerLoginAsync(user)
+            };
+        }
+
+        [HttpPost("/loginPass")]
+        [AllowAnonymous]
+        public async Task<LoginOutput> LoginPassAsync([Required] LoginPassInput input)
+        {
+            var user = await GetUser(input);
+
+            var newPassword = RSAHandler.RSADecrypt(input.NewPassword);
+            // 验证新密码强度
+            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
+                };
+            }
+
+            newPassword = MD5Encryption.Encrypt(newPassword);
+            if (newPassword.Equals(user.Password))
+                throw Oops.Oh(ErrorCode.D10041);
+
+            user.Password = newPassword;
+
+            return new LoginOutput
+            {
+                Passed = true,
+                Token = await HandlerLoginAsync(user)
+            };
+
+        }
+
+        private async Task<SysUser> GetUser(LoginInput input)
+        {
+            var password = RSAHandler.RSADecrypt(input.Password);
+            // 获取加密后的密码
+            var encryptPasswod = MD5Encryption.Encrypt(password);
+
+#if DEBUG
+            var user = await _sysUserRep.FirstOrDefaultAsync(u => u.Account.Equals(input.Account));
+#else
             // 判断用户名和密码是否正确
             var user = await _sysUserRep.FirstOrDefaultAsync(u => u.Account.Equals(input.Account) && u.Password.Equals(encryptPasswod));
             _ = user ?? throw Oops.Oh(ErrorCode.D1000);
+#endif
 
             // 验证账号是否被冻结
             if (user.Status == CommonStatus.DISABLE)
                 throw Oops.Oh(ErrorCode.D1017);
 
+            return user;
+        }
+
+
+        private async Task<string> HandlerLoginAsync(SysUser user)
+        {
             // 生成Token令牌
             //var accessToken = await _jwtBearerManager.CreateTokenAdmin(user);
             var accessToken = JWTEncryption.Encrypt(new Dictionary<string, object>
@@ -102,38 +173,40 @@ namespace Ewide.Core.Service
             _httpContextAccessor.HttpContext.Response.Headers["x-access-token"] = refreshToken;
 
             // 增加登录日志
-            var loginOutput = user.Adapt<LoginOutput>();
+            var loginUserOutput = user.Adapt<LoginUserOutput>();
             var clent = Parser.GetDefault().Parse(App.GetService<IHttpContextAccessor>().HttpContext.Request.Headers["User-Agent"]);
-            loginOutput.LastLoginBrowser = clent.UA.Family + clent.UA.Major;
+            loginUserOutput.LastLoginBrowser = clent.UA.Family + clent.UA.Major;
-            loginOutput.LastLoginOs = clent.OS.Family + clent.OS.Major;
+            loginUserOutput.LastLoginOs = clent.OS.Family + clent.OS.Major;
             await new SysLogVis
             {
                 Name = "登录",
                 Success = true,
                 Message = "登录成功",
-                Ip = loginOutput.LastLoginIp,
+                Ip = loginUserOutput.LastLoginIp,
-                Browser = loginOutput.LastLoginBrowser,
+                Browser = loginUserOutput.LastLoginBrowser,
-                Os = loginOutput.LastLoginOs,
+                Os = loginUserOutput.LastLoginOs,
                 VisType = 1,
-                VisTime = loginOutput.LastLoginTime,
+                VisTime = loginUserOutput.LastLoginTime,
-                Account = loginOutput.Account
+                Account = loginUserOutput.Account
             }.InsertAsync();
 
             return accessToken;
+
         }
 
+
         /// <summary>
         /// 获取当前登录用户信息
         /// </summary>
         /// <returns></returns>
         [HttpGet("/getLoginUser")]
-        public async Task<LoginOutput> GetLoginUserAsync()
+        public async Task<LoginUserOutput> GetLoginUserAsync()
         {
             var user = _userManager.User;
             var userId = user.Id;
 
             var httpContext = App.GetService<IHttpContextAccessor>().HttpContext;
-            var loginOutput = user.Adapt<LoginOutput>();
+            var loginOutput = user.Adapt<LoginUserOutput>();
 
             // 隐藏手机号/邮箱中间几位
             loginOutput.Phone = String.IsNullOrEmpty(loginOutput.Phone) ? loginOutput.Phone 
@@ -197,7 +270,7 @@ namespace Ewide.Core.Service
             var userId = user.Id;
 
             var httpContext = App.GetService<IHttpContextAccessor>().HttpContext;
-            var loginOutput = user.Adapt<LoginOutput>();
+            var loginOutput = user.Adapt<LoginUserOutput>();
 
 
             var ip = httpContext.Request.Headers["X-Real-IP"];

Api/Ewide.Core/Service/Auth/Dto/LoginInput.cs

@@ -1,4 +1,5 @@
-using Furion.DependencyInjection;
+using Furion;
+using Furion.DependencyInjection;
 using System.ComponentModel.DataAnnotations;
 
 namespace Ewide.Core.Service
@@ -14,13 +15,29 @@ namespace Ewide.Core.Service
         /// </summary>
         /// <example>superAdmin</example>
         [Required(ErrorMessage = "用户名不能为空"), MinLength(3, ErrorMessage = "用户名不能少于3位字符")]
-        public string Account { get; set; }
+        public virtual string Account { get; set; }
 
         /// <summary>
         /// 密码
         /// </summary>
         /// <example>123456</example>
         [Required(ErrorMessage = "密码不能为空"), MinLength(5, ErrorMessage = "密码不能少于5位字符")]
-        public string Password { get; set; }
+        public virtual string Password { get; set; }
+    }
+
+    [SkipScan]
+    public class LoginPassInput : LoginInput
+    {
+        /// <summary>
+        /// 新密码
+        /// </summary>
+        [Required(ErrorMessage = "新密码不能为空")]
+        public string NewPassword { get; set; }
+
+        /// <summary>
+        /// 确认密码
+        /// </summary>
+        [Required(ErrorMessage = "确认密码不能为空"), Compare(nameof(NewPassword), ErrorMessage = "两次密码不一致")]
+        public string Confirm { get; set; }
     }
 }

Api/Ewide.Core/Service/Auth/Dto/LoginOutput.cs

@@ -4,11 +4,20 @@ using System.Collections.Generic;
 
 namespace Ewide.Core.Service
 {
+    [SkipScan]
+    public class LoginOutput
+    {
+        public bool Passed { get; set; }
+        public string Pattern { get; set; }
+        public string Descriptions { get; set; }
+        public string Token { get; set; }
+    }
+
     /// <summary>
     /// 用户登录输出参数
     /// </summary>
     [SkipScan]
-    public class LoginOutput
+    public class LoginUserOutput
     {
         /// <summary>
         /// 主键

Api/Ewide.Core/Service/Auth/IAuthService.cs

@@ -7,8 +7,8 @@ namespace Ewide.Core.Service
     {
         Task<dynamic> GetCaptcha();
         Task<bool> GetCaptchaOpen();
-        Task<LoginOutput> GetLoginUserAsync();
+        Task<LoginUserOutput> GetLoginUserAsync();
-        Task<string> LoginAsync([Required] LoginInput input);
+        Task<LoginOutput> LoginAsync([Required] LoginInput input);
         Task LogoutAsync();
         Task<dynamic> VerificationCode(ClickWordCaptchaInput input);
     }

Api/Ewide.Core/applicationconfig.json

@@ -102,5 +102,10 @@
       "sysNotice:unread",
       "sysNotice:detail"
     ]
+  },
+
+  "SimplePassword": {
+    "Pattern": "(?=.*[0-9])(?=.*[A-Z])(?=.*[a-z])(?=.*[^a-zA-Z0-9]){8,}",
+    "Descriptions": "密码中必须包含大小字母、数字、特称字符，至少8个字符"
   }
 }

web-react/src/common/api/requests/sys/loginManage.js

@@ -3,6 +3,10 @@ const urls = {
      * 登录
      */
     login: ['/login', 'post'],
+    /**
+     * 登录时修改密码
+     */
+    loginPass: ['/loginPass', 'post'],
     /**
      * 登出
      */

web-react/src/views/login/index.jsx

@@ -1,5 +1,5 @@
 import React, { Component } from 'react'
-import { Button, Form, Input, message as Message } from 'antd'
+import { Alert, Button, Form, Input, message as Message, Modal } from 'antd'
 import Container from 'components/container'
 import { encryptByRSA } from 'util/rsa'
 import { RSA_PUBLIC_KEY } from 'util/global'
@@ -14,6 +14,10 @@ export default class index extends Component {
         focusPassword: false,
 
         btnDisabled: true,
+
+        pattern: '',
+        descriptions: '',
+        visible: false,
     }
 
     backgroundImage = require(`assets/image/login-bg-0${Math.floor(Math.random() * 4)}.jpg`)
@@ -33,9 +37,19 @@ export default class index extends Component {
         api.login({ account, password })
             .then(({ success, data, message }) => {
                 if (success) {
-                    token.value = data
+                    const { passed, pattern, descriptions, token } = data
-                    Message.success('登录成功')
+                    // 简单密码需要更改
-                    this.props.history.replace('/')
+                    if (!passed) {
+                        this.setState({
+                            visible: true,
+                            loading: false,
+                            btnDisabled: true,
+                            pattern,
+                            descriptions,
+                        })
+                    } else {
+                        this.onLoginSuccess(token)
+                    }
                 } else {
                     this.setState({ loading: false })
                     Message.error(message)
@@ -49,8 +63,52 @@ export default class index extends Component {
             })
     }
 
+    onLoginPass = values => {
+        this.setState({ loading: true })
+        const account = this.form.current.getFieldValue('account')
+        let { password, newPassword } = values
+        password = encryptByRSA(password, RSA_PUBLIC_KEY)
+        newPassword = encryptByRSA(newPassword, RSA_PUBLIC_KEY)
+        const confirm = newPassword // 前端验证两次密码即可.不需要加密
+
+        api.loginPass({ account, password, newPassword, confirm })
+            .then(({ success, data, message }) => {
+                if (success) {
+                    const { passed, pattern, descriptions, token } = data
+                    // 简单密码需要更改
+                    if (!passed) {
+                        this.setState({
+                            visible: true,
+                            loading: false,
+                            btnDisabled: true,
+                            pattern,
+                            descriptions,
+                        })
+                    } else {
+                        this.onLoginSuccess(token)
+                    }
+                } else {
+                    this.setState({ loading: false })
+                    Message.error(message)
+                }
+            })
+            .catch(({ message }) => {
+                if (typeof message === 'object' && message[0]) {
+                    Message.error(message[0].messages[0])
+                }
+                this.setState({ loading: false })
+            })
+    }
+
+    onLoginSuccess(jwtToken) {
+        token.value = jwtToken
+        Message.success('登录成功')
+        this.props.history.replace('/')
+    }
+
     render() {
-        const { loading, focusUser, focusPassword, btnDisabled } = this.state
+        const { loading, focusUser, focusPassword, btnDisabled, visible, pattern, descriptions } =
+            this.state
 
         return (
             <div className="yo-login">
@@ -121,6 +179,54 @@ export default class index extends Component {
                         </Form>
                     </Container>
                 </div>
+                <Modal visible={visible} closable={false} footer={false}>
+                    <Alert type="error" message="密码过于简单，请修改密码！" />
+                    <br />
+                    <Form className="yo-form" onFinish={this.onLoginPass}>
+                        <div className="yo-form-group">
+                            <Form.Item
+                                label="旧密码"
+                                rules={[{ required: true, message: '请输入旧密码' }]}
+                                name="password"
+                            >
+                                <Input.Password autoComplete="off" placeholder="请输入旧密码" />
+                            </Form.Item>
+                            <Form.Item
+                                label="新密码"
+                                rules={[
+                                    { required: true, message: '请输入新密码' },
+                                    // { pattern, message: '密码格式错误' },
+                                ]}
+                                name="newPassword"
+                                tooltip={descriptions}
+                            >
+                                <Input.Password autoComplete="off" placeholder="请输入新密码" />
+                            </Form.Item>
+                            <Form.Item
+                                label="确认新密码"
+                                rules={[
+                                    { required: true, message: '请确认新密码' },
+                                    ({ getFieldValue }) => ({
+                                        validator(_, value) {
+                                            if (!value || getFieldValue('newPassword') === value) {
+                                                return Promise.resolve()
+                                            }
+                                            return Promise.reject(new Error('确认新密码不匹配'))
+                                        },
+                                    }),
+                                ]}
+                                name="confirm"
+                            >
+                                <Input.Password autoComplete="off" placeholder="请确认新密码" />
+                            </Form.Item>
+                        </div>
+                        <Form.Item noStyle>
+                            <Button htmlType="submit" type="primary" block loading={loading}>
+                                确认
+                            </Button>
+                        </Form.Item>
+                    </Form>
+                </Modal>
             </div>
         )
     }