Merge remote-tracking branch 'origin/master'

job-bytedance/src/main/java/cn/com/ctop/job/bytedance/data/entity/BytedancePromoterReportDaily.java

@@ -144,6 +144,23 @@ public class BytedancePromoterReportDaily {
     private BigDecimal attributionMicroGame7dLtv;
     private BigDecimal statMicroGame0dAmount;
 
+    private String awemeId;
+    private String awemeNickName;
+
+    public String getAwemeId() {
+        return awemeId;
+    }
+
+    public void setAwemeId(String awemeId) {
+        this.awemeId = awemeId;
+    }
+
+    public String getAwemeNickName() {
+        return awemeNickName;
+    }
+    public void setAwemeNickName(String awemeNickName) {
+        this.awemeNickName = awemeNickName;
+    }
     public Long getAdvertiserId() {
         return advertiserId;
     }

job-bytedance/src/main/java/cn/com/ctop/job/bytedance/data/entity/BytedancePromoterReportHour.java

@@ -149,7 +149,24 @@ public class BytedancePromoterReportHour {
     private BigDecimal attributionMicroGame3dLtv;
     private BigDecimal attributionMicroGame7dLtv;
     private BigDecimal statMicroGame0dAmount;
+    private String awemeId;
+    private String awemeNickName;
 
+    public String getAwemeId() {
+        return awemeId;
+    }
+
+    public void setAwemeId(String awemeId) {
+        this.awemeId = awemeId;
+    }
+
+    public String getAwemeNickName() {
+        return awemeNickName;
+    }
+
+    public void setAwemeNickName(String awemeNickName) {
+        this.awemeNickName = awemeNickName;
+    }
 
     public Long getAdvertiserId() {
         return advertiserId;

job-bytedance/src/main/java/cn/com/ctop/job/bytedance/data/service/impl/BytedancePromoterReportServiceImpl.java

@@ -89,6 +89,8 @@ public class BytedancePromoterReportServiceImpl implements IBytedancePromoterRep
                             String cdpProjectName = dimensionsJson.getString("cdp_project_name");
                             Long cdpPromotionId = dimensionsJson.getLong("cdp_promotion_id");
                             String cdpPromotionName = dimensionsJson.getString("cdp_promotion_name");
+                            String awemeId = dimensionsJson.getString("aweme_id");
+                            String awemeNickName = dimensionsJson.getString("aweme_nick_name");
                             Integer statTimeDay = Integer.valueOf(dimensionsJson.getString("stat_time_day").replace("-", ""));
                             Integer hour = Integer.valueOf(dimensionsJson.getString("stat_time_hour").substring(11, 13));
                             BytedancePromoterReportHour bytedancePromoterReportHour = JSONObject.parseObject(metricsJson.toJSONString(), BytedancePromoterReportHour.class);
@@ -99,6 +101,8 @@ public class BytedancePromoterReportServiceImpl implements IBytedancePromoterRep
                             bytedancePromoterReportHour.setCdpPromotionName(cdpPromotionName);
                             bytedancePromoterReportHour.setStatTimeDay(statTimeDay);
                             bytedancePromoterReportHour.setHour(hour);
+                            bytedancePromoterReportHour.setAwemeId(awemeId);
+                            bytedancePromoterReportHour.setAwemeNickName(awemeNickName);
                             hours.add(bytedancePromoterReportHour);
 
                             dorisLoadManager.add("media_api","bytedance_promoter_report_hour", bytedancePromoterReportHour);
@@ -178,6 +182,8 @@ public class BytedancePromoterReportServiceImpl implements IBytedancePromoterRep
                             String cdpProjectName = dimensionsJson.getString("cdp_project_name");
                             Long cdpPromotionId = dimensionsJson.getLong("cdp_promotion_id");
                             String cdpPromotionName = dimensionsJson.getString("cdp_promotion_name");
+                            String awemeId = dimensionsJson.getString("aweme_id");
+                            String awemeNickName = dimensionsJson.getString("aweme_nick_name");
                             Integer statTimeDay = Integer.valueOf(dimensionsJson.getString("stat_time_day").replace("-", ""));
                             BytedancePromoterReportDaily promoterReportDaily = JSONObject.parseObject(metricsJson.toJSONString(), BytedancePromoterReportDaily.class);
                             promoterReportDaily.setAdvertiserId(advertiserId);
@@ -186,6 +192,8 @@ public class BytedancePromoterReportServiceImpl implements IBytedancePromoterRep
                             promoterReportDaily.setCdpPromotionId(cdpPromotionId);
                             promoterReportDaily.setCdpPromotionName(cdpPromotionName);
                             promoterReportDaily.setStatTimeDay(statTimeDay);
+                            promoterReportDaily.setAwemeId(awemeId);
+                            promoterReportDaily.setAwemeNickName(awemeNickName);
                             promoterReportDailies.add(promoterReportDaily);
                             dorisLoadManager.add("media_api", "bytedance_promoter_report_daily", promoterReportDaily);
                         }
@@ -275,6 +283,8 @@ public class BytedancePromoterReportServiceImpl implements IBytedancePromoterRep
                             String cdpProjectName = dimensionsJson.getString("cdp_project_name");
                             Long cdpPromotionId = dimensionsJson.getLong("cdp_promotion_id");
                             String cdpPromotionName = dimensionsJson.getString("cdp_promotion_name");
+                            String awemeId = dimensionsJson.getString("aweme_id");
+                            String awemeNickName = dimensionsJson.getString("aweme_nick_name");
                             Integer statTimeDay = Integer.valueOf(dimensionsJson.getString("stat_time_day").replace("-", ""));
                             Integer hour = Integer.valueOf(dimensionsJson.getString("stat_time_hour").substring(11, 13));
                             BytedancePromoterReportHour bytedancePromoterReportHour = JSONObject.parseObject(metricsJson.toJSONString(), BytedancePromoterReportHour.class);
@@ -285,8 +295,9 @@ public class BytedancePromoterReportServiceImpl implements IBytedancePromoterRep
                             bytedancePromoterReportHour.setCdpPromotionName(cdpPromotionName);
                             bytedancePromoterReportHour.setStatTimeDay(statTimeDay);
                             bytedancePromoterReportHour.setHour(hour);
+                            bytedancePromoterReportHour.setAwemeId(awemeId);
+                            bytedancePromoterReportHour.setAwemeNickName(awemeNickName);
                             hours.add(bytedancePromoterReportHour);
-
                             dorisLoadManager.add("media_api","bytedance_promoter_report_hour", bytedancePromoterReportHour);
                         }
                     }
