Merge remote-tracking branch 'origin/master'

docker/crontab_list.sh

@@ -118,4 +118,4 @@
 # 领金贴
 5 0 * * * node /scripts/jd_jin_tie.js >> /scripts/logs/jd_jin_tie.log 2>&1
 # 跳跳乐瓜分京豆
-15 0-23/2 node /scripts/jd_jump.js >> /scripts/logs/jd_jump.log 2>&1
+15 0,12,22 * * * node /scripts/jd_jump.js >> /scripts/logs/jd_jump.log 2>&1

serverless.yml

@@ -58,12 +58,12 @@ inputs:
           cronExpression: "0 8 */3 * * * *"
           enable: true
           argument: jd_daily_egg
-    - timer: #东东超市 #十元街
+    - timer: #东东超市 #十元街 #跳跳乐
         parameters:
-          name: superMarket_syj
+          name: superMarket_syj_jump
           cronExpression: "0 15 */1 * * * *"
           enable: true
-          argument: jd_superMarket&jd_syj
+          argument: jd_superMarket&jd_syj&jd_jump
     - timer: #京豆变动通知 #疯狂的joy #监控crazyJoy分红 #京东排行榜 #领京豆额外奖励 #京东保价 #闪购盲盒
         parameters:
           name: beanchange_crazyjoy_crazyjoybonus_rankingList_beanhome_price_sgmh