From 9d25cb0ec78260a283b06fd96bc7b156f32cf9df Mon Sep 17 00:00:00 2001
From: Surpriseplus <845948745@qq.com>
Date: 星期五, 30 九月 2022 14:28:52 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/controller/sys/SignController.java | 71 +++++++++++++++++------------------
1 files changed, 35 insertions(+), 36 deletions(-)
diff --git a/src/main/java/com/lf/server/controller/sys/SignController.java b/src/main/java/com/lf/server/controller/sys/SignController.java
index 72c30ce..a30f99e 100644
--- a/src/main/java/com/lf/server/controller/sys/SignController.java
+++ b/src/main/java/com/lf/server/controller/sys/SignController.java
@@ -86,14 +86,13 @@
return fail("鐢ㄦ埛鍚嶄笉瀛樺湪锛�", null);
}
- LoginEntity le = loginService.getNewLogin(ue.getId(), req);
+ LoginEntity le = loginService.getNewLogin(ue.getId(), 1, req);
if (!user.getPwd().equals(ue.getPwd())) {
le.setStatus(0);
le.setDescr("瀵嗙爜閿欒");
loginService.insertLogin(le);
return fail("瀵嗙爜涓嶆纭紒", null);
}
- le.setStatus(1);
Integer rows = loginService.insertLogin(le);
if (rows == 0) {
@@ -118,63 +117,63 @@
* 鐧诲嚭
*
* @param req
- * @param res
* @return
*/
@GetMapping(value = "/logout")
- public ResponseMsg<Object> logout(HttpServletRequest req, HttpServletResponse res) {
+ public ResponseMsg<Boolean> logout(HttpServletRequest req) {
try {
String token = WebHelper.getToken(req);
if (StringHelper.isEmpty(token)) {
- return fail("娌℃湁妫�娴嬪埌浠ょ墝", null);
+ return fail("娌℃湁妫�娴嬪埌浠ょ墝", false);
}
- //...
- Boolean flag = tokenService.isLogin(req, res);
+ Boolean flag = tokenService.logout(token, req);
- return success(flag ? "鐢ㄦ埛宸茬櫥褰�" : "鐢ㄦ埛鏈櫥褰�", flag);
+ return success(flag ? "鐧诲嚭鎴愬姛" : "鐧诲嚭澶辫触", flag);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex.getMessage(), false);
}
}
/**
- * 妫�鏌ヤ护鐗�
- *
- * @param req
- * @param res
- * @return
- */
- @GetMapping(value = "/check")
- public ResponseMsg<Object> check(HttpServletRequest req, HttpServletResponse res) {
- try {
- String token = WebHelper.getToken(req);
- if (StringHelper.isEmpty(token)) {
- return fail("娌℃湁妫�娴嬪埌浠ょ墝", null);
- }
-
- //...
- Boolean flag = tokenService.isLogin(req, res);
-
- return success(flag ? "鐢ㄦ埛宸茬櫥褰�" : "鐢ㄦ埛鏈櫥褰�", flag);
- } catch (Exception ex) {
- return fail(ex.getMessage(), null);
- }
- }
-
- /**
- * 鏄惁鐧诲綍
+ * 妫�鏌ユ槸/鍚︾櫥褰�
*
* @return ResponseMsg<String>
*/
- @GetMapping("/isLogin")
- public ResponseMsg<Boolean> isLogin(HttpServletRequest req, HttpServletResponse res) {
+ @GetMapping("/check")
+ public ResponseMsg<Boolean> check(HttpServletRequest req, HttpServletResponse res) {
try {
Boolean flag = tokenService.isLogin(req, res);
+ if (flag) {
+ // 鍐欐棩蹇�
+ UsersEntity ue = tokenService.getCurrentUser(req);
+ LoginEntity le = loginService.getNewLogin(ue.getId(), 2, req);
+ Integer rows = loginService.insertLogin(le);
+ }
return success(flag ? "鐢ㄦ埛宸茬櫥褰�" : "鐢ㄦ埛鏈櫥褰�", flag);
} catch (Exception ex) {
return fail(ex.getMessage(), false);
}
}
+
+ /**
+ * 鑾峰彇褰撳墠鐢ㄦ埛
+ *
+ * @param req
+ * @return
+ */
+ @GetMapping("/getCurrentUser")
+ public ResponseMsg<UsersEntity> getCurrentUser(HttpServletRequest req) {
+ try {
+ UsersEntity ue = tokenService.getCurrentUser(req);
+ if (ue == null) {
+ return fail("娌℃湁鎵惧埌", null);
+ }
+
+ return success(ue);
+ } catch (Exception ex) {
+ return fail(ex.getMessage(), null);
+ }
+ }
}
--
Gitblit v1.9.3