From 1ba7cc9d03acfa5d99874f6b0a232212870bf6e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Tue, 1 Sep 2020 22:10:14 +0800 Subject: [PATCH] =?UTF-8?q?feat:ELK=E5=AE=9A=E6=97=B6=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E7=B4=A2=E5=BC=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apiservice/schedulejob/CoreLogClearJob.java | 14 ++----- .../base/SysLogElasticSearchService.java | 46 ++++++---------------- 2 files changed, 16 insertions(+), 44 deletions(-) diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/CoreLogClearJob.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/CoreLogClearJob.java index 606a56e..8a4c022 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/CoreLogClearJob.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/CoreLogClearJob.java @@ -1,15 +1,8 @@ package cn.estsh.i3plus.core.apiservice.schedulejob; import cn.estsh.i3plus.core.api.iservice.base.ISysLogService; -import cn.estsh.i3plus.core.apiservice.serviceimpl.base.SysLogElasticSearchService; -import cn.estsh.i3plus.core.apiservice.serviceimpl.base.SysLogMongoService; import cn.estsh.i3plus.platform.common.tool.TimeTool; import cn.estsh.i3plus.platform.common.util.CommonConstWords; -import cn.estsh.i3plus.platform.plugin.elasticsearch.ElasticSearchTool; -import cn.estsh.i3plus.pojo.platform.platbean.SysLogException; -import cn.estsh.i3plus.pojo.platform.platbean.SysLogOperate; -import cn.estsh.i3plus.pojo.platform.platbean.SysLogSystem; -import cn.estsh.i3plus.pojo.platform.platbean.SysLogTaskTime; import cn.estsh.impp.framework.base.schedule.BaseImppScheduleJob; import cn.estsh.impp.framework.boot.init.ApplicationProperties; import cn.estsh.impp.framework.boot.util.RedisCacheTool; @@ -20,6 +13,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import java.util.Calendar; import java.util.Date; /** @@ -46,9 +40,9 @@ public class CoreLogClearJob extends BaseImppScheduleJob { @Override public void executeImppJob(JobExecutionContext context, ApplicationProperties applicationProperties) { int to = RedisCacheTool.getSysConfigIntVal(CommonConstWords.LOG_STORAGE_DAYS, CommonConstWords.LOG_STORAGE_DAYS_DEFAULT); - Date thisTime = new Date(); - String startTime = TimeTool.getToday(TimeTool.getDateBefore(thisTime, to)) + " 00:00:00"; - String endTime = TimeTool.getToday(TimeTool.getDateBefore(thisTime, to)) + " 23:59:59"; + Date thisTime = TimeTool.timeCalc(new Date(), Calendar.DAY_OF_MONTH, -2 - to); + String startTime = TimeTool.getToday(thisTime) + " 00:00:00"; + String endTime = TimeTool.getToday(TimeTool.timeCalc(thisTime, Calendar.DAY_OF_MONTH, to)) + " 23:59:59"; logService.actionCleanLog(startTime,endTime); } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SysLogElasticSearchService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SysLogElasticSearchService.java index 5a377bb..1063555 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SysLogElasticSearchService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SysLogElasticSearchService.java @@ -20,7 +20,10 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.*; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; /** * @Description : @@ -202,50 +205,25 @@ public class SysLogElasticSearchService implements ISysLogService { @Override public void actionCleanLog(String startTime, String endTime) { - ElasticSearchTool.reload(); - try{ - SysLogOperate operate = new SysLogOperate(); - operate.setCreateDatetime(startTime); - operate.setCreateDateTimeStart(startTime); - operate.setCreateDateTimeEnd(endTime); - deleteLogOperate(operate); - }catch (Exception e){ - } - try { - SysLogSystem system = new SysLogSystem(); - system.setCreateDatetime(startTime); - system.setCreateDateTimeStart(startTime); - system.setCreateDateTimeEnd(endTime); - deleteLogSystem(system); + ElasticSearchTool.deleteIndex(ElasticSearchPack.getIndexName(SysLogSystem.class),startTime,endTime); }catch (Exception e){ + LOGGER.error("清除系统日志异常",e); } - try { - SysLogException exception = new SysLogException(); - exception.setCreateDatetime(startTime); - exception.setCreateDateTimeStart(startTime); - exception.setCreateDateTimeEnd(endTime); - deleteLogException(exception); + ElasticSearchTool.deleteIndex(ElasticSearchPack.getIndexName(SysLogOperate.class),startTime,endTime); }catch (Exception e){ + LOGGER.error("清除系统操作日志异常",e); } - try { - SysLogTaskTime taskTime = new SysLogTaskTime(); - taskTime.setCreateDatetime(startTime); - taskTime.setCreateDateTimeStart(startTime); - taskTime.setCreateDateTimeEnd(endTime); - deleteLogTaskTime(taskTime); + ElasticSearchTool.deleteIndex(ElasticSearchPack.getIndexName(SysLogException.class),startTime,endTime); }catch (Exception e){ + LOGGER.error("清除系统异常日志异常",e); } - try { - SysLogConsole console = new SysLogConsole(); - console.setCreateDatetime(startTime); - console.setCreateDateTimeStart(startTime); - console.setCreateDateTimeEnd(endTime); - deleteLogConsoleTime(console); + ElasticSearchTool.deleteIndex(ElasticSearchPack.getIndexName(SysLogTaskTime.class),startTime,endTime); }catch (Exception e){ + LOGGER.error("清除定时任务日志异常",e); } }