增加返回多个小程序的白名单

long-article-server/src/main/java/com/tzld/piaoquan/longarticle/common/enums/TransformationEnum.java

@@ -0,0 +1,20 @@
+package com.tzld.piaoquan.longarticle.common.enums;
+
+import lombok.Getter;
+
+@Getter
+public enum TransformationEnum {
+
+    NOT_EXIST(0, "不存在片尾引导"),
+    EXIST(1, "存在片尾引导");
+
+    private final int type;
+    private final String desc;
+
+    TransformationEnum(int type, String desc) {
+        this.type = type;
+        this.desc = desc;
+    }
+
+
+}

long-article-server/src/main/java/com/tzld/piaoquan/longarticle/controller/IndexController.java

@@ -5,6 +5,8 @@ import cn.hutool.http.HttpResponse;
 import com.tzld.piaoquan.longarticle.service.local.impl.MatchVideoServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.checkerframework.checker.units.qual.A;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -18,6 +20,7 @@ import static com.tzld.piaoquan.longarticle.common.constants.ProxyConstant.PROXY
 @RequestMapping("/")
 public class IndexController {
 
+
     /**
      * 探活
      *
@@ -29,20 +32,5 @@ public class IndexController {
     }
 
 
-    @GetMapping("/test")
-    public String test() {
-
-        // 目标网站
-        String url = "https://www.baidu.com";
-
-        // 发送请求
-        HttpResponse result = HttpRequest.get(url)
-                .setHttpProxy(PROXY_HOST, PROXY_PORT)
-                .timeout(20000)//设置超时，毫秒
-                .execute();
-        log.info("test={}", result.body());
-        return "ok";
-    }
-
 
 }

long-article-server/src/main/java/com/tzld/piaoquan/longarticle/service/local/impl/ContentServiceImpl.java

@@ -6,10 +6,8 @@ import com.ctrip.framework.apollo.spring.annotation.ApolloJsonValue;
 import com.tzld.piaoquan.longarticle.common.enums.ContentStatusEnum;
 import com.tzld.piaoquan.longarticle.common.enums.PublicFlagEnum;
 import com.tzld.piaoquan.longarticle.common.enums.PublishGzhPushTypeEnum;
-import com.tzld.piaoquan.longarticle.dao.mapper.longarticle.CrawlerVideoMapper;
-import com.tzld.piaoquan.longarticle.dao.mapper.longarticle.MatchVideoMapper;
-import com.tzld.piaoquan.longarticle.dao.mapper.longarticle.PublishMatchContentMapper;
-import com.tzld.piaoquan.longarticle.dao.mapper.longarticle.SingleVideoSourceMapper;
+import com.tzld.piaoquan.longarticle.common.enums.TransformationEnum;
+import com.tzld.piaoquan.longarticle.dao.mapper.longarticle.*;
 import com.tzld.piaoquan.longarticle.model.bo.VideoDetail;
 import com.tzld.piaoquan.longarticle.model.dto.ArticleSortRequest;
 import com.tzld.piaoquan.longarticle.model.dto.ArticleSortResponse;
@@ -23,6 +21,7 @@ import com.tzld.piaoquan.longarticle.service.remote.AigcService;
 import com.tzld.piaoquan.longarticle.service.remote.SortService;
 import com.tzld.piaoquan.longarticle.service.remote.VideoService;
 import com.tzld.piaoquan.longarticle.utils.LarkRobotUtil;
+import com.tzld.piaoquan.longarticle.utils.ToolUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -52,6 +51,26 @@ public class ContentServiceImpl implements ContentService {
         add("20250304073234245880032");
     }};
 
+    private static final List<String> multipleVideoGhIdList = new ArrayList<String>() {{
+        add("gh_f93af770fb55");
+        add("gh_325188c9ea8b");
+        add("gh_26c906592150");
+        add("gh_18c6258ec8f7");
+        add("gh_631fb48b83a5");
+        add("gh_86cb64d57a1d");
+        add("gh_74827e516740");
+        add("gh_fe6ef3a65a48");
+        add("gh_be0aa7c09379");
+        add("gh_4f34eb52e641");
+        add("gh_9bd3ec87db86");
+        add("gh_b1553fe3ef26");
+        add("gh_1a2bb3fef76a");
+        add("gh_c952bc10dfad");
+        add("gh_871c78fca0fa");
+        add("gh_c19a94a3fcc1");
+    }};
+
+
     @Autowired
     private MatchVideoMapper matchVideoMapper;
 
@@ -79,6 +98,9 @@ public class ContentServiceImpl implements ContentService {
     @Autowired
     private PublishMatchContentMapper publishMatchContentMapper;
 
+    @Autowired
+    private VideoEndScreenMapper videoEndScreenMapper;
+
     public void addMatchContent(MatchVideo matchVideo, String publishContentId) {
         PublishMatchContent publishMatchContent = new PublishMatchContent();
         publishMatchContent.setTraceId(matchVideo.getTraceId());
@@ -257,12 +279,36 @@ public class ContentServiceImpl implements ContentService {
             return null;
         }
         SingleVideoSource singleVideoSource = singleVideoSources.get(0);
-        VideoDetail videoDetail = videoService.publish(singleVideoSource.getVideoOssPath(),
-                SINGLE_VIDEO_UID, singleVideoSource.getMiniProgramTitle());
+        String ossPath = singleVideoSource.getVideoOssPath();
+        String title = singleVideoSource.getMiniProgramTitle();
+        //是否存在片尾引导
+        int transformationType;
+        int publishType = 0;
+        String videoOriginType = "video_pool";
+        Long videoOriginId = (long) singleVideoSource.getId();
+        VideoEndScreen videoEndScreen = existVideoEndScreen(videoOriginId, videoOriginType);
+        //查询到改写的视频  随机选择原视频或者改写后的视频
+        if (videoEndScreen != null) {
+            transformationType = TransformationEnum.EXIST.getType();
+            //存在片尾引导后  50%概率走有片尾引导的视频
+            publishType = ToolUtil.getRandom(2);
+            if (publishType == 1) {
+                ossPath = videoEndScreen.getNewOssPath();
+                title = videoEndScreen.getTitle();
+            }
+        } else {
+            transformationType = TransformationEnum.NOT_EXIST.getType();
+        }
+        VideoDetail videoDetail = videoService.publish(ossPath,
+                SINGLE_VIDEO_UID, title);
+        if (videoDetail == null) {
+            return null;
+        }
+        logEvent(videoOriginType, videoOriginId, videoDetail.getVideoId(), transformationType, publishType);
         videoDetail.setCrawlerVideoId(singleVideoSource.getId());
-        videoDetail.setKimiTitle(singleVideoSource.getMiniProgramTitle());
+        videoDetail.setKimiTitle(title);
         videoDetail.setUid(SINGLE_VIDEO_UID);
-        videoDetail.setVideoOss(singleVideoSource.getVideoOssPath());
+        videoDetail.setVideoOss(ossPath);
         String traceId = "direct-" + UUID.randomUUID() + "-" + System.currentTimeMillis() / 1000;
         videoDetail.setTraceId(traceId);
         res.add(videoDetail);
@@ -283,13 +329,31 @@ public class ContentServiceImpl implements ContentService {
                 log.error("crawlerVideo kimiText is null contentId={}", crawlerVideo.getContentId());
                 continue;
             }
-            String kimiTitle = kimiText.getKimiTitle();
-            VideoDetail videoDetail = videoService.publish(videoOssPath, userId, kimiTitle);
+            String title = kimiText.getKimiTitle();
+            int transformationType;
+            int publishType = 0;
+            String videoOriginType = "long_article";
+            Long videoOriginId = (long) crawlerVideoId;
+            VideoEndScreen videoEndScreen = existVideoEndScreen(videoOriginId, videoOriginType);
+            //查询到改写的视频  随机选择原视频或者改写后的视频
+            if (videoEndScreen != null) {
+                transformationType = TransformationEnum.EXIST.getType();
+                //存在片尾引导后  50%概率走有片尾引导的视频
+                publishType = ToolUtil.getRandom(2);
+                if (publishType == 1) {
+                    videoOssPath = videoEndScreen.getNewOssPath();
+                    title = videoEndScreen.getTitle();
+                }
+            } else {
+                transformationType = TransformationEnum.NOT_EXIST.getType();
+            }
+            VideoDetail videoDetail = videoService.publish(videoOssPath, userId, title);
             if (videoDetail == null) {
                 continue;
             }
+            logEvent(videoOriginType, videoOriginId, videoDetail.getVideoId(), transformationType, publishType);
             videoDetail.setCrawlerVideoId(crawlerVideoId);
-            videoDetail.setKimiTitle(kimiTitle);
+            videoDetail.setKimiTitle(title);
             videoDetail.setUid(userId);
             videoDetail.setVideoOss(videoOssPath);
             videoDetail.setSource(platform);
@@ -322,7 +386,8 @@ public class ContentServiceImpl implements ContentService {
             }
 
             //临时逻辑  该计划返回正常数量小程序
-            if (multipleVideoPlanIdList.contains(planAccount.getPlanId())) {
+            if (multipleVideoPlanIdList.contains(planAccount.getPlanId())
+                    || multipleVideoGhIdList.contains(planAccount.getGhId())) {
                 if (crawlerVideoList.size() > 3) {
                     return crawlerVideoList.subList(0, 3);
                 }
@@ -340,4 +405,29 @@ public class ContentServiceImpl implements ContentService {
         return new ArrayList<>();
     }
 
+    public VideoEndScreen existVideoEndScreen(Long id, String type) {
+        VideoEndScreenExample example = new VideoEndScreenExample();
+        example.createCriteria().andVideoOriginIdEqualTo(id).andVideoOriginTypeEqualTo(type).andStatusEqualTo(2);
+        List<VideoEndScreen> videoEndScreens = videoEndScreenMapper.selectByExample(example);
+        if (CollectionUtils.isEmpty(videoEndScreens)) {
+            return null;
+        }
+        return videoEndScreens.get(0);
+    }
+
+    public void logEvent(String videoOriginType, Long videoOriginId, String videoId,
+                         int transformationType, int publishType) {
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("code", "changwen_video_publish");
+        JSONObject data = new JSONObject();
+        data.put("video_origin_type", videoOriginType);
+        data.put("video_origin_id", videoOriginId);
+        data.put("video_id", videoId);
+        data.put("transformation_type", transformationType);
+        if (transformationType == 1) {
+            data.put("publish_type", publishType);
+        }
+        jsonObject.put("data", data);
+        log.info(jsonObject.toJSONString());
+    }
 }

long-article-server/src/main/java/com/tzld/piaoquan/longarticle/utils/ToolUtil.java

@@ -0,0 +1,13 @@
+package com.tzld.piaoquan.longarticle.utils;
+
+import java.util.Random;
+
+public class ToolUtil {
+
+    private static final Random random = new Random();
+
+    public static int getRandom(int limit) {
+        return random.nextInt(limit);
+    }
+
+}

long-article-server/src/main/resources/application-prod.properties

@@ -16,3 +16,7 @@ spring.redis.password=Qingqu2019
 apollo.meta: https://apolloconfig-internal.piaoquantv.com
 
 xxl.job.admin.addresses=http://xxl-job-internal.piaoquantv.com/xxl-job-admin
+
+aliyun.log.project=long-article-manage
+
+logging.file.path=${datalog}/weblog/${spring.application.name}

long-article-server/src/main/resources/application-test.properties

@@ -18,3 +18,7 @@ apollo.meta: https://apolloconfig-internal.piaoquantv.com
 xxl.job.admin.addresses=http://test-xxl-job-internal.piaoquantv.com/xxl-job-admin
 
 download.path=/Users/shimeng/Desktop/download/
+
+aliyun.log.project=long-article-manage
+
+logging.file.path=/Users/shimeng/Desktop/log/${spring.application.name}

long-article-server/src/main/resources/application.properties

@@ -1,6 +1,5 @@
 spring.profiles.active=test
 spring.application.name=long-article-server
-
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
 spring.datasource.initialSize=5
@@ -13,8 +12,6 @@ spring.datasource.testWhileIdle=true
 spring.datasource.testOnBorrow=false
 spring.datasource.testOnReturn=false
 spring.datasource.poolPreparedStatements=true
-
-
 aigc.datasource.initialSize=5
 aigc.datasource.maxActive=20
 aigc.datasource.maxWait=60000
@@ -25,22 +22,15 @@ aigc.datasource.testWhileIdle=true
 aigc.datasource.testOnBorrow=false
 aigc.datasource.testOnReturn=false
 aigc.datasource.poolPreparedStatements=true
-
-
 spring.redis.lettuce.pool.max-active=8
 spring.redis.lettuce.pool.max-wait=-1
 spring.redis.lettuce.pool.max-idle=8
 spring.redis.lettuce.pool.min-idle=0
-
-
 app.id=LongArticlesMatchServer
 apollo.bootstrap.enabled=true
 apollo.bootstrap.namespaces=application
 apollo.cacheDir=/datalog/apollo-cache-dir
-
 datalog=/datalog
-
-
 xxl.job.accessToken=
 xxl.job.executor.appname=${spring.application.name}
 xxl.job.executor.address=
@@ -48,9 +38,13 @@ xxl.job.executor.ip=
 xxl.job.executor.port=9999
 xxl.job.executor.logpath=${datalog}/xxl-job/
 xxl.job.executor.logretentiondays=30
-
-
 download.path=/download
+aliyun.log.endpoint=cn-hangzhou.log.aliyuncs.com
+aliyun.log.accessKeyId=LTAIP6x1l3DXfSxm
+aliyun.log.accessKeySecret=KbTaM9ars4OX3PMS6Xm7rtxGr1FLon
+aliyun.log.logstore.info=info-log
+aliyun.log.logstore.error=error-log
+
 
 
 

long-article-server/src/main/resources/logback-spring.xml

@@ -0,0 +1,276 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 日志级别从低到高分为TRACE < DEBUG < INFO < WARN < ERROR < FATAL，如果设置为WARN，则低于WARN的信息都不会输出 -->
+<!-- scan:当此属性设置为true时，配置文件如果发生改变，将会被重新加载，默认值为true -->
+<!-- scanPeriod:设置监测配置文件是否有修改的时间间隔，如果没有给出时间单位，默认单位是毫秒。当scan为true时，此属性生效。默认的时间间隔为1分钟。 -->
+<!-- debug:当此属性设置为true时，将打印出logback内部日志信息，实时查看logback运行状态。默认值为false。 -->
+<configuration scan="true" scanPeriod="10 seconds">
+    <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
+
+    <contextName>logback</contextName>
+    <!-- name的值是变量的名称，value的值时变量定义的值。通过定义的值会被插入到logger上下文中。定义变量后，可以使“${}”来使用变量。 -->
+    <!-- <property name="LOG_PATH"  value="${logging.file.path}" />-->
+
+    <springProperty name="LOG_PATH" source="logging.file.path"/>
+    <springProperty name="ALIYUN_LOG_ENDPOINT" source="aliyun.log.endpoint"/>
+    <springProperty name="ALIYUN_LOG_ACCESSKEYID" source="aliyun.log.accessKeyId"/>
+    <springProperty name="ALIYUN_LOG_ACCESSKEYSECRET" source="aliyun.log.accessKeySecret"/>
+    <springProperty name="ALIYUN_LOG_PROJECT" source="aliyun.log.project"/>
+    <springProperty name="ALIYUN_LOG_LOGSTORE_INFO" source="aliyun.log.logstore.info"/>
+    <springProperty name="ALIYUN_LOG_LOGSTORE_ERROR" source="aliyun.log.logstore.error"/>
+
+    <!-- 彩色日志 -->
+    <!-- 彩色日志依赖的渲染类 -->
+    <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter"/>
+    <conversionRule conversionWord="wex"
+                    converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
+    <conversionRule conversionWord="wEx"
+                    converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
+    <!-- 彩色日志格式 -->
+    <property name="CONSOLE_LOG_PATTERN"
+              value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr([%X{logTraceId}]){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
+    <!--<property name="CONSOLE_LOG_PATTERN"-->
+    <!--          value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr([%X{√logTraceId}]){magenta} %clr(-&#45;&#45;){faint} %clr([%15.15t]){faint} %clr(at %class.%method){cyan} \\(%file:%line\\) %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>-->
+
+    <!--输出到控制台-->
+    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+        <!--此日志appender是为开发使用，只配置最底级别，控制台输出的日志级别是大于或等于此级别的日志信息-->
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>debug</level>
+        </filter>
+        <encoder>
+            <Pattern>${CONSOLE_LOG_PATTERN}</Pattern>
+            <!-- 设置字符集 -->
+            <charset>UTF-8</charset>
+        </encoder>
+    </appender>
+
+    <!--输出到文件-->
+    <!-- 时间滚动输出 level为 DEBUG 日志 -->
+    <appender name="DEBUG_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文件的路径及文件名 -->
+        <file>${LOG_PATH}/debug.log</file>
+        <!--日志文件输出格式-->
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level [%X{logTraceId}] %logger{50} [%L] - %msg%n</pattern>
+            <charset>UTF-8</charset> <!-- 设置字符集 -->
+        </encoder>
+        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 日志归档 -->
+            <fileNamePattern>${LOG_PATH}/debug/%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>100MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+            <!--日志文件保留天数-->
+            <maxHistory>15</maxHistory>
+        </rollingPolicy>
+        <!-- 此日志文件只记录debug级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>debug</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <!-- 时间滚动输出 level为 INFO 日志 -->
+    <appender name="INFO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文件的路径及文件名 -->
+        <file>${LOG_PATH}/info.log</file>
+        <!--日志文件输出格式-->
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level [%X{logTraceId}] %logger{50} [%L] - %msg%n</pattern>
+            <charset>UTF-8</charset>
+        </encoder>
+        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 每天日志归档路径以及格式 -->
+            <fileNamePattern>${LOG_PATH}/info/%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>100MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+            <!--日志文件保留天数-->
+            <maxHistory>15</maxHistory>
+        </rollingPolicy>
+        <!-- 此日志文件只记录info级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>info</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <!-- 时间滚动输出 level为 WARN 日志 -->
+    <appender name="WARN_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文件的路径及文件名 -->
+        <file>${LOG_PATH}/warn.log</file>
+        <!--日志文件输出格式-->
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level [%X{logTraceId}] %logger{50} [%L] - %msg%n</pattern>
+            <charset>UTF-8</charset> <!-- 此处设置字符集 -->
+        </encoder>
+        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_PATH}/warn/%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>100MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+            <!--日志文件保留天数-->
+            <maxHistory>15</maxHistory>
+        </rollingPolicy>
+        <!-- 此日志文件只记录warn级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>warn</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <!-- 时间滚动输出 level为 ERROR 日志 -->
+    <appender name="ERROR_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文件的路径及文件名 -->
+        <file>${LOG_PATH}/error.log</file>
+        <!--日志文件输出格式-->
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level [%X{logTraceId}] %logger{50} [%L] - %msg%n</pattern>
+            <charset>UTF-8</charset> <!-- 此处设置字符集 -->
+        </encoder>
+        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_PATH}/error/%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>100MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+            <!--日志文件保留天数-->
+            <maxHistory>15</maxHistory>
+        </rollingPolicy>
+        <!-- 此日志文件只记录ERROR级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>ERROR</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <appender name="ALIYUN_LOG_INFO" class="com.aliyun.openservices.log.logback.LoghubAppender">
+        <endpoint>${ALIYUN_LOG_ENDPOINT}</endpoint>
+        <accessKeyId>${ALIYUN_LOG_ACCESSKEYID}</accessKeyId>
+        <accessKeySecret>${ALIYUN_LOG_ACCESSKEYSECRET}</accessKeySecret>
+        <project>${ALIYUN_LOG_PROJECT}</project>
+        <logStore>${ALIYUN_LOG_LOGSTORE_INFO}</logStore>
+
+        <totalSizeInBytes>104857600</totalSizeInBytes>
+        <maxBlockMs>0</maxBlockMs>
+        <ioThreadCount>8</ioThreadCount>
+        <batchSizeThresholdInBytes>524288</batchSizeThresholdInBytes>
+        <batchCountThreshold>4096</batchCountThreshold>
+        <lingerMs>2000</lingerMs>
+        <retries>10</retries>
+        <baseRetryBackoffMs>100</baseRetryBackoffMs>
+        <maxRetryBackoffMs>50000</maxRetryBackoffMs>
+
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level [%X{logTraceId}] %logger{50} [%L] - %msg%n</pattern>
+            <charset>UTF-8</charset>
+        </encoder>
+
+        <timeFormat>yyyy-MM-dd'T'HH:mmZ</timeFormat>
+        <timeZone>Asia/Shanghai</timeZone>
+
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>INFO</level>
+        </filter>
+
+        <mdcFields>logTraceId</mdcFields>
+    </appender>
+
+    <appender name="ALIYUN_LOG_ERROR" class="com.aliyun.openservices.log.logback.LoghubAppender">
+        <endpoint>${ALIYUN_LOG_ENDPOINT}</endpoint>
+        <accessKeyId>${ALIYUN_LOG_ACCESSKEYID}</accessKeyId>
+        <accessKeySecret>${ALIYUN_LOG_ACCESSKEYSECRET}</accessKeySecret>
+        <project>${ALIYUN_LOG_PROJECT}</project>
+        <logStore>${ALIYUN_LOG_LOGSTORE_ERROR}</logStore>
+
+        <totalSizeInBytes>104857600</totalSizeInBytes>
+        <maxBlockMs>0</maxBlockMs>
+        <ioThreadCount>8</ioThreadCount>
+        <batchSizeThresholdInBytes>524288</batchSizeThresholdInBytes>
+        <batchCountThreshold>4096</batchCountThreshold>
+        <lingerMs>2000</lingerMs>
+        <retries>10</retries>
+        <baseRetryBackoffMs>100</baseRetryBackoffMs>
+        <maxRetryBackoffMs>50000</maxRetryBackoffMs>
+
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level [%X{logTraceId}] %logger{50} [%L] - %msg%n</pattern>
+            <charset>UTF-8</charset>
+        </encoder>
+
+        <timeFormat>yyyy-MM-dd'T'HH:mmZ</timeFormat>
+        <timeZone>Asia/Shanghai</timeZone>
+
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>ERROR</level>
+        </filter>
+
+        <mdcFields>logTraceId</mdcFields>
+    </appender>
+
+    <!--
+        <logger>用来设置某一个包或者具体的某一个类的日志打印级别、以及指定<appender>。
+        <logger>仅有一个name属性，一个可选的level和一个可选的addtivity属性。
+        name:用来指定受此logger约束的某一个包或者具体的某一个类。
+        level:用来设置打印级别，大小写无关：TRACE, DEBUG, INFO, WARN, ERROR, ALL 和 OFF，
+              还有一个特俗值INHERITED或者同义词NULL，代表强制执行上级的级别。
+              如果未设置此属性，那么当前logger将会继承上级的级别。
+        addtivity:是否向上级logger传递打印信息。默认是true。
+    -->
+    <!--<logger name="org.springframework.web" level="info"/>-->
+    <!--<logger name="org.springframework.scheduling.annotation.ScheduledAnnotationBeanPostProcessor" level="INFO"/>-->
+
+    <!--
+        使用mybatis的时候，sql语句是debug下才会打印，而这里我们只配置了info，所以想要查看sql语句的话，有以下两种操作：
+        第一种把<root level="info">改成<root level="DEBUG">这样就会打印sql，不过这样日志那边会出现很多其他消息
+        第二种就是单独给dao下目录配置 <logger> 指定 level 属性为 debug，这样配置sql语句会打印，其他还是正常info级别：
+     -->
+
+    <!--<springProfile name="dev">-->
+    <!--    <logger name="com.tzld.piaoquan.ad" level="debug"/>-->
+    <!--    <logger name="com.ctrip.framework.apollo.internals.RemoteConfigLongPollService" level="error"/>-->
+    <!--</springProfile>-->
+    <!--<springProfile name="test">-->
+    <!--    <logger name="com.tzld.piaoquan.ad" level="info"/>-->
+    <!--</springProfile>-->
+    <!--<springProfile name="pre">-->
+    <!--    <logger name="com.tzld.piaoquan.ad" level="info"/>-->
+    <!--</springProfile>-->
+    <!--<springProfile name="stress">-->
+    <!--    <logger name="com.tzld.piaoquan.ad" level="info"/>-->
+    <!--</springProfile>-->
+    <!--<springProfile name="prod">-->
+    <!--    <logger name="com.tzld.piaoquan.ad" level="info"/>-->
+    <!--</springProfile>-->
+    <!--<logger name="com.netflix.discovery.shared.resolver.aws.ConfigClusterResolver" level="warn"/>-->
+
+    <!-- 可用来获取 StatusManager 中的状态 -->
+    <!--<statusListener class="ch.qos.logback.core.status.OnConsoleStatusListener"/>-->
+    <!-- 解决 aliyun loghub debug模式下循环发送的问题 -->
+    <logger name="org.apache.http.impl.conn.Wire" level="WARN"/>
+    <!--aliyun loghub 为了防止进程退出时，内存中的数据丢失，请加上此选项-->
+    <shutdownHook class="ch.qos.logback.core.hook.DelayingShutdownHook"/>
+
+    <!--
+        root节点是必选节点，用来指定最基础的日志输出级别，只有一个level属性
+        level:用来设置打印级别，大小写无关：TRACE, DEBUG, INFO, WARN, ERROR, ALL 和 OFF，
+        不能设置为INHERITED或者同义词NULL。默认是DEBUG
+        可以包含零个或多个元素，标识这个appender将会添加到这个logger。
+    -->
+    <root level="info">
+        <appender-ref ref="CONSOLE"/>
+        <appender-ref ref="DEBUG_FILE"/>
+        <appender-ref ref="INFO_FILE"/>
+        <appender-ref ref="WARN_FILE"/>
+        <appender-ref ref="ERROR_FILE"/>
+        <appender-ref ref="ALIYUN_LOG_INFO"/>
+        <appender-ref ref="ALIYUN_LOG_ERROR"/>
+    </root>
+</configuration>

pom.xml

@@ -26,18 +26,24 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.tzld.commons</groupId>
+            <artifactId>aliyun-log-spring-boot-starter</artifactId>
+            <version>2.0.0</version>
             <exclusions>
                 <exclusion>
-                    <groupId>org.springframework.boot</groupId>
-                    <artifactId>spring-boot-starter-logging</artifactId>
+                    <artifactId>aliyun-log</artifactId>
+                    <groupId>com.aliyun.openservices</groupId>
                 </exclusion>
             </exclusions>
-
         </dependency>
 
         <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-log4j2</artifactId>
+            <groupId>com.aliyun.openservices</groupId>
+            <artifactId>aliyun-log-logback-appender</artifactId>
+            <version>0.1.18</version>
         </dependency>
 
         <dependency>