diff --git a/admin/src/assets/js/glob.js b/admin/src/assets/js/glob.js index ac46956..262cf0f 100644 --- a/admin/src/assets/js/glob.js +++ b/admin/src/assets/js/glob.js @@ -22,13 +22,11 @@ const glob = { //配置 NProgress.configure({easing: 'ease', speed: 500, showSpinner: false}); NProgress.inc(0.2); - //开始遍历 router.beforeEach((to, from, next) => { NProgress.start(); next(); }); - //结束遍历 router.afterEach(() => { NProgress.done(); diff --git a/udf-api/udf-api-common/src/main/java/org/itkk/udf/api/common/repository/ITraceInfoRepository.java b/udf-api/udf-api-common/src/main/java/org/itkk/udf/api/common/repository/ITraceInfoRepository.java index 2f6e400..d448f66 100644 --- a/udf-api/udf-api-common/src/main/java/org/itkk/udf/api/common/repository/ITraceInfoRepository.java +++ b/udf-api/udf-api-common/src/main/java/org/itkk/udf/api/common/repository/ITraceInfoRepository.java @@ -2,15 +2,8 @@ package org.itkk.udf.api.common.repository; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; import org.itkk.udf.api.common.entity.TraceInfoEntity; @Mapper public interface ITraceInfoRepository extends BaseMapper { - /** - * 清理追踪日志 - * - * @param traceLogKeepDays traceLogKeepDays - */ - void clearTraceInfo(@Param("traceLogKeepDays") Integer traceLogKeepDays); } diff --git a/udf-api/udf-api-common/src/main/java/org/itkk/udf/api/common/service/TraceInfoService.java b/udf-api/udf-api-common/src/main/java/org/itkk/udf/api/common/service/TraceInfoService.java index bce7d46..fabc3f4 100644 --- a/udf-api/udf-api-common/src/main/java/org/itkk/udf/api/common/service/TraceInfoService.java +++ b/udf-api/udf-api-common/src/main/java/org/itkk/udf/api/common/service/TraceInfoService.java @@ -1,6 +1,7 @@ package org.itkk.udf.api.common.service; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import lombok.extern.slf4j.Slf4j; import org.itkk.udf.api.common.CommonProperties; import org.itkk.udf.api.common.entity.TraceInfoEntity; @@ -12,6 +13,8 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; +import java.time.LocalDate; +import java.time.ZoneId; import java.util.Date; import java.util.UUID; @@ -40,7 +43,9 @@ public class TraceInfoService { * 定时清理追踪日志 */ public void clearTraceInfo() { - iTraceInfoRepository.clearTraceInfo(commonProperties.getTraceLogKeepDays()); + LocalDate nextDay = LocalDate.now().minusDays(commonProperties.getTraceLogKeepDays()); + Date date = Date.from(nextDay.atStartOfDay(ZoneId.systemDefault()).toInstant()); + iTraceInfoRepository.delete(new UpdateWrapper().lambda().le(TraceInfoEntity::getCreateDate, date)); } /** diff --git a/udf-api/udf-api-common/src/main/resources/mapper/ITraceInfoRepository.xml b/udf-api/udf-api-common/src/main/resources/mapper/ITraceInfoRepository.xml index 7d70085..4255366 100644 --- a/udf-api/udf-api-common/src/main/resources/mapper/ITraceInfoRepository.xml +++ b/udf-api/udf-api-common/src/main/resources/mapper/ITraceInfoRepository.xml @@ -1,9 +1,4 @@ - - DELETE - FROM TM_COMMON_TRACE_INFO A - WHERE A.CREATE_DATE date_sub(current_timestamp, INTERVAL #{traceLogKeepDays} day) -