From 9bce48a9f30f7d80c43f43f46d40df20fcb00e15 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期五, 03 二月 2023 09:39:59 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/controller/all/SignController.java | 46 ++++++++++++++++------------------------------
1 files changed, 16 insertions(+), 30 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..e4bf97f 100644
--- a/src/main/java/com/lf/server/controller/all/SignController.java
+++ b/src/main/java/com/lf/server/controller/all/SignController.java
@@ -1,7 +1,6 @@
package com.lf.server.controller.all;
-import com.lf.server.aspect.LogAspect;
-import com.lf.server.aspect.SysLog;
+import com.lf.server.annotation.SysLog;
import com.lf.server.config.PropertiesConfig;
import com.lf.server.entity.all.ResponseMsg;
import com.lf.server.entity.all.StaticData;
@@ -17,8 +16,6 @@
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
@@ -89,7 +86,7 @@
}
}
} catch (Exception ex) {
- log.error(ex.getMessage() + ex.getStackTrace() + "\n");
+ log.error(ex.getMessage(), ex);
}
return mv;
@@ -107,7 +104,7 @@
mv.setViewName("monitor");
}
} catch (Exception ex) {
- log.error(ex.getMessage() + ex.getStackTrace() + "\n");
+ log.error(ex.getMessage(), ex);
}
return mv;
@@ -121,42 +118,31 @@
@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.validateLoginPwd(user);
+ if (str != null) {
+ return fail(str, null);
}
- // 瑙ｅ瘑
- 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);
+ return fail("鐢ㄦ埛鍚嶄笉瀛樺湪", null);
}
- LoginEntity le = loginService.getNewLogin(ue.getId(), 1, req);
- if (!Md5Helper.validatePassword(pwd, ue.getPwd())) {
- le.setStatus(0);
- le.setDescr("瀵嗙爜閿欒");
- loginService.insertLogin(le);
- return fail("瀵嗙爜涓嶆纭紒", null);
+ if (!Md5Helper.validatePassword(user.getPwd(), ue.getPwd())) {
+ tokenService.setPwdErrCache(ue);
+ return fail("瀵嗙爜涓嶆纭�", null);
}
+ LoginEntity le = loginService.getNewLogin(ue.getId(), 1, 1, 1, req);
Integer rows = loginService.insertLogin(le);
if (rows == 0) {
- return fail("鍒涘缓鐧诲綍鏃ュ織澶辫触锛�", null);
+ return fail("鍒涘缓鐧诲綍鏃ュ織澶辫触", null);
}
- TokenEntity te = tokenService.getNewToken(ue.getId(), req);
+ TokenEntity te = tokenService.getNewToken(ue, req);
rows = tokenService.insertToken(te);
if (rows == 0) {
- return fail("鍒涘缓浠ょ墝淇℃伅澶辫触锛�", null);
+ return fail("鍒涘缓浠ょ墝澶辫触", null);
}
tokenService.saveToken(ue, te, req, res);
@@ -194,7 +180,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