From 7ff265efa43ba3149c0ef2293bdc48e83facad82 Mon Sep 17 00:00:00 2001 From: haozq <1611483981@qq.com> Date: Fri, 13 Dec 2024 14:12:30 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AE=A1=E8=AE=A1=E6=97=A5?= =?UTF-8?q?=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auth/service/SysLoginService.java | 7 ++-- .../auth/service/SysRecordLogService.java | 3 +- .../interceptor/ParamSecureHandler.java | 13 ++++-- .../proteam/controller/DeviceController.java | 1 - .../controller/DeviceLedgerController.java | 1 - .../controller/DutyChildController.java | 3 -- .../proteam/controller/ManageController.java | 1 - .../proteam/controller/NewDutyController.java | 1 - .../controller/PreservationController.java | 1 - .../controller/SysProblemController.java | 1 - .../controller/WeekRiskController.java | 1 - .../monitor/controller/MonitorController.java | 1 - .../controller/TeamNewController.java | 2 - .../system/controller/SysLogsController.java | 6 ++- .../system/controller/SysRoleController.java | 1 - .../system/mapper/SysLogsDao.java | 2 + .../system/service/SysLogsService.java | 7 ++++ .../service/impl/SysLogsServiceImpl.java | 41 +++++++++++++++++++ .../resources/mapper/system/SysLogsMapper.xml | 9 ++++ 19 files changed, 78 insertions(+), 24 deletions(-) diff --git a/securityControl-auth/src/main/java/com/securityControl/auth/service/SysLoginService.java b/securityControl-auth/src/main/java/com/securityControl/auth/service/SysLoginService.java index a6608c8..2a518f4 100644 --- a/securityControl-auth/src/main/java/com/securityControl/auth/service/SysLoginService.java +++ b/securityControl-auth/src/main/java/com/securityControl/auth/service/SysLoginService.java @@ -84,17 +84,16 @@ public class SysLoginService String nowIp= IpUtils.getIpAddr(ServletUtils.getRequest()); Long times= 5L; String hisIp=redisService.getCacheObject("IP:"+user.getUserId().toString()); - if(StringUtils.isNotEmpty(nowIp) && !nowIp.equals(hisIp)){ - recordLogService.recordIpInfo(username, "登陆成功",startTime); + if(StringUtils.isNotEmpty(hisIp) && StringUtils.isNotEmpty(nowIp) && !nowIp.equals(hisIp)){ + recordLogService.recordIpInfo(username, "1",startTime); } redisService.setCacheObject("IP:"+user.getUserId().toString(),nowIp,times, TimeUnit.MINUTES); - if(list==null){ R> menu = remoteUserService.getAllMenuList(user.getUserId()+"", SecurityConstants.INNER); list=menu.getData(); } userInfo.getSysUser().setMenus(list); - recordLogService.recordLogininfor(username,"1","登陆成功",startTime); + recordLogService.recordLogininfor(username,"1","1",startTime); return userInfo; } diff --git a/securityControl-auth/src/main/java/com/securityControl/auth/service/SysRecordLogService.java b/securityControl-auth/src/main/java/com/securityControl/auth/service/SysRecordLogService.java index 8a24ee4..d0d593e 100644 --- a/securityControl-auth/src/main/java/com/securityControl/auth/service/SysRecordLogService.java +++ b/securityControl-auth/src/main/java/com/securityControl/auth/service/SysRecordLogService.java @@ -102,6 +102,7 @@ public class SysRecordLogService { */ public void recordIpInfo(String username,String result,long startTime) { SysLogsInfo sysLogsInfo=new SysLogsInfo(); + sysLogsInfo.setUserName(username); sysLogsInfo.setTitle("登录"); sysLogsInfo.setOperModel("登录"); sysLogsInfo.setOperType("登录"); @@ -110,7 +111,7 @@ public class SysRecordLogService { sysLogsInfo.setOperIp(IpUtils.getIpAddr(ServletUtils.getRequest())); sysLogsInfo.setOperResult(result); sysLogsInfo.setEventType("异常事件"); - sysLogsInfo.setErrReason("登陆成功"); + sysLogsInfo.setErrReason("1"); sysLogsInfo.setOperDetails("IP异常"); sysLogsInfo.setOperParam("{username:"+username+"}"); diff --git a/securityControl-common/securityControl-common-security/src/main/java/com/securityControl/common/security/interceptor/ParamSecureHandler.java b/securityControl-common/securityControl-common-security/src/main/java/com/securityControl/common/security/interceptor/ParamSecureHandler.java index 8a75f9a..63affc0 100644 --- a/securityControl-common/securityControl-common-security/src/main/java/com/securityControl/common/security/interceptor/ParamSecureHandler.java +++ b/securityControl-common/securityControl-common-security/src/main/java/com/securityControl/common/security/interceptor/ParamSecureHandler.java @@ -68,7 +68,7 @@ public class ParamSecureHandler implements AsyncHandlerInterceptor { /** * 越权白名单路径->指定的路径 */ - public static String[] WHITE_URLS= new String[]{"/sys/sysLog/addLogs"}; + public static String[] WHITE_URLS= new String[]{"/sys/logs/addLogs"}; @Resource private RemoteLogService remoteLogService; @@ -193,15 +193,20 @@ public class ParamSecureHandler implements AsyncHandlerInterceptor { sysLogsInfo.setOperTime(DateTimeHelper.getNowTime()); sysLogsInfo.setOperIp(IpUtils.getIpAddr(ServletUtils.getRequest())); - sysLogsInfo.setOperModel(menu); - sysLogsInfo.setTitle(menu); + if(StringHelper.isNotEmpty(menu)){ + sysLogsInfo.setOperModel(menu); + sysLogsInfo.setTitle(menu); + }else { + sysLogsInfo.setOperModel("未知模块"); + sysLogsInfo.setTitle("未知名称"); + } sysLogsInfo.setOperResult("0"); sysLogsInfo.setLogType(2); sysLogsInfo.setEventType("异常事件"); sysLogsInfo.setErrGrade("高"); + sysLogsInfo.setOperMeth(url); sysLogsInfo.setErrReason("越权访问"); sysLogsInfo.setOperDetails("接口未授权"); - sysLogsInfo.setOperModel(url); sysLogsInfo.setOperType("查询"); sysLogsInfo.setTimes("0"); remoteLogService.addSaveSysLog(sysLogsInfo, SecurityConstants.INNER); diff --git a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/DeviceController.java b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/DeviceController.java index 7d7acb1..daa2515 100644 --- a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/DeviceController.java +++ b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/DeviceController.java @@ -77,7 +77,6 @@ public class DeviceController extends BaseController { PageHelper.startPage(deviceVo.getPage(), deviceVo.getLimit()); List deviceList = service.getDeviceList(deviceVo); PageInfo pageInfo = new PageInfo(deviceList); - System.out.println("输出分页后的数据：" + pageInfo.getList()); Map map = new HashMap(16); map.put("code", 200); map.put("msg", ""); diff --git a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/DeviceLedgerController.java b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/DeviceLedgerController.java index b842d2d..aa3a967 100644 --- a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/DeviceLedgerController.java +++ b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/DeviceLedgerController.java @@ -38,7 +38,6 @@ public class DeviceLedgerController extends BaseController { PageHelper.startPage(deviceLedGer.getPage(), deviceLedGer.getLimit()); List deviceList = service.getDeviceLedgerList(deviceLedGer); PageInfo pageInfo = new PageInfo(deviceList); - System.out.println("输出分页后的数据：" + pageInfo.getList()); Map map = new HashMap(16); map.put("code", 200); map.put("msg", ""); diff --git a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/DutyChildController.java b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/DutyChildController.java index a83ff66..c7f53d6 100644 --- a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/DutyChildController.java +++ b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/DutyChildController.java @@ -53,7 +53,6 @@ public class DutyChildController { } List list = service.getProList(vo); PageInfo pageInfo = new PageInfo(list); - System.out.println("输出分页后的数据：" + pageInfo.getList()); Map map = new HashMap(6); map.put("code", 200); map.put("msg", ""); @@ -103,7 +102,6 @@ public class DutyChildController { } List list = service.getWeekList(vo); PageInfo pageInfo = new PageInfo(list); - System.out.println("输出分页后的数据：" + pageInfo.getList()); Map map = new HashMap(6); map.put("code", 200); map.put("msg", ""); @@ -155,7 +153,6 @@ public class DutyChildController { } List list = service.getDayList(vo); PageInfo pageInfo = new PageInfo(list); - System.out.println("输出分页后的数据：" + pageInfo.getList()); Map map = new HashMap(6); map.put("code", 200); map.put("msg", ""); diff --git a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/ManageController.java b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/ManageController.java index 5b5bed3..83ba66c 100644 --- a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/ManageController.java +++ b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/ManageController.java @@ -62,7 +62,6 @@ public class ManageController extends BaseController { PageHelper.startPage(supeConsUserVo.getPage(), supeConsUserVo.getLimit()); List deviceList = service.getPageInfo(supeConsUserVo); PageInfo pageInfo = new PageInfo(deviceList); - System.out.println("输出分页后的数据：" + pageInfo.getList()); Map map = new HashMap(16); map.put("code", 200); map.put("msg", ""); diff --git a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/NewDutyController.java b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/NewDutyController.java index 56e4733..56f7392 100644 --- a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/NewDutyController.java +++ b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/NewDutyController.java @@ -45,7 +45,6 @@ public class NewDutyController { PageHelper.startPage(vo.getPage(), vo.getLimit()); List deviceList = service.getPageList(vo); PageInfo pageInfo = new PageInfo(deviceList); - System.out.println("输出分页后的数据：" + pageInfo.getList()); Map map = new HashMap(16); map.put("code", 200); map.put("msg", ""); diff --git a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/PreservationController.java b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/PreservationController.java index f0fe35b..bd0e518 100644 --- a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/PreservationController.java +++ b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/PreservationController.java @@ -70,7 +70,6 @@ public class PreservationController extends BaseController { PageHelper.startPage(preservationVo.getPage(), preservationVo.getLimit()); List preservationList = service.getProjectPreservation(preservationVo); PageInfo pageInfo = new PageInfo(preservationList); - System.out.println("输出分页后的数据：" + pageInfo.getList()); Map map = new HashMap(16); map.put("code", 200); map.put("msg", ""); diff --git a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/SysProblemController.java b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/SysProblemController.java index a3110b6..ddd8205 100644 --- a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/SysProblemController.java +++ b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/SysProblemController.java @@ -49,7 +49,6 @@ public class SysProblemController { PageHelper.startPage(problemVo.getPage(), problemVo.getLimit()); List deviceList = service.getProblemPage(problemVo); PageInfo pageInfo = new PageInfo(deviceList); - System.out.println("输出分页后的数据：" + pageInfo.getList()); Map map = new HashMap(16); map.put("code", 200); map.put("msg", ""); diff --git a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/WeekRiskController.java b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/WeekRiskController.java index 2fdd65e..4d839bb 100644 --- a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/WeekRiskController.java +++ b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/controller/WeekRiskController.java @@ -42,7 +42,6 @@ public class WeekRiskController { PageHelper.startPage(weekRiskEntity.getPage(), weekRiskEntity.getLimit()); List deviceList = service.getWeekRiskList(weekRiskEntity); PageInfo pageInfo = new PageInfo(deviceList); - System.out.println("输出分页后的数据：" + pageInfo.getList()); Map map = new HashMap(16); map.put("code", 200); map.put("msg", ""); diff --git a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/monitor/controller/MonitorController.java b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/monitor/controller/MonitorController.java index 98ed21c..9c1f6d2 100644 --- a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/monitor/controller/MonitorController.java +++ b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/monitor/controller/MonitorController.java @@ -43,7 +43,6 @@ public class MonitorController extends BaseController { PageHelper.startPage(monitoVo.getPage(), monitoVo.getLimit()); List deviceList = service.getMonitorList(monitoVo); PageInfo pageInfo = new PageInfo(deviceList); - System.out.println("输出分页后的数据：" + pageInfo.getList()); Map map = new HashMap(16); map.put("code", 200); map.put("msg", ""); diff --git a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/newScreen/controller/TeamNewController.java b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/newScreen/controller/TeamNewController.java index bcfb488..16ed60c 100644 --- a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/newScreen/controller/TeamNewController.java +++ b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/newScreen/controller/TeamNewController.java @@ -94,7 +94,6 @@ public class TeamNewController extends BaseController { PageHelper.startPage(cityName.getPage(), cityName.getLimit()); List deviceList = service.getTeamByOrg(cityName); PageInfo pageInfo = new PageInfo(deviceList); - System.out.println("输出分页后的数据：" + pageInfo.getList()); map.put("code", 200); map.put("msg", ""); map.put("count", pageInfo.getTotal()); @@ -131,7 +130,6 @@ public class TeamNewController extends BaseController { PageHelper.startPage(Integer.parseInt(cityName.getPage()), Integer.parseInt(cityName.getLimit())); List deviceList = service.getPersonData(cityName); PageInfo pageInfo = new PageInfo(deviceList); - System.out.println("输出分页后的数据：" + pageInfo.getList()); map.put("code", 200); map.put("msg", ""); map.put("count", pageInfo.getTotal()); diff --git a/securityControl-modules/securityControl-system/src/main/java/com/securityControl/system/controller/SysLogsController.java b/securityControl-modules/securityControl-system/src/main/java/com/securityControl/system/controller/SysLogsController.java index 5c750ec..82a681d 100644 --- a/securityControl-modules/securityControl-system/src/main/java/com/securityControl/system/controller/SysLogsController.java +++ b/securityControl-modules/securityControl-system/src/main/java/com/securityControl/system/controller/SysLogsController.java @@ -48,13 +48,17 @@ public class SysLogsController extends BaseController { return logService.addSaveSysLog(sysLog); } - + @PostMapping("addLogs") + public void addLogs(SysLogsInfo sysLog) { + logService.addLogs(sysLog); + } @PostMapping("saveLogininfor") public AjaxResult saveLogininfor(@RequestBody SysOperLog sysLog) { return logService.saveLogs(sysLog); } + /** * 分页查询（系统日志、业务日志） * diff --git a/securityControl-modules/securityControl-system/src/main/java/com/securityControl/system/controller/SysRoleController.java b/securityControl-modules/securityControl-system/src/main/java/com/securityControl/system/controller/SysRoleController.java index 4be299b..6d46eb6 100644 --- a/securityControl-modules/securityControl-system/src/main/java/com/securityControl/system/controller/SysRoleController.java +++ b/securityControl-modules/securityControl-system/src/main/java/com/securityControl/system/controller/SysRoleController.java @@ -37,7 +37,6 @@ public class SysRoleController { PageHelper.startPage(sysRole.getPage(), sysRole.getLimit()); List studentsList = service.getRoleList(sysRole); PageInfo pageInfo = new PageInfo(studentsList); - System.out.println("输出分页后的数据：" + pageInfo.getList()); Map map = new HashMap(16); map.put("code", 200); map.put("msg", "数据获取成功"); diff --git a/securityControl-modules/securityControl-system/src/main/java/com/securityControl/system/mapper/SysLogsDao.java b/securityControl-modules/securityControl-system/src/main/java/com/securityControl/system/mapper/SysLogsDao.java index b713dfc..b41993c 100644 --- a/securityControl-modules/securityControl-system/src/main/java/com/securityControl/system/mapper/SysLogsDao.java +++ b/securityControl-modules/securityControl-system/src/main/java/com/securityControl/system/mapper/SysLogsDao.java @@ -91,4 +91,6 @@ public interface SysLogsDao { Map getYueQuan(); void addSaveSysLog(SysLogsInfo sysLog); + + SysLogsInfo getModelTitle(SysLogsInfo sysLog); } diff --git a/securityControl-modules/securityControl-system/src/main/java/com/securityControl/system/service/SysLogsService.java b/securityControl-modules/securityControl-system/src/main/java/com/securityControl/system/service/SysLogsService.java index ee38e4e..50219db 100644 --- a/securityControl-modules/securityControl-system/src/main/java/com/securityControl/system/service/SysLogsService.java +++ b/securityControl-modules/securityControl-system/src/main/java/com/securityControl/system/service/SysLogsService.java @@ -65,4 +65,11 @@ public interface SysLogsService { * @return */ AjaxResult addSaveSysLog(SysLogsInfo sysLog); + + /** + * 新增日志 + * @param sysLog + * @return + */ + void addLogs(SysLogsInfo sysLog); } diff --git a/securityControl-modules/securityControl-system/src/main/java/com/securityControl/system/service/impl/SysLogsServiceImpl.java b/securityControl-modules/securityControl-system/src/main/java/com/securityControl/system/service/impl/SysLogsServiceImpl.java index cd84713..1eadff1 100644 --- a/securityControl-modules/securityControl-system/src/main/java/com/securityControl/system/service/impl/SysLogsServiceImpl.java +++ b/securityControl-modules/securityControl-system/src/main/java/com/securityControl/system/service/impl/SysLogsServiceImpl.java @@ -3,6 +3,7 @@ package com.securityControl.system.service.impl; import com.securityControl.common.core.utils.DateUtils; import com.securityControl.common.core.utils.ServletUtils; import com.securityControl.common.core.utils.aes.DateTimeHelper; +import com.securityControl.common.core.utils.aes.StringHelper; import com.securityControl.common.core.utils.ip.IpUtils; import com.securityControl.common.core.web.domain.AjaxResult; import com.securityControl.common.log.enums.OperationType; @@ -70,6 +71,46 @@ public class SysLogsServiceImpl implements SysLogsService { return null; } + @Override + public void addLogs(SysLogsInfo sysLog) { + try{ + sysLog.setErrGrade("高"); + sysLog.setOperTime(DateTimeHelper.getNowTime()); + sysLog.setOperIp(IpUtils.getIpAddr(ServletUtils.getRequest())); + setModelTitle(sysLog); + sysLog.setOperDetails("页面访问越权"); + sysLog.setOperResult("0"); + sysLog.setEventType("异常事件"); + sysLog.setLogType(2); + sysLog.setOperType("页面访问"); + sysLog.setErrReason("越权访问"); + sysLog.setTimes("0"); + dao.addSaveSysLog(sysLog); + }catch (Exception e){ + log.error(e.toString(),e); + } + } + + + public void setModelTitle(SysLogsInfo sysLog){ + try{ + SysLogsInfo query=dao.getModelTitle(sysLog); + if(query!=null){ + sysLog.setOperModel(query.getOperModel()); + if(StringHelper.isEmpty(query.getTitle())){ + sysLog.setTitle(query.getOperModel()); + }else{ + sysLog.setTitle(query.getTitle()); + } + } + + }catch (Exception e){ + log.error(e.toString(),e); + } + + } + + @Override public List queryByPage(SysLogQo sysLogQo) { return dao.queryByPage(sysLogQo); diff --git a/securityControl-modules/securityControl-system/src/main/resources/mapper/system/SysLogsMapper.xml b/securityControl-modules/securityControl-system/src/main/resources/mapper/system/SysLogsMapper.xml index 04bcb35..4c39d23 100644 --- a/securityControl-modules/securityControl-system/src/main/resources/mapper/system/SysLogsMapper.xml +++ b/securityControl-modules/securityControl-system/src/main/resources/mapper/system/SysLogsMapper.xml @@ -225,6 +225,7 @@ WHERE log_type = #{logType} + insert into sys_logs_copy(user_name, model, details, method, requestMethod, uri, params, ip, create_time, grade, businessType, role_name, log_time, dept_name, err_msg, @@ -268,6 +269,14 @@ order by id desc limit 1 + + \ No newline at end of file