From 1d53dd8f501a98ddcce8146443b51b357ef5f9b1 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期四, 29 十二月 2022 16:55:46 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/controller/all/SignController.java | 63 +++++++++++++------------------
1 files changed, 26 insertions(+), 37 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 c950e57..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,16 +1,16 @@
package com.lf.server.controller.all;
-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;
import com.lf.server.entity.sys.LoginEntity;
import com.lf.server.entity.sys.TokenEntity;
-import com.lf.server.entity.sys.UsersEntity;
+import com.lf.server.entity.sys.UserEntity;
import com.lf.server.helper.*;
import com.lf.server.service.sys.LoginService;
import com.lf.server.service.sys.TokenService;
-import com.lf.server.service.sys.UsersService;
+import com.lf.server.service.sys.UserService;
import com.lf.server.service.all.SignService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -33,7 +33,7 @@
@RequestMapping("/sign")
public class SignController extends BaseController {
@Autowired
- UsersService userService;
+ UserService userService;
@Autowired
LoginService loginService;
@@ -53,7 +53,7 @@
public ModelAndView toIndex(ModelAndView mv, HttpServletRequest req) {
mv.setViewName("index");
- UsersEntity ue = tokenService.getCurrentUser(req);
+ UserEntity ue = tokenService.getCurrentUser(req);
if (ue != null) {
mv.addObject("msg", "Hello " + ue.getUname() + " !");
}
@@ -78,7 +78,7 @@
mv.setViewName("druid");
try {
- UsersEntity ue = tokenService.getCurrentUser(req);
+ UserEntity ue = tokenService.getCurrentUser(req);
if (ue != null) {
String sessionId = WebHelper.getCookieByKey(StaticData.DRUID_COOKIE_KEY, req);
if (StringHelper.isNull(sessionId)) {
@@ -86,7 +86,7 @@
}
}
} catch (Exception ex) {
- //
+ log.error(ex.getMessage(), ex);
}
return mv;
@@ -99,12 +99,12 @@
try {
mv.setViewName("redirect:/toLogin");
- UsersEntity ue = tokenService.getCurrentUser(req);
+ UserEntity ue = tokenService.getCurrentUser(req);
if (ue != null) {
mv.setViewName("monitor");
}
} catch (Exception ex) {
- //
+ log.error(ex.getMessage(), ex);
}
return mv;
@@ -116,44 +116,33 @@
@ApiImplicitParam(name = "user", value = "鐢ㄦ埗鍚�", dataType = "UsersEntity", paramType = "body", example = "")
})
@PostMapping(value = "/login", produces = "application/json; charset=UTF-8")
- public ResponseMsg<TokenEntity> login(@RequestBody UsersEntity user, HttpServletRequest req, HttpServletResponse res) {
+ 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());
-
- UsersEntity 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);
@@ -190,8 +179,8 @@
Boolean flag = tokenService.isLogin(req, res);
if (flag) {
// 鍐欐棩蹇�
- UsersEntity ue = tokenService.getCurrentUser(req);
- LoginEntity le = loginService.getNewLogin(ue.getId(), 2, req);
+ UserEntity ue = tokenService.getCurrentUser(req);
+ LoginEntity le = loginService.getNewLogin(ue.getId(), 1, 2, 1, req);
Integer rows = loginService.insertLogin(le);
}
@@ -204,9 +193,9 @@
@SysLog()
@ApiOperation(value = "鑾峰彇褰撳墠鐢ㄦ埛")
@GetMapping("/getCurrentUser")
- public ResponseMsg<UsersEntity> getCurrentUser(HttpServletRequest req) {
+ public ResponseMsg<UserEntity> getCurrentUser(HttpServletRequest req) {
try {
- UsersEntity ue = tokenService.getCurrentUser(req);
+ UserEntity ue = tokenService.getCurrentUser(req);
if (ue == null) {
return fail("娌℃湁鎵惧埌", null);
}
--
Gitblit v1.9.3