Просмотр исходного кода

Merge #17 into master from pingkang

druid版本

* pingkang: (2 commits)
  bytedance_cdp_project_list external_action
  druid版本

Signed-off-by: 1129979389@qq.com <accounts_6361eaad7b63b44dd7833e63@mail.teambition.com>
Merged-by: 1129979389@qq.com <accounts_6361eaad7b63b44dd7833e63@mail.teambition.com>

CR-link: https://codeup.aliyun.com/60c06368dbbed34fe0f0c263/job/hr_job-bytedance/change/17
huangpingkang 1 год назад
Родитель
Сommit
7387bc7d7d

+ 1 - 1
job-bytedance/pom.xml

@@ -17,7 +17,7 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <mybatis-plus.version>3.0.6</mybatis-plus.version>
-        <druid.version>1.1.10</druid.version>
+        <druid.version>1.1.23</druid.version>
         <commons.version>2.6</commons.version>
     </properties>
     <dependencies>

+ 6 - 1
job-bytedance/src/main/java/cn/com/ctop/job/bytedance/data/entity/BytedanceCdpProject.java

@@ -137,6 +137,8 @@ public class BytedanceCdpProject {
      */
     private String microPromotionType;
 
+    private String externalAction;
+
     /**
      * 快应用资产ID
      */
@@ -195,6 +197,9 @@ public class BytedanceCdpProject {
         this.microPromotionType = o.getString("micro_promotion_type");
         this.quickAppId = o.getLong("quick_app_id");
         this.microAppInstanceId = o.getLong("micro_app_instance_id");
-
+        JSONObject optimizeGoal = o.getJSONObject("optimize_goal");
+        if (!Check.isNull(optimizeGoal)) {
+            this.externalAction = optimizeGoal.getString("external_action");
+        }
     }
 }

+ 8 - 4
job-bytedance/src/main/java/cn/com/ctop/job/bytedance/data/mapper/xml/BytedanceCdpProjectListMapper.xml

@@ -31,7 +31,8 @@
         download_url,
         micro_promotion_type,
         quick_app_id,
-        micro_app_instance_id
+        micro_app_instance_id,
+        external_action
         )
         values
         <foreach collection="projectList" item="item" separator=",">
@@ -61,7 +62,8 @@
             #{item.downloadUrl},
             #{item.microPromotionType},
             #{item.quickAppId},
-            #{item.microAppInstanceId}
+            #{item.microAppInstanceId},
+            #{item.externalAction}
             )
         </foreach>
     </insert>
@@ -93,7 +95,8 @@
         download_url,
         micro_promotion_type,
         quick_app_id,
-        micro_app_instance_id
+        micro_app_instance_id,
+        external_action
         )
         values
         <foreach collection="projectList" item="item" separator=",">
@@ -123,7 +126,8 @@
             #{item.downloadUrl},
             #{item.microPromotionType},
             #{item.quickAppId},
-            #{item.microAppInstanceId}
+            #{item.microAppInstanceId},
+            #{item.externalAction}
             )
         </foreach>
     </insert>