From ed8c7a5effd0d423ce1118b680ecdca6fe732609 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 02 七月 2025 16:43:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.11.205:9000/r/P2022036_Service
---
src/main/java/com/lf/server/controller/all/SignController.java | 80 +++++++++++++++++++++++++++++----------
1 files changed, 59 insertions(+), 21 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 ec4b248..a5abd72 100644
--- a/src/main/java/com/lf/server/controller/all/SignController.java
+++ b/src/main/java/com/lf/server/controller/all/SignController.java
@@ -1,14 +1,18 @@
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.SettingData;
import com.lf.server.entity.all.StaticData;
import com.lf.server.entity.sys.LoginEntity;
+import com.lf.server.entity.sys.OperateEntity;
import com.lf.server.entity.sys.TokenEntity;
import com.lf.server.entity.sys.UserEntity;
import com.lf.server.helper.*;
+import com.lf.server.service.all.ScheduleService;
import com.lf.server.service.sys.LoginService;
+import com.lf.server.service.sys.OperateService;
import com.lf.server.service.sys.TokenService;
import com.lf.server.service.sys.UserService;
import com.lf.server.service.all.SignService;
@@ -45,7 +49,13 @@
SignService signService;
@Autowired
+ private OperateService operateService;
+
+ @Autowired
PropertiesConfig propertiesConfig;
+
+ @Autowired
+ private ScheduleService scheduleService;
@SysLog()
@ApiOperation(value = "璺宠浆棣栭〉")
@@ -86,7 +96,7 @@
}
}
} catch (Exception ex) {
- log.error(ex.getMessage() + ex.getStackTrace() + "\n");
+ log.error(ex.getMessage(), ex);
}
return mv;
@@ -104,7 +114,7 @@
mv.setViewName("monitor");
}
} catch (Exception ex) {
- log.error(ex.getMessage() + ex.getStackTrace() + "\n");
+ log.error(ex.getMessage(), ex);
}
return mv;
@@ -125,34 +135,35 @@
UserEntity ue = userService.selectByUid(user.getUid());
if (ue == null) {
- return fail("鐢ㄦ埛鍚嶄笉瀛樺湪锛�", null);
+ 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);
- if (!Md5Helper.validatePassword(user.getPwd(), ue.getPwd())) {
- tokenService.setPwdErrCache(ue);
- le.setStatus(0);
- le.setDescr("瀵嗙爜閿欒");
- loginService.insertLogin(le);
- return fail("瀵嗙爜涓嶆纭紒", null);
- }
-
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);
}
+ te.setAutoLogOut(SettingData.AUTO_LOGOUT);
tokenService.saveToken(ue, te, req, res);
- return success(te);
+ int onlineUser = scheduleService.countOnlineUsers();
+ String msg = onlineUser >= SettingData.MAX_USER_LOGIN ? "璀﹀憡锛氱郴缁熷凡缁忓埌杈剧敤鎴疯闂噺鐨勪笂闄愶紒" : "";
+
+ return success(msg, te);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -170,7 +181,7 @@
return success(flag ? "鐧诲嚭鎴愬姛" : "鐧诲嚭澶辫触", flag);
} catch (Exception ex) {
- return fail(ex.getMessage(), false);
+ return fail(ex, false);
}
}
@@ -189,7 +200,7 @@
return success(flag ? "鐢ㄦ埛宸茬櫥褰�" : "鐢ㄦ埛鏈櫥褰�", flag);
} catch (Exception ex) {
- return fail(ex.getMessage(), false);
+ return fail(ex, false);
}
}
@@ -205,7 +216,7 @@
return success(ue);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -218,7 +229,34 @@
return success(key);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
+ }
+ }
+
+ @ApiOperation(value = "鎻掑叆鎿嶄綔鏃ュ織")
+ @GetMapping("/insertOpLog")
+ public ResponseMsg<Object> insertOpLog(String m1, String m2, HttpServletRequest req) {
+ try {
+ if (StringHelper.isEmpty(m1)) {
+ return fail("涓�绾фā鍧楀繀濉�", 0);
+ }
+
+ OperateEntity oe = new OperateEntity();
+ oe.setIp(WebHelper.getIpAddress(req));
+ oe.setModular1(m1);
+ oe.setModular2(m2);
+ oe.setType(0);
+
+ UserEntity ue = tokenService.getCurrentUser(req);
+ if (ue != null) {
+ oe.setUserid(ue.getId());
+ }
+
+ int rows = operateService.insertOperate(oe);
+
+ return success(rows);
+ } catch (Exception ex) {
+ return fail(ex, 0);
}
}
}
--
Gitblit v1.9.3