From db94c3cacee3b66e96c4c343a589a7b41d383d35 Mon Sep 17 00:00:00 2001 From: DoveBoy <393366046@qq.com> Date: Sat, 20 Mar 2021 11:42:46 +0800 Subject: [PATCH 1/4] SCF remove joysteal --- serverless.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/serverless.yml b/serverless.yml index 6240b705..4f1d8974 100644 --- a/serverless.yml +++ b/serverless.yml @@ -40,12 +40,12 @@ inputs: cronExpression: "0 3 */1 * * * *" enable: true argument: jd_joy_feedPets&jd_joy&jd_moneyTree&jd_plantBean&jd_dreamFactory&jd_jdfactory - - timer: #宠汪汪积分兑换京豆 #宠汪汪偷好友积分与狗粮 #签到领现金 #点点券 #东东小窝 #京喜财富岛 #京东直播 #京东国际盲盒 + - timer: #宠汪汪积分兑换京豆 #签到领现金 #点点券 #东东小窝 #京喜财富岛 #京东直播 #京东国际盲盒 parameters: - name: joyreward_joysteal_cash_necklace_smallhome_cfd_live_globalmh + name: joyreward_cash_necklace_smallhome_cfd_live_globalmh cronExpression: "0 0 0-16/8,20 * * * *" enable: true - argument: jd_joy_reward&jd_joy_steal&jd_cash&jd_necklace&jd_small_home&jd_cfd&jd_live&jd_global_mh + argument: jd_joy_reward&jd_cash&jd_necklace&jd_small_home&jd_cfd&jd_live&jd_global_mh - timer: #京东全民开红包 #进店领豆 #取关京东店铺商品 #京东抽奖机 #京东汽车 #京东秒秒币 #小鸽有礼2 parameters: name: redPacket_shop_unsubscribe_lotteryMachine_car_ms_xg From 6fa1617452ed0e9b3a2814a8bff8d23257d39507 Mon Sep 17 00:00:00 2001 From: DoveBoy <393366046@qq.com> Date: Sat, 20 Mar 2021 11:48:16 +0800 Subject: [PATCH 2/4] =?UTF-8?q?add=20CITY=5FSHARECODES=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- githubAction.md | 1 + 1 file changed, 1 insertion(+) diff --git a/githubAction.md b/githubAction.md index 00ff6527..9faebdb0 100644 --- a/githubAction.md +++ b/githubAction.md @@ -49,6 +49,7 @@ | `JXNC_SHARECODES` | 京喜农场
互助码 | 非必须 | / | 注意：京喜农场种植种子发生变化的时候，互助码也会变！！
每个账号 shareCode 是一个 json，
json 需要用单引号包裹且是一行字符串，
否则设置环境变量时会出错，
示例：'{"smp":"22bdadsfaadsfadse8a",
"active":"jdnc_1_btorange210113_2","joinnum":"1"}'，
多账单间使用`&`或换行分开。
详细说明参见[#Pr202](https://github.com/LXK9301/jd_scripts/pull/202)
如果使用`docker-compose`部署就不需要在互助码两端加单引号。详细参见Issues[#I35AG8](https://gitee.com/lxk0301/jd_scripts/issues/I35AG8)| | `JDSGMH_SHARECODES` | 闪购盲盒
互助码 | 非必须 | 10/ | 填写规则和上面类似，或见下方[互助码的填写规则](#互助码的填写规则) | | `JDCFD_SHARECODES` | 京喜财富岛
互助码 | 非必须 | 未知/未知 | 填写规则和上面类似，或见下方[互助码的填写规则](#互助码的填写规则) | +| `CITY_SHARECODES` | 城城领现金
互助码 | 非必须 | 未知/未知 | 填写规则和上面类似，或见下方[互助码的填写规则](#互助码的填写规则) | ##### 控制脚本功能环境变量 From 058eeee7c75e8c1d78bcc26ad86dcf30b1a019b7 Mon Sep 17 00:00:00 2001 From: DoveBoy <393366046@qq.com> Date: Sat, 20 Mar 2021 11:49:54 +0800 Subject: [PATCH 3/4] SCF add CITY_SHARECODES secret --- .github/workflows/deploy_tencent_scf.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/deploy_tencent_scf.yml b/.github/workflows/deploy_tencent_scf.yml index 01c444b7..2e1b0ff6 100644 --- a/.github/workflows/deploy_tencent_scf.yml +++ b/.github/workflows/deploy_tencent_scf.yml @@ -40,6 +40,7 @@ jobs: JXNC_SHARECODES: ${{ secrets.JXNC_SHARECODES}} JDSGMH_SHARECODES: ${{ secrets.JDSGMH_SHARECODES}} JDCFD_SHARECODES: ${{ secrets.JDCFD_SHARECODES}} + CITY_SHARECODES: ${{ secrets.CITY_SHARECODES}} JD_BEAN_STOP: ${{ secrets.JD_BEAN_STOP}} JD_BEAN_SIGN_STOP_NOTIFY: ${{ secrets.JD_BEAN_SIGN_STOP_NOTIFY}} JD_BEAN_SIGN_NOTIFY_SIMPLE: ${{ secrets.JD_BEAN_SIGN_NOTIFY_SIMPLE}} @@ -126,6 +127,7 @@ jobs: if [ $JXNC_SHARECODES ]; then sed -i "/variables/a\ JXNC_SHARECODES: $JXNC_SHARECODES" serverless.yml; fi; if [ $JDSGMH_SHARECODES ]; then sed -i "/variables/a\ JDSGMH_SHARECODES: $JDSGMH_SHARECODES" serverless.yml; fi; if [ $JDCFD_SHARECODES ]; then sed -i "/variables/a\ JDCFD_SHARECODES: $JDCFD_SHARECODES" serverless.yml; fi; + if [ $CITY_SHARECODES ]; then sed -i "/variables/a\ CITY_SHARECODES: $CITY_SHARECODES" serverless.yml; fi; if [ $JD_BEAN_STOP ]; then sed -i "/variables/a\ JD_BEAN_STOP: $JD_BEAN_STOP" serverless.yml; fi; if [ $JD_BEAN_SIGN_STOP_NOTIFY ]; then sed -i "/variables/a\ JD_BEAN_SIGN_STOP_NOTIFY: $JD_BEAN_SIGN_STOP_NOTIFY" serverless.yml; fi; if [ $JD_BEAN_SIGN_NOTIFY_SIMPLE ]; then sed -i "/variables/a\ JD_BEAN_SIGN_NOTIFY_SIMPLE: $JD_BEAN_SIGN_NOTIFY_SIMPLE" serverless.yml; fi; From 6e5147a7d2badfdc3bc2bdfb60886b1cc8dfb27b Mon Sep 17 00:00:00 2001 From: DoveBoy <393366046@qq.com> Date: Sat, 20 Mar 2021 11:51:07 +0800 Subject: [PATCH 4/4] SCF add city --- serverless.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/serverless.yml b/serverless.yml index 4f1d8974..29447098 100644 --- a/serverless.yml +++ b/serverless.yml @@ -34,12 +34,12 @@ inputs: cronExpression: "0 5 6-18/6,8 * * * *" enable: true argument: jd_fruit&jd_pet&jd_bookshop&jd_jxnc&jd_speed_sign - - timer: #宠汪汪喂食 #宠汪汪 #摇钱树 #京东种豆得豆 #京喜工厂 #东东工厂 + - timer: #宠汪汪喂食 #宠汪汪 #摇钱树 #京东种豆得豆 #京喜工厂 #东东工厂 #城城领现金 parameters: - name: feedPets_joy_moneyTree_plantBean_dreamFactory_jdfactory + name: feedPets_joy_moneyTree_plantBean_dreamFactory_jdfactory_city cronExpression: "0 3 */1 * * * *" enable: true - argument: jd_joy_feedPets&jd_joy&jd_moneyTree&jd_plantBean&jd_dreamFactory&jd_jdfactory + argument: jd_joy_feedPets&jd_joy&jd_moneyTree&jd_plantBean&jd_dreamFactory&jd_jdfactory&jd_city - timer: #宠汪汪积分兑换京豆 #签到领现金 #点点券 #东东小窝 #京喜财富岛 #京东直播 #京东国际盲盒 parameters: name: joyreward_cash_necklace_smallhome_cfd_live_globalmh