From fdc47c8fe4c1adfec5fe67a967694ad066448b0e Mon Sep 17 00:00:00 2001 From: bynt Date: Fri, 28 Oct 2022 14:55:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A5=E5=BF=97=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adcallback/task/PlatFormRecordTask.java | 13 +-- src/main/resources/application.yml | 6 +- src/main/resources/logback-spring.xml | 77 +++++++++++++++++ src/main/resources/logback.xml | 83 ------------------- 4 files changed, 85 insertions(+), 94 deletions(-) create mode 100644 src/main/resources/logback-spring.xml delete mode 100644 src/main/resources/logback.xml diff --git a/src/main/java/com/baiyee/adcallback/task/PlatFormRecordTask.java b/src/main/java/com/baiyee/adcallback/task/PlatFormRecordTask.java index 31b1ae0..69d8131 100644 --- a/src/main/java/com/baiyee/adcallback/task/PlatFormRecordTask.java +++ b/src/main/java/com/baiyee/adcallback/task/PlatFormRecordTask.java @@ -1,19 +1,15 @@ package com.baiyee.adcallback.task; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; import cn.hutool.core.text.CharSequenceUtil; import cn.hutool.core.util.ObjectUtil; -import cn.hutool.http.HttpRequest; import cn.hutool.http.HttpUtil; import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; -import com.baiyee.adcallback.api.common.CommonResponse; import com.baiyee.adcallback.api.dto.PlateFormDTO; -import com.baiyee.adcallback.common.exception.BadRequestException; import com.baiyee.adcallback.config.pojo.PlatformTransmitDTO; import com.baiyee.adcallback.repository.entity.TbPlatformCompanyEntity; import com.baiyee.adcallback.repository.entity.TbPlatformDeliveryEntity; @@ -22,7 +18,6 @@ import com.baiyee.adcallback.service.AdPlatformService; import com.baiyee.adcallback.service.JlBackDataEntityService; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import lombok.Data; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; @@ -30,7 +25,6 @@ import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.Set; @@ -75,11 +69,12 @@ public class PlatFormRecordTask { // 偏移十分钟 DateTime offsetMinute = ObjectUtil.isNull(beginTime) ? DateUtil.offsetMinute(date, -10) : beginTime; beginTime = offsetMinute; - log.error("================ the begin time as {} end time as {} ================", offsetMinute, date); + log.info("================ the begin time as {} end time as {} ================", offsetMinute, date); List dtoList = jlBackDataEntityService.queryPlateFormDTO (CharSequenceUtil.EMPTY, "__IMEI__", offsetMinute, date, platform.getTagStr()); - log.error("================ the dto list as {} ================", dtoList.size()); + log.info("================ the dto list as {} ================", dtoList.size()); if (CollUtil.isNotEmpty(dtoList)) { + // tag进行分组 Map> listMap = dtoList.stream() .collect(Collectors.groupingBy(PlateFormDTO::getTag)); List saveDataList = Lists.newArrayList(); @@ -99,7 +94,7 @@ public class PlatFormRecordTask { saveDataList.addAll(differentData); } // 分批发送 - List> partition = Lists.partition(saveDataList, 100); + List> partition = Lists.partition(saveDataList, 500); int num = 0; for (List formDTOList : partition) { PlatformTransmitDTO dto = new PlatformTransmitDTO(); diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 4a3a535..243ae84 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -4,7 +4,7 @@ spring: application: name: ad-callback profiles: - active: dev + active: prod jackson: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss @@ -42,7 +42,9 @@ spring: # 配置日志 logging: - config: classpath:logback.xml + config: classpath:logback-spring.xml + level: + root: info # 线程池配置 short: diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml new file mode 100644 index 0000000..cb17d32 --- /dev/null +++ b/src/main/resources/logback-spring.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + ${CONSOLE_LOG_PATTERN} + + + + + + ${log.path}/debug.log + + ${log.path}/%d{yyyy-MM, aux}/debug.%d{yyyy-MM-dd}.%i.log.gz + 50MB + 30 + + + %date [%thread] %-5level [%logger{50}] %file:%line - %msg%n + + + + + + ${log.path}/error.log + + ${log.path}/%d{yyyy-MM}/error.%d{yyyy-MM-dd}.%i.log.gz + 50MB + 30 + + + %date [%thread] %-5level [%logger{50}] %file:%line - %msg%n + + + ERROR + + + + + + + + + + + + + + + diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml deleted file mode 100644 index ed8dd54..0000000 --- a/src/main/resources/logback.xml +++ /dev/null @@ -1,83 +0,0 @@ - - - ad-callback - - - - - - - - - - %highlight([%-5level]) %cyan(%d{yyyy-MM-dd#HH:mm:ss.SSS}) %yellow([Thread:%thread]) %magenta([Logger:%logger]) -> %msg%n - utf-8 - - - - - - ${LOG_DIR}/ad-callback-log.log - - - - ${LOG_DIR}/history/%d{yyyy-MM-dd}.gz - 30 - - - true - - - ${LOG_PATTERN} - utf-8 - - - - - INFO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -