From 10c1709404f981f4fb87185078fcee616346f5ce Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 17 十月 2022 14:27:22 +0800
Subject: [PATCH] 1

---
 src/main/java/com/lf/server/controller/all/SignController.java |   24 ++++++++----------------
 1 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/lf/server/controller/all/SignController.java b/src/main/java/com/lf/server/controller/all/SignController.java
index 60106ae..8099c6d 100644
--- a/src/main/java/com/lf/server/controller/all/SignController.java
+++ b/src/main/java/com/lf/server/controller/all/SignController.java
@@ -121,27 +121,19 @@
     @PostMapping(value = "/login", produces = "application/json; charset=UTF-8")
     public ResponseMsg<TokenEntity> login(@RequestBody UserEntity user, HttpServletRequest req, HttpServletResponse res) {
         try {
-            if (user == null) {
-                return fail("璇疯緭鍏ョ敤鎴峰悕鍜屽瘑鐮侊紒", null);
-            }
-            if (StringHelper.isEmpty(user.getUid())) {
-                return fail("鐢ㄦ埛鍚嶄笉鑳戒负绌猴紒", null);
-            }
-            if (StringHelper.isEmpty(user.getPwd())) {
-                return fail("瀵嗙爜涓嶈兘涓虹┖锛�", null);
+            String str = userService.validateNewPwd(user);
+            if (str != null) {
+                return fail(str, null);
             }
 
-            // 瑙e瘑
-            String uid = RsaHelper.decrypt(user.getUid());
-            String pwd = RsaHelper.decrypt(user.getPwd());
-
-            UserEntity ue = userService.selectByUid(uid);
+            UserEntity ue = userService.selectByUid(user.getUid());
             if (ue == null) {
                 return fail("鐢ㄦ埛鍚嶄笉瀛樺湪锛�", null);
             }
 
-            LoginEntity le = loginService.getNewLogin(ue.getId(), 1, req);
-            if (!Md5Helper.validatePassword(pwd, ue.getPwd())) {
+            LoginEntity le = loginService.getNewLogin(ue.getId(), 1, 1, 1, req);
+            if (!Md5Helper.validatePassword(user.getPwd(), ue.getPwd())) {
+                tokenService.setPwdErrCache(ue);
                 le.setStatus(0);
                 le.setDescr("瀵嗙爜閿欒");
                 loginService.insertLogin(le);
@@ -194,7 +186,7 @@
             if (flag) {
                 // 鍐欐棩蹇�
                 UserEntity ue = tokenService.getCurrentUser(req);
-                LoginEntity le = loginService.getNewLogin(ue.getId(), 2, req);
+                LoginEntity le = loginService.getNewLogin(ue.getId(), 1, 2, 1, req);
                 Integer rows = loginService.insertLogin(le);
             }
 

--
Gitblit v1.9.3