Merge pull request #17 from hxsf/master

some features

.dockerignore

@@ -0,0 +1,95 @@
+/docker
+!/docker/entrypoint.sh
+# Created by https://www.toptal.com/developers/gitignore/api/osx,linux,windows,visualstudiocode,composer
+# Edit at https://www.toptal.com/developers/gitignore?templates=osx,linux,windows,visualstudiocode,composer
+
+### Composer ###
+composer.phar
+/vendor/
+
+# Commit your application's lock file https://getcomposer.org/doc/01-basic-usage.md#commit-your-composer-lock-file-to-version-control
+# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file
+# composer.lock
+
+### Linux ###
+*~
+
+# temporary files which can be created if a process still has a handle open of a deleted file
+.fuse_hidden*
+
+# KDE directory preferences
+.directory
+
+# Linux trash folder which might appear on any partition or disk
+.Trash-*
+
+# .nfs files are created when an open file is removed but is still being accessed
+.nfs*
+
+### OSX ###
+# General
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+### VisualStudioCode ###
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+*.code-workspace
+
+### VisualStudioCode Patch ###
+# Ignore all local history of files
+.history
+
+### Windows ###
+# Windows thumbnail cache files
+Thumbs.db
+Thumbs.db:encryptable
+ehthumbs.db
+ehthumbs_vista.db
+
+# Dump file
+*.stackdump
+
+# Folder config file
+[Dd]esktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Windows Installer files
+*.cab
+*.msi
+*.msix
+*.msm
+*.msp
+
+# Windows shortcuts
+*.lnk
+
+# End of https://www.toptal.com/developers/gitignore/api/osx,linux,windows,visualstudiocode,composer

.gitignore

@@ -0,0 +1,93 @@
+/config/config.php
+# Created by https://www.toptal.com/developers/gitignore/api/osx,linux,windows,visualstudiocode,composer
+# Edit at https://www.toptal.com/developers/gitignore?templates=osx,linux,windows,visualstudiocode,composer
+
+### Composer ###
+composer.phar
+
+# Commit your application's lock file https://getcomposer.org/doc/01-basic-usage.md#commit-your-composer-lock-file-to-version-control
+# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file
+# composer.lock
+
+### Linux ###
+*~
+
+# temporary files which can be created if a process still has a handle open of a deleted file
+.fuse_hidden*
+
+# KDE directory preferences
+.directory
+
+# Linux trash folder which might appear on any partition or disk
+.Trash-*
+
+# .nfs files are created when an open file is removed but is still being accessed
+.nfs*
+
+### OSX ###
+# General
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+### VisualStudioCode ###
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+*.code-workspace
+
+### VisualStudioCode Patch ###
+# Ignore all local history of files
+.history
+
+### Windows ###
+# Windows thumbnail cache files
+Thumbs.db
+Thumbs.db:encryptable
+ehthumbs.db
+ehthumbs_vista.db
+
+# Dump file
+*.stackdump
+
+# Folder config file
+[Dd]esktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Windows Installer files
+*.cab
+*.msi
+*.msix
+*.msm
+*.msp
+
+# Windows shortcuts
+*.lnk
+
+# End of https://www.toptal.com/developers/gitignore/api/osx,linux,windows,visualstudiocode,composer

app/AutoReseed.php

@@ -851,6 +851,10 @@ class AutoReseed
      */
     private static function wechatMessage()
     {
+        global $configALL;
+        if ($configALL['notify_on_change'] && self::$wechatMsg['reseedSuccess'] == 0 && self::$wechatMsg['reseedError'] == 0) {
+            return;
+        }
         $br = PHP_EOL;
         $text = 'IYUU自动辅种-统计报表';
         $desp = '### 版本号：'. self::VER . $br;

config/config.sample.php

@@ -17,6 +17,8 @@
     php ./iyuu.php
  */
 return array(
+    // 有变化才发送通知（辅种成功 + 失败 > 0）
+    'notify_on_change' => false,
     // 1.【必须配置】爱语飞飞 微信通知，请访问https://iyuu.cn 用微信扫码申请
     'iyuu.cn'		=> 'IYUU',
     // 2.全局默认配置

docker/Dockerfile

@@ -1,3 +1,14 @@
-FROM php:7.4-fpm
+FROM composer:1.10.9
-EXPOSE 9000
+
-WORKDIR /var/www 
+ENV TZ Asia/Shanghai
+ENV cron="0 */1 * * *"
+
+COPY . /IYUU
+COPY ./docker/entrypoint.sh /entrypoint.sh
+
+WORKDIR /IYUU
+
+RUN apk add --no-cache bash tzdata \
+    && composer i
+
+ENTRYPOINT [ "/entrypoint.sh" ]

docker/docker-compose.yaml

@@ -0,0 +1,11 @@
+version: "2.3"
+services:
+  app:
+    image: hxsf/iyuuautoreseed
+    network_mode: host
+    environment:
+      - cron=0 * * * *
+    volumes:
+      - ./config:/IYUU/config
+      - ./torrent:/IYUU/torrent
+    restart: always

docker/entrypoint.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+DEFAULT_CRON="0 */1 * * *"
+cron=${cron:-$DEFAULT_CRON}
+set -e
+
+echo "$cron /usr/local/bin/php /IYUU/iyuu.php" | crontab -
+
+/usr/local/bin/php /IYUU/iyuu.php
+
+/usr/sbin/crond -f