No commit message

lance13148783 · Oct 28, 2020 · 1d0e3cf · 1d0e3cf
1 parent b635453
commit 1d0e3cf
Show file tree

Hide file tree

Showing 22 changed files with 476 additions and 260 deletions.
diff --git a/jd/.github/workflows/jd_818.yml b/jd/.github/workflows/jd_818.yml
@@ -6,7 +6,7 @@ name: jd_818
 on:
   workflow_dispatch:
   schedule:
-    - cron: '0 4,10,16,22 * * *'
+    - cron: '0 1,4,7,10,12,16,22 * * *'
   watch:
     types: started
   repository_dispatch:
@@ -38,4 +38,5 @@ jobs:
           TG_USER_ID: ${{ secrets.TG_USER_ID }}
           DD_BOT_TOKEN: ${{ secrets.DD_BOT_TOKEN }}
           DD_BOT_SECRET: ${{ secrets.DD_BOT_SECRET }}
-          IGOT_PUSH_KEY: ${{ secrets.IGOT_PUSH_KEY }}
+          IGOT_PUSH_KEY: ${{ secrets.IGOT_PUSH_KEY }}
+          JD_818_SHAREID_NOTIFY: ${{ secrets.JD_818_SHAREID_NOTIFY }}
diff --git a/jd/.github/workflows/jd_collectProduceScore.yml b/jd/.github/workflows/jd_collectProduceScore.yml
@@ -0,0 +1,42 @@
+# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
+# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
+
+name: jd_collectProduceScore
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '30 * * * *'
+  watch:
+    types: started
+  repository_dispatch:
+    types: collectProduceScore
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    if: github.event.repository.owner.id == github.event.sender.id
+    steps:
+      - uses: actions/checkout@v1
+      - name: Use Node.js 10.x
+        uses: actions/setup-node@v1
+        with:
+          node-version: 10.x
+      - name: npm install
+        run: |
+          npm install
+      - name: '运行 【京东全民营业领金币】'
+        run: |
+          node jd_collectProduceScore.js
+        env:
+          JD_COOKIE: ${{ secrets.JD_COOKIE }}
+          JD_DEBUG: ${{ secrets.JD_DEBUG }}
+          PUSH_KEY: ${{ secrets.PUSH_KEY }}
+          BARK_PUSH: ${{ secrets.BARK_PUSH }}
+          BARK_SOUND: ${{ secrets.BARK_SOUND }}
+          TG_BOT_TOKEN: ${{ secrets.TG_BOT_TOKEN }}
+          TG_USER_ID: ${{ secrets.TG_USER_ID }}
+          DD_BOT_TOKEN: ${{ secrets.DD_BOT_TOKEN }}
+          DD_BOT_SECRET: ${{ secrets.DD_BOT_SECRET }}
+          IGOT_PUSH_KEY: ${{ secrets.IGOT_PUSH_KEY }}
+          JD_818_SHAREID_NOTIFY: ${{ secrets.JD_818_SHAREID_NOTIFY }}
diff --git a/jd/README.md b/jd/README.md
@@ -28,7 +28,7 @@
 **TODO**
 
 - [x] 完善京小超脚本[jd_superMarket.js](https://raw.githubusercontent.com/lxk0301/scripts/master/jd_superMarket.js)
-- [ ] 京小超商圈助力功能[jd_superMarket.js](https://raw.githubusercontent.com/lxk0301/scripts/master/jd_superMarket.js)
+- [x] 京小超商圈助力功能[jd_superMarket.js](https://raw.githubusercontent.com/lxk0301/scripts/master/jd_superMarket.js)
 
 ## 食用方法
 
@@ -84,7 +84,6 @@
 
  3、box可以支持多账号
 
-#### 最后，农场萌宠种豆得豆互相助力可进此[telegram讨论组](https://t.me/JD_fruit_pet)
 
 ### 特别感谢(排名不分先后)：
 * [@NobyDa](https://github.com/NobyDa)

diff --git a/jd/backUp/jd_joy_help2.js b/jd/backUp/jd_joy_help2.js
diff --git a/jd/backUp/webhook.js b/jd/backUp/webhook.js
diff --git a/jd/docker/Dockerfile b/jd/docker/Dockerfile
@@ -10,7 +10,9 @@ RUN set -ex \
 RUN git clone https://github.com/lxk0301/scripts /scripts \
         && cd /scripts \
         && mkdir logs \
-        && npm install
+        && npm install \
+        && cd ~ \
+        && npm install request
 
 RUN crontab /scripts/docker/crontab_list.sh
 

diff --git a/jd/docker/Readme.md b/jd/docker/Readme.md
@@ -61,7 +61,7 @@ jd_scripts:
     - /bin/sh
     - -c
     - |
-      #crontab /scriptes/docker/my_crontab_list.sh #如果挂载了自定义任务文件 需要在 crond 的上面加行
+      #crontab /scripts/docker/my_crontab_list.sh #如果挂载了自定义任务文件 需要在 crond 的上面加行
       crond
       node
 ```

diff --git a/jd/docker/crontab_list.sh b/jd/docker/crontab_list.sh
@@ -18,3 +18,4 @@
 8 */3 * * * node /scripts/jd_speed.js >> /scripts/logs/jd_speed.log 2>&1
 11 1-23/5 * * * node /scripts/jd_superMarket.js >> /scripts/logs/jd_superMarket.log 2>&1
 55 23 * * * node /scripts/jd_unsubscribe.js >> /scripts/logs/jd_unsubscribe.log 2>&1
+0 */1 * * * node /scripts/jd_collectProduceScore.js >> /scripts/logs/jd_collectProduceScore.log 2>&1
diff --git a/jd/docker/docker-compose.yml b/jd/docker/docker-compose.yml
@@ -4,7 +4,7 @@ jd_scripts:
   restart: always
   #如果需要自定定义定时任务的需要自己写好`my_crontab_list.sh`文件 ，取消下面两个的注释 ，通过 `volumes`挂载进去。
   # volumes:
-  #   - ./my_crontab_list.sh:/scriptes/docker/my_crontab_list.sh
+  #   - ./my_crontab_list.sh:/scripts/docker/my_crontab_list.sh
   tty: true
   environment:
     # 注意环境变量填写值的时候一律不需要引号（"）下面这些只是事例，根据自己的需求增加删除
@@ -39,6 +39,6 @@ jd_scripts:
     - /bin/sh
     - -c
     - |
-      #crontab /scriptes/docker/my_crontab_list.sh  #如果挂载了自定义任务文件 需要在 crond 的上面加行
+      #crontab /scripts/docker/my_crontab_list.sh  #如果挂载了自定义任务文件 需要在 crond 的上面加行
       crond
       node
-Original file line number
+Diff line change
@@ Expand Up / @@ -61,7 +61,7 @@ jd_scripts: @@
         - /bin/sh
         - -c
         - |
-          #crontab /scriptes/docker/my_crontab_list.sh #如果挂载了自定义任务文件 需要在 crond 的上面加行
+          #crontab /scripts/docker/my_crontab_list.sh #如果挂载了自定义任务文件 需要在 crond 的上面加行
           crond
           node
     ```
@@ Expand Down @@