@@ -377,6 +388,8 @@ public class BytedancePromoterReportServiceImpl implements IBytedancePromoterRep
                             String cdpProjectName = dimensionsJson.getString("cdp_project_name");
                             Long cdpPromotionId = dimensionsJson.getLong("cdp_promotion_id");
                             String cdpPromotionName = dimensionsJson.getString("cdp_promotion_name");
+                            String awemeId = dimensionsJson.getString("aweme_id");
+                            String awemeNickName = dimensionsJson.getString("aweme_nick_name");
                             Integer statTimeDay = Integer.valueOf(dimensionsJson.getString("stat_time_day").replace("-", ""));
                             BytedancePromoterReportDaily promoterReportDaily = JSONObject.parseObject(metricsJson.toJSONString(), BytedancePromoterReportDaily.class);
                             promoterReportDaily.setAdvertiserId(advertiserId);
@@ -385,6 +398,8 @@ public class BytedancePromoterReportServiceImpl implements IBytedancePromoterRep
                             promoterReportDaily.setCdpPromotionId(cdpPromotionId);
                             promoterReportDaily.setCdpPromotionName(cdpPromotionName);
                             promoterReportDaily.setStatTimeDay(statTimeDay);
+                            promoterReportDaily.setAwemeId(awemeId);
+                            promoterReportDaily.setAwemeNickName(awemeNickName);
                             promoterReportDailies.add(promoterReportDaily);
 
                             dorisLoadManager.add("media_api", "bytedance_promoter_report_daily", promoterReportDaily);

job-bytedance/src/main/java/cn/com/ctop/job/bytedance/data/utils/FieldsConfig.java

@@ -29,6 +29,8 @@ public class FieldsConfig {
         hourDimensions.add("cdp_project_name");
         hourDimensions.add("cdp_promotion_id");
         hourDimensions.add("cdp_promotion_name");
+        hourDimensions.add("aweme_id");
+        hourDimensions.add("aweme_nick_name");
         return hourDimensions;
 
     }
@@ -40,6 +42,8 @@ public class FieldsConfig {
         hourDimensions.add("cdp_project_name");
         hourDimensions.add("cdp_promotion_id");
         hourDimensions.add("cdp_promotion_name");
+        hourDimensions.add("aweme_id");
+        hourDimensions.add("aweme_nick_name");
         return hourDimensions;
 
     }

job-bytedance/src/main/resources/application.yml

@@ -159,10 +159,8 @@ mybatis-plus:
       # 这个配置会将执行的sql打印出来，在开发或测试的时候可以用
     #log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
 
-#logging:
-#  level:
-#    root: info
-#  config: classpath:logback-dev.xml
+logging:
+  config: classpath:logback-prod.xml
 
 xxl:
   job:
@@ -174,7 +172,7 @@ xxl:
       ip:
       includeIpPrefix: 172
       logpath: /data/webapp/hr_job-bytedance/log
-      logretentiondays: 2
+      logretentiondays: 3
     admin:
       addresses: http://172.16.0.108:9003/xxl-job-admin
 api:

job-bytedance/src/main/resources/logback-dev.xml

