From 3fac36b394206df5f8002fa32bd360021fec743f Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期四, 09 二月 2023 19:13:13 +0800
Subject: [PATCH] 1

---
 src/main/java/com/lf/server/controller/all/SignController.java |   18 +++++++++++++-----
 1 files changed, 13 insertions(+), 5 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 a6cea0b..6fd0aaa 100644
--- a/src/main/java/com/lf/server/controller/all/SignController.java
+++ b/src/main/java/com/lf/server/controller/all/SignController.java
@@ -1,13 +1,15 @@
 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.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.TokenService;
 import com.lf.server.service.sys.UserService;
@@ -46,6 +48,9 @@
 
     @Autowired
     PropertiesConfig propertiesConfig;
+
+    @Autowired
+    private ScheduleService scheduleService;
 
     @SysLog()
     @ApiOperation(value = "璺宠浆棣栭〉")
@@ -86,7 +91,7 @@
                 }
             }
         } catch (Exception ex) {
-            log.error(ex.getMessage() + ex.getStackTrace() + "\n");
+            log.error(ex.getMessage(), ex);
         }
 
         return mv;
@@ -104,7 +109,7 @@
                 mv.setViewName("monitor");
             }
         } catch (Exception ex) {
-            log.error(ex.getMessage() + ex.getStackTrace() + "\n");
+            log.error(ex.getMessage(), ex);
         }
 
         return mv;
@@ -139,7 +144,7 @@
                 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);
@@ -147,7 +152,10 @@
 
             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);
         }

--
Gitblit v1.9.3