From 4889988b60e906938f41f7f19003e68bdc1b5493 Mon Sep 17 00:00:00 2001 From: letbingo <584460397@qq.com> Date: Tue, 22 Jun 2021 16:49:25 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=89=8B=E6=9C=BA?= =?UTF-8?q?=E5=8F=B7=E9=AA=8C=E8=AF=81=E6=97=B6=E7=9B=B4=E6=8E=A5=E7=94=A8?= =?UTF-8?q?Object=E5=92=8CString=E5=AF=B9=E6=AF=94=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/controller/LoginController.java | 40 +++++++++---------- .../system/controller/SysUserController.java | 2 +- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/LoginController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/LoginController.java index a5c57c1ba..fd972b42b 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/LoginController.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/LoginController.java @@ -87,7 +87,7 @@ public class LoginController { return result; } //update-end-author:taoyan date:20190828 for:校验验证码 - + //1. 校验用户是否有效 //update-begin-author:wangshuai date:20200601 for: 登录代码验证用户是否注销bug，if条件永远为false LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); @@ -98,7 +98,7 @@ public class LoginController { if(!result.isSuccess()) { return result; } - + //2. 校验用户名或密码是否正确 String userpassword = PasswordUtil.encrypt(username, password, sysUser.getSalt()); String syspassword = sysUser.getPassword(); @@ -106,7 +106,7 @@ public class LoginController { result.error500("用户名或密码错误"); return result; } - + //用户登录信息 userInfo(sysUser, result); //update-begin--Author:liusq Date:20210126 for：登录成功，删除redis中的验证码 @@ -118,7 +118,7 @@ public class LoginController { //update-end--Author:wangshuai Date:20200714 for：登录日志没有记录人员 return result; } - + /** * 退出登录 * @param request @@ -152,7 +152,7 @@ public class LoginController { return Result.error("Token无效!"); } } - + /** * 获取访问量 * @return @@ -183,7 +183,7 @@ public class LoginController { result.success("登录成功"); return result; } - + /** * 获取访问量 * @return @@ -204,8 +204,8 @@ public class LoginController { result.setResult(oConvertUtils.toLowerCasePageList(list)); return result; } - - + + /** * 登陆成功选择用户当前部门 * @param user @@ -230,7 +230,7 @@ public class LoginController { /** * 短信登录接口 - * + * * @param jsonObject * @return */ @@ -279,7 +279,7 @@ public class LoginController { } return result; } - + /** * smsmode 短信模板方式 0 .登录模板、1.注册模板、2.忘记密码模板 */ @@ -311,11 +311,11 @@ public class LoginController { } return result; } - + /** * 手机号登录接口 - * + * * @param jsonObject * @return */ @@ -324,17 +324,17 @@ public class LoginController { public Result phoneLogin(@RequestBody JSONObject jsonObject) { Result result = new Result(); String phone = jsonObject.getString("mobile"); - + //校验用户有效性 SysUser sysUser = sysUserService.getUserByPhone(phone); result = sysUserService.checkUserIsEffective(sysUser); if(!result.isSuccess()) { return result; } - + String smscode = jsonObject.getString("captcha"); Object code = redisUtil.get(phone); - if (!smscode.equals(code)) { + if (!smscode.equals(code.toString())) { result.setMessage("手机验证码错误"); return result; } @@ -427,7 +427,7 @@ public class LoginController { } return res; } - + /** * app登录 * @param sysLoginModel @@ -439,14 +439,14 @@ public class LoginController { Result result = new Result(); String username = sysLoginModel.getUsername(); String password = sysLoginModel.getPassword(); - + //1. 校验用户是否有效 SysUser sysUser = sysUserService.getUserByName(username); result = sysUserService.checkUserIsEffective(sysUser); if(!result.isSuccess()) { return result; } - + //2. 校验用户名或密码是否正确 String userpassword = PasswordUtil.encrypt(username, password, sysUser.getSalt()); String syspassword = sysUser.getPassword(); @@ -454,7 +454,7 @@ public class LoginController { result.error500("用户名或密码错误"); return result; } - + String orgCode = sysUser.getOrgCode(); if(oConvertUtils.isEmpty(orgCode)) { //如果当前用户无选择部门 查看部门关联信息 @@ -470,7 +470,7 @@ public class LoginController { JSONObject obj = new JSONObject(); //用户登录信息 obj.put("userInfo", sysUser); - + // 生成token String token = JwtUtil.sign(username, syspassword); // 设置超时时间 diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java index ce20f8e1b..092cc7531 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java @@ -1028,7 +1028,7 @@ public class SysUserController { result.setSuccess(false); return result; } - if(!smscode.equals(object)) { + if(!smscode.equals(object.toString())) { result.setMessage("短信验证码不匹配！"); result.setSuccess(false); return result; -- Gitee From 0a45a904e52b501fb30bf345085a6980b05d287b Mon Sep 17 00:00:00 2001 From: letbingo <584460397@qq.com> Date: Tue, 22 Jun 2021 16:59:05 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E5=A4=84=20Obje?= =?UTF-8?q?ct=20=E7=9B=B4=E6=8E=A5=E6=AF=94=E8=BE=83=20String=20=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/jeecg/modules/system/controller/SysUserController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java index 092cc7531..95e6b556a 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java @@ -987,7 +987,7 @@ public class SysUserController { String phone = jsonObject.getString("phone"); String smscode = jsonObject.getString("smscode"); Object code = redisUtil.get(phone); - if (!smscode.equals(code)) { + if (!smscode.equals(code.toString())) { result.setMessage("手机验证码错误"); result.setSuccess(false); return result; -- Gitee From 9612238ae8564c37042360f88188b4f1c7f5eba2 Mon Sep 17 00:00:00 2001 From: letbingo <584460397@qq.com> Date: Tue, 22 Jun 2021 09:35:32 +0000 Subject: [PATCH 3/4] update README.md. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1a91e9ddc..c8df58ea9 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ JEECG BOOT 低代码开发平台（前后端分离版本） -项目介绍： +项目介绍（test）： -----------------------------------

Java Low Code Platform for Enterprise web applications

-- Gitee From 1855bafabe6c253ec0ea000b6a8b05f38b35df43 Mon Sep 17 00:00:00 2001 From: letbingo <584460397@qq.com> Date: Tue, 22 Jun 2021 09:49:34 +0000 Subject: [PATCH 4/4] update README.md. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c8df58ea9..1a91e9ddc 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ JEECG BOOT 低代码开发平台（前后端分离版本） -项目介绍（test）： +项目介绍： -----------------------------------

Java Low Code Platform for Enterprise web applications

-- Gitee