upstream/IYUUPlus
1
0
Fork 0
mirror of https://github.com/ledccn/IYUUPlus.git synced 2024-09-20 07:05:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

修复：HDPOST站点配置项描述错误，误配置passkey，导致辅种失败

Browse Source
This commit is contained in:
david 2021-09-17 13:44:07 +08:00
parent 888db421ed
commit c90b3b6c90
3 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
public/page/setting/sites.html
View File

@ -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();
}
};
/**
* 初始化表格
*/

2
src/Reseed/AutoReseed.php
View File

@ -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;
}
});
}

2
src/Rss/hdpost.php
View File

@ -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);