去除多数据源配置

job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/controller/KuaiShouController.java

@@ -29,9 +29,6 @@ import java.util.concurrent.Executors;
 @Slf4j
 public class KuaiShouController {
     @Autowired
-    private IKuaiShouRefreshTokenService refreshTokenService;
-
-    @Autowired
     private IKuaiShouGroupReportService groupReportService;
     @Autowired
     private IKuaiShouRefreshTokenService kuaiShouRefreshTokenService;
@@ -46,13 +43,6 @@ public class KuaiShouController {
     private IKuaiShouAccountReportService accountReportService;
     static ExecutorService executorService = Executors.newFixedThreadPool(5);
 
-    @GetMapping("/testRefreshToken")
-    public JSONObject testRefreshToken() {
-        refreshTokenService.chuanshanjiaRefreshToken();
-        return null;
-    }
-
-
     @GetMapping("/queryGroupReportHourly")
     public void queryGroupReportHourly(String accessToken, Long advertiserId, String startDate, String endDate) {
 

job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/data/mapper/KuaiShouRefreshTokenMapper.java

@@ -18,10 +18,4 @@ public interface KuaiShouRefreshTokenMapper {
     List<JSONObject> getAdvertiserInfos();
 
     void batchUpdateAdvertiserName(@Param("infos") List<JSONObject> infos);
-
-    List<JSONObject> getChuanshanjiaRefreshTokenList();
-
-    String getThirtPartToken(@Param("thirtAppId") String thirtAppId);
-
-    void updateTokenInfo(@Param("updateAuthorizerAccessToken") String updateAuthorizerAccessToken, @Param("updateAuthorizerRefreshToken") String updateAuthorizerRefreshToken, @Param("thirtAppId") String thirtAppId, @Param("authAppId") String authAppId);
 }

job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/data/mapper/xml/KuaiShouAccountReportMapper.xml

@@ -60,65 +60,10 @@
         </foreach>
     </insert>
 
-    <insert id="replaceBatcKuaiShouAccountReportHourSD">
-        insert into media_api.kuaishou_advertiser_report_hourly
-        (
-        advertiser_id,
-        stat_date,
-        `hour`,
-        charge,
-        bclick,
-        activation,
-        event_pay_first_day,
-        event_pay_purchase_amount_first_day,
-        event_pay,
-        event_pay_purchase_amount,
-        event_register,
-        event_new_user_pay,
-        key_action,
-        conversion_num,
-        conversion_num_by_impression_7d,
-        conversion_num_cost,
-        deep_conversion_num,
-        deep_conversion_num_by_impression_7d,
-        played_end,
-        played_three_seconds,
-        ad_show,
-        minigame_iaa_purchase_amount,
-        minigame_iaa_purchase_amount_first_day
-        )
-        values
-        <foreach collection="adds" item="ad" separator=",">
-            (
-            #{ad.advertiserId},
-            #{ad.statDate},
-            #{ad.hour},
-            #{ad.charge},
-            #{ad.bclick},
-            #{ad.activation},
-            #{ad.eventPayFirstDay},
-            #{ad.eventPayPurchaseAmountFirstDay},
-            #{ad.eventPay},
-            #{ad.eventPayPurchaseAmount},
-            #{ad.eventRegister},
-            #{ad.eventNewUserPay},
-            #{ad.keyAction},
-            #{ad.conversionNum},
-            #{ad.conversionNumByImpression7d},
-            #{ad.conversionNumCost},
-            #{ad.deepConversionNum},
-            #{ad.deepConversionNumByImpression7d},
-            #{ad.playedEnd},
-            #{ad.playedThreeSeconds},
-            #{ad.adShow},
-            #{ad.minigameIaaPurchaseAmount},
-            #{ad.minigameIaaPurchaseAmountFirstDay}
-            )
-        </foreach>
-    </insert>
+
 
     <insert id="replaceBatcKuaiShouAccountReportDaily">
-        replace into media_api.kuaishou_advertiser_report_daily
+        replace into media_kuaishou_advertiser_report_daily
         (
         advertiser_id,
         stat_date,
@@ -172,60 +117,7 @@
         </foreach>
     </insert>
 
-    <insert id="replaceBatcKuaiShouAccountReportDailySD">
-        insert into media_api.kuaishou_advertiser_report_daily
-        (
-        advertiser_id,
-        stat_date,
-        charge,
-        bclick,
-        activation,
-        event_pay_first_day,
-        event_pay_purchase_amount_first_day,
-        event_pay,
-        event_pay_purchase_amount,
-        event_register,
-        event_new_user_pay,
-        key_action,
-        conversion_num,
-        conversion_num_by_impression_7d,
-        conversion_num_cost,
-        deep_conversion_num,
-        deep_conversion_num_by_impression_7d,
-        played_end,
-        played_three_seconds,
-        ad_show,
-        minigame_iaa_purchase_amount,
-        minigame_iaa_purchase_amount_first_day
-        )
-        values
-        <foreach collection="adds" item="ad" separator=",">
-            (
-            #{ad.advertiserId},
-            #{ad.statDate},
-            #{ad.charge},
-            #{ad.bclick},
-            #{ad.activation},
-            #{ad.eventPayFirstDay},
-            #{ad.eventPayPurchaseAmountFirstDay},
-            #{ad.eventPay},
-            #{ad.eventPayPurchaseAmount},
-            #{ad.eventRegister},
-            #{ad.eventNewUserPay},
-            #{ad.keyAction},
-            #{ad.conversionNum},
-            #{ad.conversionNumByImpression7d},
-            #{ad.conversionNumCost},
-            #{ad.deepConversionNum},
-            #{ad.deepConversionNumByImpression7d},
-            #{ad.playedEnd},
-            #{ad.playedThreeSeconds},
-            #{ad.adShow},
-            #{ad.minigameIaaPurchaseAmount},
-            #{ad.minigameIaaPurchaseAmountFirstDay}
-            )
-        </foreach>
-    </insert>
+
 
     <insert id="replaceKuaiShouDailyFlows">
         INSERT INTO media_api.kuaishou_advertiser_daily_flows (

job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/data/mapper/xml/KuaiShouAdSocialMapper.xml

@@ -279,7 +279,7 @@
 
     <select id="queryAdSocialErrorLogs" resultType="com.alibaba.fastjson.JSONObject">
         select id,start_date startDate,end_date endDate,is_send isSend,msg,data_dimension dataDimension
-        from media_api.kuaishou_error_log
+        from nuojing_data.kuaishou_error_log
         where data_dimension like 'ad_social_%'
     </select>
 

job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/data/mapper/xml/KuaiShouErrorLogMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="cn.com.ctop.job.kuaishou.data.mapper.KuaiShouErrorLogMapper">
 
     <insert id="replaceErrorInfo">
-        replace into media_api.kuaishou_error_log
+        replace into nuojing_data.kuaishou_error_log
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="advertiserId != null">advertiser_id,</if>
             <if test="startDate != null">start_date,</if>
@@ -23,7 +23,7 @@
     </insert>
     <delete id="deleteInfoByErrorId">
         DELETE
-        FROM media_api.kuaishou_error_log
+        FROM nuojing_data.kuaishou_error_log
         WHERE id = #{errorId}
     </delete>
 

job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/data/mapper/xml/KuaiShouRefreshTokenMapper.xml

@@ -2,30 +2,32 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="cn.com.ctop.job.kuaishou.data.mapper.KuaiShouRefreshTokenMapper">
     <insert id="replaceKuaishouAdvertiserLists">
-        INSERT  into deepthink.kuaishou_advertiser_list(
+        INSERT  into nuojing_data.media_advertiser_account(
+        media_type,
         admin_advertiser_id,
         advertiser_id,
         advertiser_name,
-        `type`
+        is_valid
         )
         values
         <foreach collection="adds" item="add" separator=",">
             (
+            2,
             #{add.adminAdvertiserId},
             #{add.advertiserId},
             #{add.advertiserName},
-            #{add.type}
+            1
             )
         </foreach>
         on duplicate key update
         advertiser_name = VALUES(advertiser_name)
     </insert>
     <update id="updateTokenByUserId">
-        UPDATE deepthink.kuaishou_auth_list
+        UPDATE nuojing_data.media_auth_account
         SET access_token  = #{updateAccessToken},
             refresh_token = #{updateRefreshToken}
         WHERE admin_advertiser_id = #{userId}
-          AND app_id = #{appId}
+          AND media_type = 2
     </update>
     <update id="batchUpdateAdvertiserName">
         <foreach collection="infos" item="info" separator=";">
@@ -35,25 +37,25 @@
             and media_type = 2
         </foreach>
     </update>
-    <update id="updateTokenInfo">
-        update thirtpart.thirt_app_token
-        set authorizer_access_token  = #{updateAuthorizerAccessToken},
-            authorizer_refresh_token = #{updateAuthorizerRefreshToken}
-        where thirt_app_id = #{thirtAppId}
-          and auth_app_id = #{authAppId}
-    </update>
-
     <select id="getTokenList" resultType="com.alibaba.fastjson.JSONObject">
-        SELECT admin_advertiser_id AS 'userId', access_token AS 'accessToken', refresh_token AS 'refreshToken', app_id AS 'appId', secret AS 'secret'
-        FROM deepthink.kuaishou_auth_list
+        SELECT a.admin_advertiser_id AS 'userId', a.access_token AS 'accessToken', a.refresh_token AS 'refreshToken', a.app_id AS 'appId', c.app_secret AS 'secret'
+        FROM nuojing_data.media_auth_account a
+                 INNER JOIN nuojing_data.media_auth_config c
+                            ON c.media_type = a.media_type
+                                AND c.app_id = a.app_id
+                                AND c.status = 1
+        WHERE a.media_type = 2
     </select>
 
     <select id="getToken" resultType="java.lang.String">
         SELECT access_token
-        FROM deepthink.kuaishou_auth_list
-        WHERE admin_advertiser_id = (SELECT admin_advertiser_id
-                                     FROM deepthink.kuaishou_advertiser_list
-                                     WHERE advertiser_id = #{advertiserId} LIMIT 1)
+        FROM nuojing_data.media_auth_account
+        WHERE media_type = 2
+          AND admin_advertiser_id = (SELECT admin_advertiser_id
+                                     FROM nuojing_data.media_advertiser_account
+                                     WHERE media_type = 2
+                                       AND advertiser_id = #{advertiserId} LIMIT 1)
+        LIMIT 1
     </select>
     <select id="getAdvertiserInfos" resultType="com.alibaba.fastjson.JSONObject">
         SELECT t1.advertiser_id AS 'advertiserId', t2.advertiser_name AS 'advertiserName'
@@ -63,14 +65,5 @@
         WHERE t1.media_type = 2
           AND t1.advertiser_name != t2.advertiser_name
     </select>
-    <select id="getChuanshanjiaRefreshTokenList" resultType="com.alibaba.fastjson.JSONObject">
-        select thirt_app_id as 'thirtAppId', auth_app_id as 'authAppId', authorizer_access_token as 'authorizerAccessToken', authorizer_refresh_token as 'authorizerRefreshToken'
-        from thirtpart.thirt_app_token
-    </select>
-    <select id="getThirtPartToken" resultType="java.lang.String">
-        select component_access_token
-        from thirtpart.thirt_app_config
-        where thirt_app_id = #{thirtAppId} limit  1
 
-    </select>
 </mapper>

job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/data/mapper/xml/KuaiShouRetryReportMapper.xml

@@ -5,16 +5,17 @@
 
     <select id="getErrorLogs" resultType="com.alibaba.fastjson.JSONObject">
         SELECT t1.msg AS 'msg',t1.is_send AS 'isSend', t1.id AS 'id', t1.advertiser_id AS 'advertiserId', t1.start_date AS 'startDate', t1.end_date AS 'endDate', t1.data_dimension AS 'dataDimension', t1.data_type AS 'dataType', t3.access_token AS 'accessToken'
-        FROM media_api.kuaishou_error_log t1
-                 LEFT JOIN deepthink.kuaishou_advertiser_list t2 ON t1.advertiser_id = t2.advertiser_id
-                 LEFT JOIN deepthink.kuaishou_auth_list t3 ON t2.admin_advertiser_id = t3.admin_advertiser_id
-        WHERE t3.type = 1
+        FROM nuojing_data.kuaishou_error_log t1
+                 LEFT JOIN nuojing_data.media_advertiser_account t2 ON t2.media_type = 2
+                     AND t1.advertiser_id = t2.advertiser_id
+                 LEFT JOIN nuojing_data.media_auth_account t3 ON t3.media_type = 2
+                     AND t2.admin_advertiser_id = t3.admin_advertiser_id
     </select>
 
     <select id="getDramaErrorLogs" resultType="com.alibaba.fastjson.JSONObject">
         SELECT t1.msg AS 'msg',t1.is_send AS 'isSend', t1.id AS 'id', t1.advertiser_id AS 'advertiserId', t1.start_date AS 'startDate', t1.end_date AS 'endDate', t1.data_dimension AS 'dataDimension', t1.data_type AS 'dataType', t2.access_token AS 'accessToken'
-        FROM media_api.kuaishou_error_log t1
-                 LEFT JOIN deepthink.kuaishou_auth_list t2 ON t1.advertiser_id = t2.admin_advertiser_id
-        WHERE t2.type = 2
+        FROM nuojing_data.kuaishou_error_log t1
+                 LEFT JOIN nuojing_data.media_auth_account t2 ON t2.media_type = 2
+                     AND t1.advertiser_id = t2.admin_advertiser_id
     </select>
 </mapper>

job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/data/service/IKuaiShouRefreshTokenService.java

@@ -15,6 +15,4 @@ public interface IKuaiShouRefreshTokenService {
     List<JSONObject> getAdvertiserInfos();
 
     void batchUpdateAdvertiserName(List<JSONObject> infos);
-
-    void chuanshanjiaRefreshToken();
 }

job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/data/service/impl/KuaiShouAccountReportServiceImpl.java

@@ -132,7 +132,6 @@ public class KuaiShouAccountReportServiceImpl implements IKuaiShouAccountReportS
         }
         if (!Check.isNull(addList)) {
             accountReportMapper.replaceBatcKuaiShouAccountReportDaily(addList);
-            //accountReportMapper.replaceBatcKuaiShouAccountReportDailySD(addList);
         }
         if (details.size() >= 2000) {
             queryAccountReportDaily(accessToken, advertiserId, startDate, endDate, page + 1);

job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/data/service/impl/KuaiShouRefreshTokenServiceImpl.java

@@ -111,36 +111,4 @@ public class KuaiShouRefreshTokenServiceImpl implements IKuaiShouRefreshTokenSer
     public void batchUpdateAdvertiserName(List<JSONObject> infos) {
         kuaiShouRefreshTokenMapper.batchUpdateAdvertiserName(infos);
     }
-
-    @Override
-    public void chuanshanjiaRefreshToken() {
-        List<JSONObject> list = kuaiShouRefreshTokenMapper.getChuanshanjiaRefreshTokenList();
-        if (!Check.isNull(list)) {
-            for (JSONObject jsonObject : list) {
-                String thirtAppId = jsonObject.getString("thirtAppId");
-                String componentAccessToken = kuaiShouRefreshTokenMapper.getThirtPartToken(thirtAppId);
-                String authAppId = jsonObject.getString("authAppId");
-                String authorizerRefreshToken = jsonObject.getString("authorizerRefreshToken");
-                String url = "https://open.douyin.com/api/tpapp/v2/auth/get_auth_token/";
-                Map<String, String> headers = new HashMap<>();
-                headers.put("access-token", componentAccessToken);
-                Map<String, Object> paramsMap = new HashMap<>();
-                paramsMap.put("authorizer_refresh_token", authorizerRefreshToken);
-                paramsMap.put("grant_type", "app_to_tp_refresh_token");
-                String s = HttpUtils.httpGet(url, paramsMap, headers);
-                JSONObject tokenJson = JSONObject.parseObject(s);
-                log.info("刷新穿山甲token返回信息：{}", tokenJson);
-                if (!Check.isNull(tokenJson)) {
-                    Integer errNo = tokenJson.getInteger("err_no");
-                    if (errNo == 0) {
-                        JSONObject data = tokenJson.getJSONObject("data");
-                        String updateAuthorizerAccessToken = data.getString("authorizer_access_token");
-                        String updateAuthorizerRefreshToken = data.getString("authorizer_refresh_token");
-                        kuaiShouRefreshTokenMapper.updateTokenInfo(updateAuthorizerAccessToken, updateAuthorizerRefreshToken, thirtAppId, authAppId);
-                    }
-                }
-            }
-
-        }
-    }
 }

job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/KuaiShouRefreshTokenJob.java

@@ -30,49 +30,6 @@ public class KuaiShouRefreshTokenJob {
     }
 
 
-    @XxlJob("chuanshanjiaRefreshToken")
-    public void chuanshanjiaRefreshToken() throws Exception {
-        String url = "https://shortplay.artlinkworld.cn/notice/chuanshanjiaRefreshToken";
-        String s = HttpUtils.httpGet(url, null, null);
-        log.info("刷新穿山甲token返回:{}", s);
-
-    }
-
-
-    @XxlJob("authorizationQuery")
-    public void authorizationQuery() throws Exception {
-        log.info("穿山甲开始获取资源列表...");
-        String url = "https://shortplay.artlinkworld.cn/csj/authorizationQuery";
-        Map<String, Object> param = new HashMap<>();
-        param.put("thirtAppId", "ttd069a6d44f4376fe");
-        param.put("authAppId", "ttdf35a988403ffce301");
-        String s = HttpUtils.httpPostRequest(url, param, null);
-        log.info("穿山甲获取资源列表:{}", s);
-    }
-
-
-    @XxlJob("authorizationDetail")
-    public void authorizationDetail() throws Exception {
-        log.info("穿山甲开始获取资源列表详情...");
-        String url = "https://shortplay.artlinkworld.cn/csj/authorizationDetail";
-        Map<String, Object> param = new HashMap<>();
-        param.put("thirtAppId", "ttd069a6d44f4376fe");
-        param.put("authAppId", "ttdf35a988403ffce301");
-        String s = HttpUtils.httpPostRequest(url, param, null);
-        log.info("穿山甲获取资源列表详情:{}", s);
-    }
-
-
-    @XxlJob("cleanData")
-    public void cleanData() throws Exception {
-        log.info("穿山甲开始清洗数据...");
-        String url = "https://shortplay.artlinkworld.cn/csj/cleanData";
-        Map<String, Object> param = new HashMap<>();
-        param.put("thirtAppId", "ttd069a6d44f4376fe");
-        param.put("authAppId", "ttdf35a988403ffce301");
-        String s = HttpUtils.httpPostRequest(url, param, null);
-        log.info("穿山甲清洗数据返回:{}", s);
-    }
 
 
 }

job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/KuaiShouRetryReportJob.java

@@ -129,121 +129,7 @@ public class KuaiShouRetryReportJob {
             log.info("重试列表为空");
         }
 
-        List<JSONObject> dramaRetryList = retryReportService.getDramaErrorLogs();
-        if (!Check.isNull(dramaRetryList)) {
-            for (int i = 0; i < dramaRetryList.size(); i++) {
-                JSONObject jsonObject = dramaRetryList.get(i);
-                Long id = jsonObject.getLong("id");
-                Long advertiserId = jsonObject.getLong("advertiserId");
-                String startDate = jsonObject.getString("startDate");
-                String endDate = jsonObject.getString("endDate");
-                String dataDimension = jsonObject.getString("dataDimension");
-                String accessToken = jsonObject.getString("accessToken");
-                Integer isSend = jsonObject.getInteger("isSend");
-                if ("drama_ad_report_detail".equals(dataDimension)) {
-                    dramaExecutorService.submit(new Runnable() {
-                        @Override
-                        public void run() {
-                            if (!Check.isNull(accessToken)) {
-                                dramaService.queryAdReportDetail(accessToken, advertiserId, startDate, endDate, 1, null, id, isSend);
-                            }
-                        }
-                    });
-                } else if ("drama_order_detail".equals(dataDimension)) {
-                    dramaExecutorService.submit(new Runnable() {
-                        @Override
-                        public void run() {
-                            if (!Check.isNull(accessToken)) {
-                                dramaService.queryOrderDetail(accessToken, advertiserId, startDate, endDate, 1, null, id, isSend);
-                            }
-                        }
-                    });
-                } else if ("drama_saler_cr_data".equals(dataDimension)) {
-                    JSONObject msg = jsonObject.getJSONObject("msg");
-                    Integer seriesType = msg.getInteger("seriesType");
-                    dramaExecutorService.submit(new Runnable() {
-                        @Override
-                        public void run() {
-                            if (!Check.isNull(accessToken)) {
-                                dramaService.querySalerCopyRightData(accessToken, advertiserId, seriesType, startDate, endDate, 1, null, id, isSend);
-                            }
-                        }
-                    });
-                } else if ("drama_series_info".equals(dataDimension)) {
-                    dramaExecutorService.submit(new Runnable() {
-                        @Override
-                        public void run() {
-                            if (!Check.isNull(accessToken)) {
-                                dramaService.querySeriesInfo(accessToken, advertiserId, null, id, isSend);
-                            }
-                        }
-                    });
-                } else if ("drama_episode_report".equals(dataDimension)) {
-                    dramaExecutorService.submit(new Runnable() {
-                        @Override
-                        public void run() {
-                            if (!Check.isNull(accessToken)) {
-                                dramaService.queryEpisodeReport(accessToken, advertiserId, startDate, endDate, null, id, isSend);
-                            }
-                        }
-                    });
-                }
-
-            }
-        } else {
-            log.info("drama重试列表为空");
-        }
 
-        List<JSONObject> adSocialRetryList = kuaiShouAdSocialService.getAdSocialErrorLogs();
-        if (!Check.isNull(adSocialRetryList)) {
-            for (JSONObject jsonObject : adSocialRetryList) {
-                Long id = jsonObject.getLong("id");
-                String startDate = jsonObject.getString("startDate");
-                String endDate = jsonObject.getString("endDate");
-                String dataDimension = jsonObject.getString("dataDimension");
-                Integer isSend = jsonObject.getInteger("isSend");
-                JSONObject msg = jsonObject.getJSONObject("msg");
-                Long advertiserId = msg.getLong("advertiserId");
-                List<JSONObject> advertiserTokens = kuaiShouAdSocialService.queryAdSocialAdvertiserToken(advertiserId);
-                String accessToken;
-                if (Check.isNull(advertiserTokens)) {
-                    continue;
-                } else {
-                    accessToken = advertiserTokens.get(0).getString("access_token");
-                }
-                if ("ad_social_task_list".equals(dataDimension)) {
-                    adSocialExecutorService.submit(new Runnable() {
-                        @Override
-                        public void run() {
-                            if (!Check.isNull(accessToken)) {
-                                kuaiShouAdSocialService.getTaskList(accessToken, advertiserId, startDate, endDate, 1, null, id, isSend);
-                            }
-                        }
-                    });
-                } else if ("ad_social_order_list".equals(dataDimension)) {
-                    adSocialExecutorService.submit(new Runnable() {
-                        @Override
-                        public void run() {
-                            if (!Check.isNull(accessToken)) {
-                                kuaiShouAdSocialService.getOrderList(accessToken, advertiserId, msg.getLong("taskId"), startDate, endDate, 1, null, id, isSend);
-                            }
-                        }
-                    });
-                } else if ("ad_social_order_daily_data".equals(dataDimension)) {
-                    adSocialExecutorService.submit(new Runnable() {
-                        @Override
-                        public void run() {
-                            if (!Check.isNull(accessToken)) {
-                                kuaiShouAdSocialService.getOrderDailyData(accessToken, advertiserId, msg.getLong("taskId"), msg.getJSONArray("orderIds").toJavaList(String.class), startDate, endDate, null, id, isSend, 1);
-                            }
-                        }
-                    });
-                }
-
-            }
-        } else {
-            log.info("adSocial重试列表为空");
-        }
 
     }
 

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

@@ -45,11 +45,11 @@ spring:
   resource:
     static-locations: classpath:/static/,classpath:/public/
   datasource:
-    url: jdbc:mysql://172.16.0.117:3390/media_api?characterEncoding=UTF-8&useUnicode=true&useSSL=false
-    username: data
-    password: hr@2025..
     type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: com.mysql.jdbc.Driver
+    url: jdbc:mysql://nuojing.rwlb.rds.aliyuncs.com:3306/nuojing_data?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+    username: nuojing_only_read
+    password: lLze2N_%(CZ%
     druid:
       # 连接池的配置信息
       # 初始化大小，最小，最大
@@ -78,13 +78,14 @@ spring:
   # redis 配置
   redis:
     # 地址
-    host: r-2ze77hczbrb3boqn16pd.redis.rds.aliyuncs.com
+    host: r-bp1ebimykbmzt1r6nnpd.redis.rds.aliyuncs.com
     # 端口，默认为6379
     port: 6379
     # 数据库索引
-    database: 0
-    # 密码
-    password: Hrdrama0422
+    database: 20
+    # 密码（自定义账号：Spring Boot 2.3 的 spring.redis 无 username 属性且 Lettuce 5.x 不支持两参数 AUTH，
+    # 采用阿里云兼容格式 user:password 整体作为密码认证）
+    password: 'nuojing_only_read:lLze2N_%(CZ%'
     # 连接超时时间
     timeout: 1000s
     lettuce:
@@ -124,9 +125,9 @@ xxl:
     executor:
       appname: module-job-kuaishou
       #      appname: module-job-test
-      port: 9005
+      port: 9006
       ip:
-      includeIpPrefix: 172
+      includeIpPrefix: 172,192,127
       logpath: /data/webapp/nj_job-kuaishou/log
       logretentiondays: 3
     admin: