From 9d183d742d4fa0a8a632684c996d0a2048746e4e Mon Sep 17 00:00:00 2001
From: "iyuu.cn" <367013672@qq.com>
Date: Sat, 14 Mar 2020 17:20:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AE=8C=E5=96=84=E8=BD=AC?=
 =?UTF-8?q?=E7=A7=BB=E5=81=9A=E7=A7=8D=E5=AE=A2=E6=88=B7=E7=AB=AF=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E5=87=BA=E7=8E=B0=E7=9A=84=E9=94=99=E8=AF=AF=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/AutoReseed.php | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/app/AutoReseed.php b/app/AutoReseed.php
index 8a408f2..7ffad15 100644
--- a/app/AutoReseed.php
+++ b/app/AutoReseed.php
@@ -13,7 +13,7 @@ use IYUU\Library\Table;
 class AutoReseed
 {
     // 版本号
-    const VER = '1.6.2';
+    const VER = '1.6.3';
     // RPC连接
     private static $links = array();
     // 客户端配置
@@ -73,8 +73,16 @@ class AutoReseed
         self::$curl = new Curl();
         self::$curl->setOpt(CURLOPT_SSL_VERIFYPEER, false);
         self::$curl->setOpt(CURLOPT_SSL_VERIFYHOST, false);
+
+        // 合作站点自动注册鉴权
+        $is_login = Oauth::login(self::$apiUrl . self::$endpoints['login']);
+        if(!$is_login){
+            die('合作站点鉴权配置，请查阅：https://www.iyuu.cn/archives/337/');
+        }
+
         // 显示支持站点列表
         self::ShowTableSites();
+
         self::$clients = isset($configALL['default']['clients']) && $configALL['default']['clients'] ? $configALL['default']['clients'] : array();
         echo "程序正在初始化运行参数... ".PHP_EOL;
         // 递归删除上次历史记录
@@ -85,8 +93,6 @@ class AutoReseed
         IFile::mkdir(self::$cacheMove);
         // 连接全局客户端
         self::links();
-        // 合作站点自动注册鉴权
-        Oauth::login(self::$apiUrl . self::$endpoints['login']);
     }
     /**
      * 显示支持站点列表
@@ -118,6 +124,9 @@ class AutoReseed
             if (isset($rs['msg']) && $rs['msg']) {
                 die($rs['msg']);
             }
+            if (isset($rs['errmsg']) && $rs['errmsg']) {
+                die($rs['errmsg']);
+            }
             die('远端服务器无响应，请稍后再试！！！');
         }
         $data = [];
@@ -538,14 +547,13 @@ class AutoReseed
     public static function move()
     {
         global $configALL;
-        $sites = self::$sites;
         foreach (self::$links as $k => $v) {
             if (self::$move[0] == $k) {
                 echo "clients_".$k."是目标转移客户端，避免冲突，已跳过！".PHP_EOL.PHP_EOL;
                 continue;
             }
             echo "正在从下载器 clients_".$k." 获取种子哈希……".PHP_EOL;
-            $hashArray = self::$links[$k]['rpc']->getList($move);
+            $hashArray = self::$links[$k]['rpc']->getList(self::$move);
             if (empty($hashArray)) {
                 // 失败
                 continue;
@@ -567,6 +575,7 @@ class AutoReseed
                 $downloadDir = self::pathReplace($downloadDir);
                 echo '转换后：'.$downloadDir.PHP_EOL;
                 if (is_null($downloadDir)) {
+                    echo 'IYUU自动转移做种客户端--使用教程 https://www.iyuu.cn/archives/351/'.PHP_EOL;
                     die("全局配置的move数组内，路径转换参数配置错误，请重新配置！！！".PHP_EOL);
                 }
                 // 种子目录：脚本要能够读取到
@@ -587,6 +596,7 @@ class AutoReseed
                         break;
                     case 'qBittorrent':
                         if (empty($path)) {
+                            echo 'IYUU自动转移做种客户端--使用教程 https://www.iyuu.cn/archives/351/'.PHP_EOL;
                             die("clients_".$k." 未设置种子的BT_backup目录，无法完成转移！");
                         }
                         $torrentPath = $path .DS. $info_hash . '.torrent';
@@ -597,6 +607,7 @@ class AutoReseed
                         break;
                 }
                 if (!is_file($torrentPath)) {
+                    echo 'IYUU自动转移做种客户端--使用教程 https://www.iyuu.cn/archives/351/'.PHP_EOL;
                     die("clients_".$k." 的种子文件{$torrentPath}不存在，无法完成转移！");
                 }
                 echo '存在种子：'.$torrentPath.PHP_EOL;