Merge pull request #152 from Sirius2s/master

Update serverless.yml&index.js

index.js

@@ -1,4 +1,4 @@
-'use strict';
+//'use strict';
 exports.main_handler = async (event, context, callback) => {
   try {
       //如果想在一个定时触发器里面执行多个js文件需要在定时触发器的【附加信息】里面填写对应的名称，用 & 链接
@@ -8,7 +8,9 @@ exports.main_handler = async (event, context, callback) => {
           var request = require('request');
           //1.执行自己上传的js文件
           //require('./'+v+'.js')
-
+          //delete require.cache[require.resolve('./'+v+'.js')];
+          //require('./'+v+'.js')
+        
           //2.执行国内gitee远端js文件如果部署，在国内节点，选择1或2的方式
           //request('https://gitee.com/lxk0301/jd_scripts/raw/master/'+v+'.js', function (error, response, body) {
           //    eval(response.body)

serverless.yml

@@ -16,48 +16,48 @@ inputs:
   memorySize: 128 # 内存大小，单位MB
   timeout: 900 # 超时时间，单位秒
   events: # 触发器
-    - timer: # 签到 # 摇京豆
+    - timer: # 签到
         parameters:
-          name: jd_bean_sign_jd_club_lottery
+          name: jd_bean_sign
           cronExpression: "0 0 0,12,18 * * * *"
           enable: true
-          argument: jd_bean_sign&jd_club_lottery
-    - timer: # 京小超兑换奖品
+          argument: jd_bean_sign
+    - timer: # 京小超兑换奖品# 摇京豆
         parameters:
-          name: jd_blueCoin
+          name: jd_blueCoin_jd_club_lottery
           cronExpression: "0 0 0 * * * *"
           enable: true
-          argument: jd_blueCoin
-    - timer: # 东东农场# 东东萌宠
+          argument: jd_blueCoin&jd_club_lottery
+    - timer: # 东东农场# 东东萌宠# 京喜工厂
         parameters:
-          name: jd_fruit_jd_pet
+          name: jd_fruit_jd_pet_jd_dreamFactory
           cronExpression: "0 5 6-18/6 * * * *"
           enable: true
-          argument: jd_fruit&jd_pet
+          argument: jd_fruit&jd_pet&jd_dreamFactory
     - timer: # 宠汪汪喂食# 宠汪汪# 摇钱树# 京东种豆得豆
         parameters:
           name: jd_joy_feedPets_jd_joy_jd_moneyTree_jd_plantBean
           cronExpression: "0 15 */1 * * * *"
           enable: true
           argument: jd_joy_feedPets&jd_joy&jd_moneyTree&jd_plantBean
-    - timer: # 宠汪汪积分兑换奖品# 宠汪汪偷好友积分与狗
+    - timer: # 宠汪汪积分兑换奖品# 宠汪汪偷好友积分与狗# 点点券
         parameters:
           name: jd_joy_reward_jd_joy_steal_jd_necklace
           cronExpression: "0 0 0-16/8 * * * *"
           enable: true
           argument: jd_joy_reward&jd_joy_steal&jd_necklace
-    - timer: # 京东全民开红包 # 进店领豆 # 取关京东店铺商品# 京东抽奖机
+    - timer: # 京东全民开红包 # 进店领豆 # 取关京东店铺商品# 京东抽奖机# 东东小窝
         parameters:
-          name: jd_redPacket_jd_shop_jd_unsubscribe_jd_lotteryMachine
+          name: jd_redPacket_jd_shop_jd_unsubscribe_jd_lotteryMachine_jd_small_home
           cronExpression: "0 10 0 * * * *"
           enable: true
-          argument: jd_redPacket&jd_shop&jd_unsubscribe&jd_lotteryMachine
-    - timer: # 京东天天加速
+          argument: jd_redPacket&jd_shop&jd_unsubscribe&jd_lotteryMachine&jd_small_home
+    - timer: # 京东天天加速# 天天提鹅
         parameters:
-          name: jd_speed
+          name: jd_speed_jd_daily_egg
           cronExpression: "0 8 */3 * * * *"
           enable: true
-          argument: jd_speed
+          argument: jd_speed&jd_daily_egg
     - timer: # 东东超市
         parameters:
           name: jd_superMarket
@@ -66,16 +66,16 @@ inputs:
           argument: jd_superMarket
     - timer: # 京豆变动通知 # 京东排行榜
         parameters:
-          name: jd_bean_change
+          name: jd_bean_change_jd_rankingList
           cronExpression: "0 0 10 * * * *"
           enable: true
           argument: jd_bean_change&jd_rankingList
-    - timer: # 金融养猪# 天天提鹅
+    - timer: # 金融养猪
         parameters:
-          name: jd_pigPet_jd_daily_egg_jd_dreamFactory
-          cronExpression: "0 12 * * * * *"
+          name: jd_pigPet
+          cronExpression: "0 12 13 * * * *"
           enable: true
-          argument: jd_pigPet&jd_daily_egg&jd_dreamFactory
+          argument: jd_pigPet
   environment: #  环境变量
     variables: #  环境变量对象
       AAA: BBB # 不要删除，用来格式化对齐追加的变量的