@@ -8,7 +8,7 @@
     <property name="LOG_PATTERN" value="%date{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n"/>
 
     <!-- 定义日志存储的路径，不要配置相对路径 -->
-   <!-- <property name="FILE_PATH" value="/Users/yumeng/log/spring-log.%d{yyyy-MM-dd}.%i.log"/>-->
+    <!-- <property name="FILE_PATH" value="/Users/yumeng/logs/spring-log.%d{yyyy-MM-dd}.%i.log"/>-->
     <property name="FILE_PATH" value="/data/webapp/hr_job-bytedance/log/spring-log.%d{yyyy-MM-dd}.%i.log"/>
 
     <!-- 控制台输出日志 -->
@@ -26,20 +26,16 @@
     <!--每天生成一个日志文件，保存30天的日志文件。rollingFile用来切分文件的 -->
     <appender name="rollingFile" class="ch.qos.logback.core.rolling.RollingFileAppender">
 
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
             <fileNamePattern>${FILE_PATH}</fileNamePattern>
-
-            <!-- keep 15 days' worth of history -->
+            <!-- 日志文件的最大大小 -->
+            <maxFileSize>2MB</maxFileSize>
+            <!-- 保留1天的历史日志 -->
             <maxHistory>1</maxHistory>
-
-            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-                <!-- 日志文件的最大大小 -->
-                <maxFileSize>2MB</maxFileSize>
-            </timeBasedFileNamingAndTriggeringPolicy>
-
-            <!-- 超出删除老文件 -->
+            <!-- 日志总大小上限，超出删除老文件 -->
             <totalSizeCap>1GB</totalSizeCap>
+            <!-- 应用启动时清理过期的历史日志 -->
+            <cleanHistoryOnStart>true</cleanHistoryOnStart>
         </rollingPolicy>
 
         <encoder>

job-bytedance/src/main/resources/logback-prod.xml

@@ -26,20 +26,16 @@
     <!--每天生成一个日志文件，保存30天的日志文件。rollingFile用来切分文件的 -->
     <appender name="rollingFile" class="ch.qos.logback.core.rolling.RollingFileAppender">
 
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
             <fileNamePattern>${FILE_PATH}</fileNamePattern>
-
-            <!-- keep 15 days' worth of history -->
+            <!-- 日志文件的最大大小 -->
+            <maxFileSize>2MB</maxFileSize>
+            <!-- 保留1天的历史日志 -->
             <maxHistory>1</maxHistory>
-
-            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-                <!-- 日志文件的最大大小 -->
-                <maxFileSize>2MB</maxFileSize>
-            </timeBasedFileNamingAndTriggeringPolicy>
-
-            <!-- 超出删除老文件 -->
+            <!-- 日志总大小上限，超出删除老文件 -->
             <totalSizeCap>1GB</totalSizeCap>
+            <!-- 应用启动时清理过期的历史日志 -->
+            <cleanHistoryOnStart>true</cleanHistoryOnStart>
         </rollingPolicy>
 
         <encoder>

job-bytedance/src/main/resources/logback-test.xml

@@ -8,7 +8,7 @@
     <property name="LOG_PATTERN" value="%date{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n"/>
 
     <!-- 定义日志存储的路径，不要配置相对路径 -->
-      <!--  <property name="FILE_PATH" value="/Users/yumeng/log/spring-log.%d{yyyy-MM-dd}.%i.log"/>-->
+    <!-- <property name="FILE_PATH" value="/Users/yumeng/logs/spring-log.%d{yyyy-MM-dd}.%i.log"/>-->
     <property name="FILE_PATH" value="/data/webapp/hr_job-bytedance/log/spring-log.%d{yyyy-MM-dd}.%i.log"/>
 
     <!-- 控制台输出日志 -->
@@ -26,20 +26,16 @@
     <!--每天生成一个日志文件，保存30天的日志文件。rollingFile用来切分文件的 -->
     <appender name="rollingFile" class="ch.qos.logback.core.rolling.RollingFileAppender">
 
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
             <fileNamePattern>${FILE_PATH}</fileNamePattern>
-
-            <!-- keep 15 days' worth of history -->
+            <!-- 日志文件的最大大小 -->
+            <maxFileSize>2MB</maxFileSize>
+            <!-- 保留1天的历史日志 -->
             <maxHistory>1</maxHistory>
-
-            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-                <!-- 日志文件的最大大小 -->
-                <maxFileSize>2MB</maxFileSize>
-            </timeBasedFileNamingAndTriggeringPolicy>
-
-            <!-- 超出删除老文件 -->
+            <!-- 日志总大小上限，超出删除老文件 -->
             <totalSizeCap>1GB</totalSizeCap>
+            <!-- 应用启动时清理过期的历史日志 -->
+            <cleanHistoryOnStart>true</cleanHistoryOnStart>
         </rollingPolicy>
 
         <encoder>