From b2e4845b84b23aa3f9cc01141c74a8a27c56c17a Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 13 三月 2023 10:52:39 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/controller/all/SignController.java | 52 +++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 41 insertions(+), 11 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 ed684c3..3f2a3e1 100644
--- a/src/main/java/com/lf/server/controller/all/SignController.java
+++ b/src/main/java/com/lf/server/controller/all/SignController.java
@@ -6,11 +6,13 @@
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,6 +47,9 @@
@Autowired
SignService signService;
+
+ @Autowired
+ private OperateService operateService;
@Autowired
PropertiesConfig propertiesConfig;
@@ -138,11 +143,6 @@
return fail("瀵嗙爜涓嶆纭�", null);
}
- int onlineUser = scheduleService.countOnlineUsers();
- if (onlineUser >= SettingData.MAX_USER_LOGIN) {
- return fail("杈惧埌鐢ㄦ埛璁块棶閲忎笂闄愶紝鎷掔粷鐧诲綍", null);
- }
-
LoginEntity le = loginService.getNewLogin(ue.getId(), 1, 1, 1, req);
Integer rows = loginService.insertLogin(le);
if (rows == 0) {
@@ -157,9 +157,12 @@
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);
}
}
@@ -177,7 +180,7 @@
return success(flag ? "鐧诲嚭鎴愬姛" : "鐧诲嚭澶辫触", flag);
} catch (Exception ex) {
- return fail(ex.getMessage(), false);
+ return fail(ex, false);
}
}
@@ -196,7 +199,7 @@
return success(flag ? "鐢ㄦ埛宸茬櫥褰�" : "鐢ㄦ埛鏈櫥褰�", flag);
} catch (Exception ex) {
- return fail(ex.getMessage(), false);
+ return fail(ex, false);
}
}
@@ -212,7 +215,7 @@
return success(ue);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -225,7 +228,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