Merge branch 'develop'

helson-lin · Mar 16, 2023 · cc706be · cc706be
2 parents d3ef60b + 760d3ff
commit cc706be
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,5 +4,6 @@ ffandown
 node_modules
 dist/**
 media/*
+config/*
 lib/*
 *.mp4
diff --git a/README.md b/README.md
@@ -23,7 +23,7 @@ release平台可执行文件，打包仅打包了常用平台，其他平台架
 
 ## docker安装
 
-CMD:  `docker run -d -p 8081:80801 -v /home/media:/app/media  -v /Uses/helson/config:/app/config h55205l/ffandown:v3`
+CMD:  `docker run -d -p 8081:8081 -v /home/media:/app/media  -v /Uses/helson/config:/app/config h55205l/ffandown:v3`
 
 `/home/media`为下载媒体的目录、默认8081端口
 `/Uses/helson/config`为配置文件目录

diff --git a/bin/utils.js b/bin/utils.js
@@ -133,7 +133,7 @@ const getDingDingBody = (text, More) => {
     const obj = {
         msgtype: 'text',
         text: {
-            content: '文件下载通知 \n' + More,
+            content: `文件下载通知: \n ${text} ${More || ''}`,
         },
         at: {
             isAtAll: true,

diff --git a/config/config.yml b/config/config.yml
@@ -1,7 +1,7 @@
 port: 8081
 downloadDir: /media/
-webhooks: 'https://api.day.app/wmKLMC4xdxL9djWCMc3SWP/文件下载通知/$TEXT'
-webhookType: 'bark'
+webhooks: 'https://oapi.dingtalk.com/robot/send?access_token=b1d3594015d5e2dfa5e0bc35ee2fe37c7b50407f30ce98a8ff0bffab6e66c379'
+webhookType: 'dingding'
 thread: false
 downloadThread: true
 useFFmpegLib: true