Merge branch 'dust' of https://github.com/monk-coder/dust into dust

和尚 · 和尚 · commit c6f91195caa7 · 2021-04-02T00:34:50.000+08:00
diff --git a/i-chenzhe/remote_crontab_list.sh b/i-chenzhe/remote_crontab_list.sh
@@ -1,14 +1,12 @@
+# 长期活动
 # 百变大咖秀
 10 10,11 * * 2-5 node /scripts/z_entertainment.js >> /scripts/logs/z_entertainment.log 2>&1
-
 # 粉丝互动
 3 10 * * * node /scripts/z_fanslove.js >> /scripts/logs/z_fanslove.log 2>&1
-
 # 超级摇一摇
 3 20 * * * node /scripts/z_shake.js >> /scripts/logs/z_shake.log 2>&1
-
 # 京东超市-大转盘
 10 10 * * * node /scripts/z_marketLottery.js >> /scripts/logs/z_marketLottery.log 2>&1
-
-# 母婴-跳一跳
-5 8,14,20 25-31 3 * node /scripts/z_mother_jump.js >> /scripts/logs/z_mother_jump.log 2>&1
+# 短期活动
+# 手机狂欢城
+0 0 1-20 4 * node /scripts/z_carnivalcity.js >> /scripts/logs/z_carnivalcity.log 2>&1
diff --git a/remote_crontab_list.sh b/remote_crontab_list.sh
@@ -0,0 +1,11 @@
+# 会把商品加入购物车的脚本
+# 加购有礼
+15 12 * * * node /scripts/monk_shop_add_to_car.js >> /scripts/logs/monk_shop_add_to_car.log 2>&1
+# 会执行加入会员操作的脚本
+# 常规脚本
+# interCenter渠道店铺签到
+0 0 * * * node /scripts/monk_inter_shop_sign.js >> /scripts/logs/monk_inter_shop_sign.log 2>&1
+# 关注有礼
+15 15 * * * node /scripts/monk_shop_follow_sku.js >> /scripts/logs/monk_shop_follow_sku.log 2>&1
+# 店铺大转盘
+3 0,10,23 * * * node /scripts/monk_shop_lottery.js >> /scripts/logs/monk_shop_lottery.log 2>&1
diff --git a/shell_script_mod.sh b/shell_script_mod.sh
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+## 克隆monk-coder仓库
+if [ ! -d "/monk/" ]; then
+    echo "未检查到monk-coder仓库脚本，初始化下载相关脚本..."
+    git clone https://github.com/monk-coder/dust /monk
+else
+    echo "更新monk-coder脚本相关文件..."
+    git -C /monk reset --hard
+    git -C /monk pull origin main --rebase
+fi
+cp -f /monk/car/*_*.js /scripts
+cp -f /monk/i-chenzhe/*_*.js /scripts
+cp -f /monk/member/*_*.js /scripts
+cp -f /monk/normal/*_*.js /scripts
+
+## 合并monk&i-chenzhe大师脚本进入crontab列表
+cat /monk/i-chenzhe/remote_crontab_list.sh /monk/remote_crontab_list.sh >> /scripts/docker/merged_list_file.sh
