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 | 43 ++++++++++++++++++++++++++++++++++++++-----
1 files changed, 38 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 6fd0aaa..a5abd72 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;
@@ -150,6 +155,7 @@
return fail("鍒涘缓浠ょ墝澶辫触", null);
}
+ te.setAutoLogOut(SettingData.AUTO_LOGOUT);
tokenService.saveToken(ue, te, req, res);
int onlineUser = scheduleService.countOnlineUsers();
@@ -157,7 +163,7 @@
return success(msg, te);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -175,7 +181,7 @@
return success(flag ? "鐧诲嚭鎴愬姛" : "鐧诲嚭澶辫触", flag);
} catch (Exception ex) {
- return fail(ex.getMessage(), false);
+ return fail(ex, false);
}
}
@@ -194,7 +200,7 @@
return success(flag ? "鐢ㄦ埛宸茬櫥褰�" : "鐢ㄦ埛鏈櫥褰�", flag);
} catch (Exception ex) {
- return fail(ex.getMessage(), false);
+ return fail(ex, false);
}
}
@@ -210,7 +216,7 @@
return success(ue);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -223,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