From c90b3b6c905a8cf54fb925e9632a06472532a908 Mon Sep 17 00:00:00 2001
From: david <nz1985@qq.com>
Date: Fri, 17 Sep 2021 13:44:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9AHDPOST=E7=AB=99?=
 =?UTF-8?q?=E7=82=B9=E9=85=8D=E7=BD=AE=E9=A1=B9=E6=8F=8F=E8=BF=B0=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=EF=BC=8C=E8=AF=AF=E9=85=8D=E7=BD=AEpasskey=EF=BC=8C?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=E8=BE=85=E7=A7=8D=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/page/setting/sites.html | 25 ++++++++++++++++++++-----
 src/Reseed/AutoReseed.php      |  2 +-
 src/Rss/hdpost.php             |  2 +-
 3 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/public/page/setting/sites.html b/public/page/setting/sites.html
index 80cc8e8..e627e6f 100644
--- a/public/page/setting/sites.html
+++ b/public/page/setting/sites.html
@@ -54,7 +54,7 @@
 <script id="site_field_tpl" type="text/html">
   {{# if (d.cookie.visible === true) { }}
   <div class="layui-form-item">
-    <label class="layui-form-label {{ d.cookie.required ? 'required' : '' }}">Cookie</label>
+    <label class="layui-form-label {{ d.cookie.required ? 'required' : '' }}">{{d.cookie.name}}</label>
     <div class="layui-input-block">
       <input type="text" name="{{d.cookie.name}}" {{ d.cookie.verify ? 'lay-verify="'+d.cookie.verify+'"' : '' }} lay-reqtext="{{d.cookie.name}}不能为空" placeholder="请输入{{d.cookie.name}}" class="layui-input">
       <tip>作用：模拟您的操作行为。</tip>
@@ -63,15 +63,24 @@
   {{# } }}
   {{# if (d.passkey.visible === true) { }}
   <div class="layui-form-item">
-    <label class="layui-form-label {{ d.passkey.required ? 'required' : '' }}">Passkey</label>
+    <label class="layui-form-label {{ d.passkey.required ? 'required' : '' }}">{{d.passkey.name}}</label>
     <div class="layui-input-block">
       <input type="text" name="{{d.passkey.name}}" {{ d.passkey.verify ? 'lay-verify="'+d.passkey.verify+'"' : '' }} lay-reqtext="{{d.passkey.name}}不能为空" placeholder="请输入{{d.passkey.name}}" class="layui-input">
     </div>
   </div>
   {{# } }}
+  {{# if (d.rsskey.visible === true) { }}
+  <div class="layui-form-item">
+    <label class="layui-form-label {{ d.passkey.required ? 'required' : '' }}">{{d.rsskey.name}}</label>
+    <div class="layui-input-block">
+      <input type="text" name="{{d.rsskey.name}}" {{ d.rsskey.verify ? 'lay-verify="'+d.rsskey.verify+'"' : '' }} lay-reqtext="{{d.rsskey.name}}不能为空" placeholder="请输入{{d.rsskey.name}}" class="layui-input">
+      <tip>{{d.rsskey.desc}}</tip>
+    </div>
+  </div>
+  {{# } }}
   {{# if (d.torrent_pass.visible === true) { }}
   <div class="layui-form-item">
-    <label class="layui-form-label {{ d.torrent_pass.required ? 'required' : '' }}">torrent_pass</label>
+    <label class="layui-form-label {{ d.torrent_pass.required ? 'required' : '' }}">{{d.torrent_pass.name}}</label>
     <div class="layui-input-block">
       <input type="text" name="{{d.torrent_pass.name}}" {{ d.torrent_pass.verify ? 'lay-verify="'+d.torrent_pass.verify+'"' : '' }} lay-reqtext="{{d.torrent_pass.name}}不能为空" placeholder="请输入{{d.torrent_pass.name}}" class="layui-input">
     </div>
@@ -79,7 +88,7 @@
   {{# } }}
   {{# if (d.authkey.visible === true) { }}
   <div class="layui-form-item">
-    <label class="layui-form-label {{ d.authkey.required ? 'required' : '' }}">authkey</label>
+    <label class="layui-form-label {{ d.authkey.required ? 'required' : '' }}">{{d.authkey.name}}</label>
     <div class="layui-input-block">
       <input type="text" name="{{d.authkey.name}}" {{ d.authkey.verify ? 'lay-verify="'+d.authkey.verify+'"' : '' }} lay-reqtext="{{d.authkey.name}}不能为空" placeholder="请输入{{d.authkey.name}}" class="layui-input">
     </div>
@@ -163,6 +172,7 @@
       let rule = {
           cookie: {name: 'cookie', visible: true, required: false, desc: '', verify: '', reqtext: ''}
           ,passkey: {name: 'passkey', visible: true, required: true, desc: '', verify: 'required', reqtext: ''}
+          ,rsskey: {name: 'rsskey', visible: false, required: true, desc: '', verify: 'required', reqtext: ''}
           ,torrent_pass: {name: 'torrent_pass', visible: false, required: true, desc: '', verify: 'required', reqtext: ''}
           ,authkey: {name: 'authkey', visible: false, required: true, desc: '', verify: 'required', reqtext: ''}
           ,id: false
@@ -237,6 +247,11 @@
           rule.torrent_pass.visible = true;
           rule.authkey.visible = true;
           break;
+        case 'hdpost':
+          rule.passkey.visible = false;
+          rule.rsskey.visible = true;
+          rule.rsskey.desc = '站点右上角点击头像 ->安全性 ->RSS Key ->Current RID';
+          break;
         //默认规则
         default:
           break;
@@ -245,7 +260,7 @@
         view.innerHTML = html;
       });
       form.render();
-    }
+    };
     /**
      * 初始化表格
      */
diff --git a/src/Reseed/AutoReseed.php b/src/Reseed/AutoReseed.php
index 8a5e678..0ec8e31 100644
--- a/src/Reseed/AutoReseed.php
+++ b/src/Reseed/AutoReseed.php
@@ -271,7 +271,7 @@ class AutoReseed
                 array_walk($rule, function (&$vv, $kk) {
                     $vv = trim($vv);
                 });
-                $v['reseed_check'] = $rule ? $rule : [];
+                $v['reseed_check'] = empty($rule) ? [] : $rule;
             }
         });
     }
diff --git a/src/Rss/hdpost.php b/src/Rss/hdpost.php
index 669ece2..cd0f29b 100644
--- a/src/Rss/hdpost.php
+++ b/src/Rss/hdpost.php
@@ -47,7 +47,7 @@ class hdpost extends AbstractRss
         }
 
         // 2. 替换
-        $url = str_replace("{passkey}", $this->passkey, $url);
+        $url = str_replace("{rsskey}", static::getConfig('site.rsskey', ''), $url);
         echo $this->site." 正在请求RSS... {$url}". PHP_EOL;
         $url = (stripos($url, 'http://') === 0 || stripos($url, 'https://') === 0) ? $url : $this->host . $url;
         $res = $this->curl->get($url);