From 73458a7acff839c68c4f8763bb67decb85dc6ae6 Mon Sep 17 00:00:00 2001 From: dyy <807692433@qq.com> Date: Thu, 1 Aug 2024 16:58:00 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E7=9F=AD?= =?UTF-8?q?=E4=BF=A1=E7=9B=B8=E5=85=B3=E5=8A=9F=E8=83=BD=EF=BC=9A=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E8=AF=AD=E5=8F=A5=E4=BF=AE=E6=94=B9=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../User/UserBLL.cs | 4 ++-- .../Controllers/HomeController.cs | 8 ++++---- .../Controllers/LoginController.cs | 16 ++++++++-------- .../Views/Login/ForgotPassword.js | 2 +- .../Learun.Application.WebApi/Modules/UserApi.cs | 16 ++++++++-------- .../Modules/UsernologinApi.cs | 12 ++++++------ .../Modules/WeixinApi.cs | 2 +- 7 files changed, 30 insertions(+), 30 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Organization/User/UserBLL.cs b/Learun.Framework.Ultimate V7/Learun.Application.Organization/User/UserBLL.cs index 93b540432..eaa7690d4 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Organization/User/UserBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Organization/User/UserBLL.cs @@ -1213,7 +1213,7 @@ namespace Learun.Application.Organization { userEntity = new UserEntity() { - LoginMsg = "账户不存在!", + LoginMsg = "账户或密码错误!", LoginOk = false }; return userEntity; @@ -1235,7 +1235,7 @@ namespace Learun.Application.Organization } else { - userEntity.LoginMsg = "密码和账户名不匹配!"; + userEntity.LoginMsg = "账户或密码错误!"; } } } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/HomeController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/HomeController.cs index f16f2ebde..e8b3efeaa 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/HomeController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/HomeController.cs @@ -716,7 +716,7 @@ namespace Learun.Application.Web.Controllers //短信验证码校验 if (string.IsNullOrEmpty(codeType)) { - return Fail("未指定短信类型。"); + return Fail("短信类型错误。"); } var userId = LoginUserInfo.Get().userId; var mobile = userIBLL.GetEntityByUserId(userId)?.F_Mobile; @@ -755,17 +755,17 @@ namespace Learun.Application.Web.Controllers { if (string.IsNullOrEmpty(codeType)) { - return Fail("未指定短信类型。"); + return Fail("短信类型错误。"); } UserEntity userEntity = null; userEntity = userIBLL.GetEntityByUserId(LoginUserInfo.Get().userId); if (userEntity == null) { - return Fail("用户不存在!"); + return Fail("用户错误!"); } if (string.IsNullOrEmpty(userEntity.F_Mobile)) { - return Fail("用户手机号不存在!"); + return Fail("用户手机号错误!"); } if (!CommonHelper.IsValidMobile(userEntity.F_Mobile)) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/LoginController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/LoginController.cs index ea1291ab6..60500ac13 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/LoginController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/LoginController.cs @@ -1234,21 +1234,21 @@ namespace Learun.Application.Web.Controllers { if (string.IsNullOrEmpty(codeType)) { - return Fail("未指定短信类型。"); + return Fail("短信类型错误。"); } UserEntity userEntity = null; userEntity = userBll.GetEntityByMobile(phone); if (userEntity == null) { - return Fail("用户不存在!"); + return Fail("输入错误!"); } if (string.IsNullOrEmpty(userEntity.F_Mobile)) { - return Fail("用户手机号不存在!"); + return Fail("输入错误!"); } if (!CommonHelper.IsValidMobile(userEntity.F_Mobile)) { - return Fail("手机号格式不正确!"); + return Fail("输入错误!"); } if (codeType == "firstlogin" && userEntity.F_HaveLogMark == true) { @@ -1299,7 +1299,7 @@ namespace Learun.Application.Web.Controllers //短信验证码校验 if (string.IsNullOrEmpty(codeType)) { - return Fail("未指定短信类型。"); + return Fail("短信类型错误。"); } if (string.IsNullOrEmpty(phone)) { @@ -1312,7 +1312,7 @@ namespace Learun.Application.Web.Controllers UserEntity userEntity = userBll.GetEntityByMobile(phone); if (userEntity == null) { - return Fail("用户不存在"); + return Fail("输入错误。"); } userBll.setPassword(userEntity.F_UserId, newpassword); @@ -1336,7 +1336,7 @@ namespace Learun.Application.Web.Controllers //短信验证码校验 if (string.IsNullOrEmpty(codeType)) { - return Fail("未指定短信类型。"); + return Fail("短信类型错误。"); } if (string.IsNullOrEmpty(phone)) { @@ -1350,7 +1350,7 @@ namespace Learun.Application.Web.Controllers UserEntity userEntity = userBll.GetEntityByMobile(phone); if (userEntity == null) { - return Fail("用户不存在!"); + return Fail("输入错误!"); } if (userEntity.F_EnabledMark != 1) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/ForgotPassword.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/ForgotPassword.js index 04166d9be..531323146 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/ForgotPassword.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/ForgotPassword.js @@ -159,7 +159,7 @@ type: "post", success: (res) => { if (res.code == 200) { - $('#updatepwBox .error_info span').text('修改密码成功') + $('#updatepwBox .error_info span').text('密码修改成功') $('#updatepwBox .error_info').show() setTimeout(() => { window.location.href = "/"; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/UserApi.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/UserApi.cs index 210651a36..b968717f3 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/UserApi.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/UserApi.cs @@ -66,7 +66,7 @@ namespace Learun.Application.WebApi MobileVerify mobileVerify = this.GetReqData(); if (string.IsNullOrEmpty(mobileVerify.codeType)) { - return Fail("未指定短信类型。"); + return Fail("短信类型错误。"); } if (string.IsNullOrEmpty(mobileVerify.mobile)) { @@ -93,19 +93,19 @@ namespace Learun.Application.WebApi LoginModel loginModel = this.GetReqData(); if (string.IsNullOrEmpty(loginModel.codeType)) { - return Fail("未指定短信类型。"); + return Fail("短信类型错误。"); } UserEntity userEntity = null; userEntity = userIBLL.GetEntityByUserId(userInfo.userId); if (userEntity == null) { - return Fail("用户不存在!"); + return Fail("用户错误!"); } if (loginModel.codeType == "unbindwx") { if (string.IsNullOrEmpty(userEntity.F_Mobile)) { - return Fail("用户手机号不存在!"); + return Fail("用户手机号错误!"); } loginModel.username = userEntity.F_Mobile; } @@ -323,7 +323,7 @@ namespace Learun.Application.WebApi //短信验证码校验 if (string.IsNullOrEmpty(loginModel.codeType)) { - return Fail("未指定短信类型。"); + return Fail("短信类型错误。"); } if (string.IsNullOrEmpty(loginModel.username)) { @@ -337,7 +337,7 @@ namespace Learun.Application.WebApi UserEntity userEntity = userIBLL.GetEntityByMobile(loginModel.username); if (userEntity == null) { - return Fail("用户不存在!"); + return Fail("输入错误!"); } if (userEntity.F_EnabledMark != 1) { @@ -490,7 +490,7 @@ namespace Learun.Application.WebApi MobileVerify mobileVerify = this.GetReqData(); if (string.IsNullOrEmpty(mobileVerify.codeType)) { - return Fail("未指定短信类型。"); + return Fail("短信类型错误。"); } if (mobileVerify.codeType == "unbindwx") { @@ -522,7 +522,7 @@ namespace Learun.Application.WebApi MobileVerify mobileVerify = this.GetReqData(); if (string.IsNullOrEmpty(mobileVerify.codeType)) { - return Fail("未指定短信类型。"); + return Fail("短信类型错误。"); } if (string.IsNullOrEmpty(mobileVerify.mobile)) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/UsernologinApi.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/UsernologinApi.cs index 51e83bfec..a91bdfb41 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/UsernologinApi.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/UsernologinApi.cs @@ -58,7 +58,7 @@ namespace Learun.Application.WebApi MobileVerify mobileVerify = this.GetReqData(); if (string.IsNullOrEmpty(mobileVerify.codeType)) { - return Fail("未指定短信类型。"); + return Fail("短信类型错误。"); } if (string.IsNullOrEmpty(mobileVerify.mobile)) { @@ -85,7 +85,7 @@ namespace Learun.Application.WebApi LoginModel loginModel = this.GetReqData(); if (string.IsNullOrEmpty(loginModel.codeType)) { - return Fail("未指定短信类型。"); + return Fail("短信类型错误。"); } UserEntity userEntity = null; if (loginModel.codeType == "bindwx") @@ -98,15 +98,15 @@ namespace Learun.Application.WebApi } if (userEntity == null) { - return Fail("用户不存在!"); + return Fail("输入错误!"); } if (string.IsNullOrEmpty(userEntity.F_Mobile)) { - return Fail("用户手机号不存在!"); + return Fail("输入错误!"); } if (!CommonHelper.IsValidMobile(userEntity.F_Mobile)) { - return Fail("手机号格式不正确!"); + return Fail("输入错误!"); } if (loginModel.codeType == "firstlogin" && userEntity.F_HaveLogMark == true) { @@ -157,7 +157,7 @@ namespace Learun.Application.WebApi UserEntity userEntity = userIBLL.GetEntityByMobile(modifyModel.phone); if (userEntity == null) { - return Fail("用户不存在"); + return Fail("输入错误"); } userIBLL.setPassword(userEntity.F_UserId, modifyModel.newpassword); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/WeixinApi.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/WeixinApi.cs index 664a6ae83..f0e2433b0 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/WeixinApi.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/WeixinApi.cs @@ -189,7 +189,7 @@ namespace Learun.Application.WebApi.Modules //短信验证码校验 if (string.IsNullOrEmpty(loginModel.codeType)) { - return Fail("未指定短信类型。"); + return Fail("短信类型错误。"); } var mobiletemp = string.Empty; if (loginModel.codeType == "bindwx")