Merge remote-tracking branch 'origin/master'

# Conflicts:
#	docker/crontab_list.sh
#	jd_club_lottery.js
#	jd_dreamFactory.js
#	jd_joy_feedPets.js

docker/crontab_list.sh

@@ -113,8 +113,10 @@
 #京小兑
 13 8,16,20 * * * node /scripts/jd_jxd.js >> /scripts/logs/jd_jxd.log 2>&1
 #京东健康社区
-13 1,22 * * * node /scripts/jd_health.js >> /scripts/logs/jd_health.log 2>&1
+13 1,6,22 * * * node /scripts/jd_health.js >> /scripts/logs/jd_health.log 2>&1
 #京东健康社区收集健康能量
 5-45/20 * * * * node /scripts/jd_health_collect.js >> /scripts/logs/jd_health_collect.log 2>&1
 # 幸运大转盘
 10 10,23 * * * node /scripts/jd_market_lottery.js >> /scripts/logs/jd_market_lottery.log 2>&1
+#TCL
+10 0,23 * * * node /scripts/jd_tcl.js >> /scripts/logs/jd_tcl.log 2>&1

jd_club_lottery.js

@@ -478,7 +478,7 @@ function welcomeHome() {
               if (shakeFloorNew) {
                 const jump = shakeFloorNew['jump'];
                 if (jump && jump.params && jump['params']['url']) {
-                  $.superShakeUrl = "jump.params.url"
+                  $.superShakeUrl = jump.params.url
                   console.log(`【超级摇一摇】活动链接：${jump.params.url}`);
                 }
               }

jd_dreamFactory.js

@@ -39,7 +39,7 @@ const helpAu = true; //帮作者助力 免费拿活动
 const notify = $.isNode() ? require('./sendNotify') : '';
 let jdNotify = true;//是否关闭通知，false打开通知推送，true关闭通知推送
 const randomCount = $.isNode() ? 20 : 5;
-let tuanActiveId = `9r-i4a8JFAjrx5vC-WCqew==`;
+let tuanActiveId = `mNGPTrOPluOSeZcupPI40w==`;
 const jxOpenUrl = `openjd://virtual?params=%7B%20%22category%22:%20%22jump%22,%20%22des%22:%20%22m%22,%20%22url%22:%20%22https://wqsd.jd.com/pingou/dream_factory/index.html%22%20%7D`;
 let cookiesArr = [], cookie = '', message = '', allMessage = '';
 const inviteCodes = [

jd_joy_feedPets.js

@@ -1,6 +1,6 @@
 /*
 宠汪汪喂食(如果喂食80g失败，降级一个档次喂食（40g）,依次类推),三餐，建议一小时运行一次
-更新时间：2021-3-39
+更新时间：2021-4-24
 活动入口：京东APP我的-更多工具-宠汪汪
 支持京东多个账号
 脚本兼容: QuantumultX, Surge, Loon, JSBox, Node.js
@@ -60,6 +60,7 @@ let FEED_NUM = ($.getdata('joyFeedCount') * 1) || 10;   //喂食数量默认10g,
       $.index = i + 1;
       $.isLogin = true;
       $.nickName = '';
+      await $.wait(100);
       // await TotalBean();
       // console.log(`\n开始【京东账号${$.index}】${$.nickName || $.UserName}\n`);
       // if (!$.isLogin) {

serverless.yml

@@ -64,12 +64,12 @@ inputs:
           cronExpression: "0 15 */6 * * * *"
           enable: true
           argument: jd_superMarket
-    - timer: #京豆变动通知 #疯狂的joy #监控crazyJoy分红 #京东排行榜 #领京豆额外奖励 #京东保价 #闪购盲盒 #京小兑
+    - timer: #京豆变动通知 #疯狂的joy #监控crazyJoy分红 #京东排行榜 #领京豆额外奖励 #京东保价 #闪购盲盒 #京小兑 #球队赢好礼
         parameters:
-          name: beanchange_crazyjoy_crazyjoybonus_rankingList_beanhome_price_sgmh_jxd
+          name: beanchange_crazyjoy_crazyjoybonus_rankingList_beanhome_price_sgmh_jxd_tcl
           cronExpression: "0 30 7 * * * *"
           enable: true
-          argument: jd_bean_change&jd_crazy_joy&jd_crazy_joy_bonus&jd_rankingList&jd_bean_home&jd_price&jd_sgmh&jd_jxd
+          argument: jd_bean_change&jd_crazy_joy&jd_crazy_joy_bonus&jd_rankingList&jd_bean_home&jd_price&jd_sgmh&jd_jxd&jd_tcl
     - timer: #金融养猪 #十元街 #京东快递 #京东赚赚 #京喜签到 #京东极速版红包 #女装魔盒
         parameters:
           name: pigPet_syj_kd_jdzz_sign_speedredpocke_nzmh