Merge remote-tracking branch 'origin/master'

This commit is contained in:
lxk0301
2021-02-28 19:36:38 +08:00
2 changed files with 9 additions and 3 deletions

View File

@@ -21,6 +21,7 @@ jobs:
DD_BOT_TOKEN: ${{ secrets.DD_BOT_TOKEN}}
DD_BOT_SECRET: ${{ secrets.DD_BOT_SECRET}}
QYWX_KEY: ${{ secrets.QYWX_KEY}}
QYWX_AM: ${{ secrets.QYWX_AM}}
IGOT_PUSH_KEY: ${{ secrets.IGOT_PUSH_KEY}}
PUSH_PLUS_TOKEN: ${{ secrets.PUSH_PLUS_TOKEN}}
PUSH_PLUS_USER: ${{ secrets.PUSH_PLUS_USER}}
@@ -38,6 +39,7 @@ jobs:
JD_CASH_SHARECODES: ${{ secrets.JD_CASH_SHARECODES}}
JXNC_SHARECODES: ${{ secrets.JXNC_SHARECODES}}
JDSGMH_SHARECODES: ${{ secrets.JDSGMH_SHARECODES}}
JDCFD_SHARECODES: ${{ secrets.JDCFD_SHARECODES}}
JDGLOBAL_SHARECODES: ${{ secrets.JDGLOBAL_SHARECODES}}
JD_BEAN_STOP: ${{ secrets.JD_BEAN_STOP}}
JD_BEAN_SIGN_STOP_NOTIFY: ${{ secrets.JD_BEAN_SIGN_STOP_NOTIFY}}
@@ -67,6 +69,7 @@ jobs:
JXNCTOKENS: ${{ secrets.JXNCTOKENS}}
DREAMFACTORY_FORBID_ACCOUNT: ${{ secrets.DREAMFACTORY_FORBID_ACCOUNT}}
JDFACTORY_FORBID_ACCOUNT: ${{ secrets.JDFACTORY_FORBID_ACCOUNT}}
CFD_NOTIFY_CONTROL: ${{ secrets.CFD_NOTIFY_CONTROL}}
steps:
- name: Checkout
@@ -102,6 +105,7 @@ jobs:
if [ $DD_BOT_TOKEN ]; then sed -i "/variables/a\ DD_BOT_TOKEN: $DD_BOT_TOKEN" serverless.yml; fi;
if [ $DD_BOT_SECRET ]; then sed -i "/variables/a\ DD_BOT_SECRET: $DD_BOT_SECRET" serverless.yml; fi;
if [ $QYWX_KEY ]; then sed -i "/variables/a\ QYWX_KEY: $QYWX_KEY" serverless.yml; fi;
if [ $QYWX_AM ]; then sed -i "/variables/a\ QYWX_AM: $QYWX_AM" serverless.yml; fi;
if [ $IGOT_PUSH_KEY ]; then sed -i "/variables/a\ IGOT_PUSH_KEY: $IGOT_PUSH_KEY" serverless.yml; fi;
if [ $PUSH_PLUS_TOKEN ]; then sed -i "/variables/a\ PUSH_PLUS_TOKEN: $PUSH_PLUS_TOKEN" serverless.yml; fi;
if [ $PUSH_PLUS_USER ]; then sed -i "/variables/a\ PUSH_PLUS_USER: $PUSH_PLUS_USER" serverless.yml; fi;
@@ -119,6 +123,7 @@ jobs:
if [ $JD_CASH_SHARECODES ]; then sed -i "/variables/a\ JD_CASH_SHARECODES: $JD_CASH_SHARECODES" serverless.yml; fi;
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 [ $JDGLOBAL_SHARECODES ]; then sed -i "/variables/a\ JDGLOBAL_SHARECODES: $JDGLOBAL_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;
@@ -148,6 +153,7 @@ jobs:
if [ $JXNCTOKENS ]; then sed -i "/variables/a\ JXNCTOKENS: $JXNCTOKENS" serverless.yml; fi;
if [ $DREAMFACTORY_FORBID_ACCOUNT ]; then sed -i "/variables/a\ DREAMFACTORY_FORBID_ACCOUNT: $DREAMFACTORY_FORBID_ACCOUNT" serverless.yml; fi;
if [ $JDFACTORY_FORBID_ACCOUNT ]; then sed -i "/variables/a\ JDFACTORY_FORBID_ACCOUNT: $JDFACTORY_FORBID_ACCOUNT" serverless.yml; fi;
if [ $CFD_NOTIFY_CONTROL ]; then sed -i "/variables/a\ CFD_NOTIFY_CONTROL: $CFD_NOTIFY_CONTROL" serverless.yml; fi;
cat serverless.yml
env

View File

@@ -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_globalmh
name: joyreward_joysteal_cash_necklace_smallhome_cfd_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_global_mh
argument: jd_joy_reward&jd_joy_steal&jd_cash&jd_necklace&jd_small_home&jd_cfd&jd_global_mh
- timer: #京东全民开红包 #进店领豆 #取关京东店铺商品 #京东抽奖机 #京东汽车 #京东秒秒币 #小鸽有礼2
parameters:
name: redPacket_shop_unsubscribe_lotteryMachine_car_ms_xg