From bca7a71b77d9dd408aa3b36969a46b8ccb21bda7 Mon Sep 17 00:00:00 2001 From: sftang Date: Tue, 31 Jan 2023 13:43:39 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E9=80=8F=E6=98=8E=E4=BB=A3?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 5 ++++ apps/initdata/initDatas.py | 8 +++---- .../0021_alter_siteproxy_username_and_more.py | 23 +++++++++++++++++++ apps/sites/models.py | 4 ++-- apps/sites/sites_sign.py | 14 +++++------ apps/sites/templates/sites/siteproxyadd.html | 4 ++-- apps/sites/templates/sites/siteproxyedit.html | 4 ++-- pthelper/settings.py | 2 +- 8 files changed, 45 insertions(+), 19 deletions(-) create mode 100644 apps/sites/migrations/0021_alter_siteproxy_username_and_more.py diff --git a/README.md b/README.md index 8eee4c1..37fc871 100644 --- a/README.md +++ b/README.md @@ -30,6 +30,11 @@ pip install --no-cache-dir -r requirements.txt -i https://pypi.mirrors.ustc.edu. ``` ![](https://raw.githubusercontent.com/xingsu1021/pthelper/master/static/screenshot/update.png) +# v2.2.4 说明 +```shell + 1、支持透明代理配置 +``` + # v2.2.3 说明 ```shell 1、新增签到代理支持 diff --git a/apps/initdata/initDatas.py b/apps/initdata/initDatas.py index da4fd5f..487f866 100644 --- a/apps/initdata/initDatas.py +++ b/apps/initdata/initDatas.py @@ -34,8 +34,8 @@ def init_datas(): {'name':'hdmayi','name_cn':'小蚂蚁','index_url':'http://hdmayi.com','sign_type':'general'}, {'name':'msg','name_cn':'马杀鸡','index_url':'https://pt.msg.vg','sign_type':'nosign'}, {'name':'beitai','name_cn':'备胎','index_url':'https://www.beitai.pt','sign_type':'nosign'}, - {'name':'oshen','name_cn':'奥申','index_url':'http://www.oshen.win','sign_type':'nosign'}, - {'name':'avgv','name_cn':'爱薇','index_url':'http://avgv.cc','sign_type':'nosign'}, + {'name':'oshen','name_cn':'奥申','index_url':'http://www.oshen.win','sign_type':'general'}, + #{'name':'avgv','name_cn':'爱薇','index_url':'http://avgv.cc','sign_type':'nosign'}, {'name':'eastgame','name_cn':'吐鲁番','index_url':'https://pt.eastgame.org','sign_type':'nosign'}, {'name':'keepfrds','name_cn':'朋友','index_url':'https://pt.keepfrds.com','sign_type':'keepfrds'}, {'name':'tjupt','name_cn':'北洋园','index_url':'https://tjupt.org','sign_type':'tjupt'}, @@ -69,7 +69,7 @@ def init_datas(): {'name':'hdatmos','name_cn':'阿童木','index_url':'https://hdatmos.club','sign_type':'general'}, {'name':'52pt','name_cn':'52PT','index_url':'https://52pt.site','sign_type':'pt52'}, {'name':'hdtime','name_cn':'高清时间','index_url':'https://hdtime.org','sign_type':'general'}, - {'name':'asf','name_cn':'A-SOUL','index_url':'https://pt.asf.ink','sign_type':'general'}, + #{'name':'asf','name_cn':'A-SOUL','index_url':'https://pt.asf.ink','sign_type':'general'}, {'name':'ptsbao','name_cn':'烧包','index_url':'https://ptsbao.club','sign_type':'nosign'}, {'name':'ssd','name_cn':'春天','index_url':'https://springsunday.net','sign_type':'nosign'}, {'name':'gainbound','name_cn':'丐帮','index_url':'https://gainbound.net','sign_type':'general'}, @@ -84,7 +84,7 @@ def init_datas(): {'name':'hhanclub','name_cn':'憨憨PT','index_url':'https://hhanclub.top','sign_type':'general'}, {'name':'hdvideo','name_cn':'高清视频','index_url':'https://hdvideo.one','sign_type':'general'}, {'name':'nanyang','name_cn':'南洋','index_url':'https://nanyangpt.com','sign_type':'nosign'}, - {'name':'icc','name_cn':'ICC','index_url':'https://www.icc2022.com','sign_type':'general'}, + {'name':'icc','name_cn':'冰激凌','index_url':'https://www.icc2022.com','sign_type':'general'}, {'name':'hitpt','name_cn':'百川','index_url':'https://www.hitpt.com','sign_type':'nosign'}, ] diff --git a/apps/sites/migrations/0021_alter_siteproxy_username_and_more.py b/apps/sites/migrations/0021_alter_siteproxy_username_and_more.py new file mode 100644 index 0000000..9e84834 --- /dev/null +++ b/apps/sites/migrations/0021_alter_siteproxy_username_and_more.py @@ -0,0 +1,23 @@ +# Generated by Django 4.1 on 2023-01-31 13:31 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('sites', '0020_siteinfo_siteproxy_id'), + ] + + operations = [ + migrations.AlterField( + model_name='siteproxy', + name='username', + field=models.CharField(max_length=50, null=True, verbose_name='账号'), + ), + migrations.AlterField( + model_name='siteproxy', + name='userpassword', + field=models.CharField(max_length=128, null=True, verbose_name='密码'), + ), + ] diff --git a/apps/sites/models.py b/apps/sites/models.py index 7fabf87..b924611 100644 --- a/apps/sites/models.py +++ b/apps/sites/models.py @@ -40,8 +40,8 @@ class SiteProxy(models.Model): address = models.CharField('代理地址', max_length=128) ptype = models.CharField('代理类型 http,socks5', max_length=10) port = models.IntegerField("代理端口") - username = models.CharField("账号", max_length=50) - userpassword = models.CharField("密码", max_length=128) + username = models.CharField("账号", max_length=50, null=True) + userpassword = models.CharField("密码", max_length=128, null=True) class SiteInfo(models.Model): """ diff --git a/apps/sites/sites_sign.py b/apps/sites/sites_sign.py index 5cb189b..6d048ea 100644 --- a/apps/sites/sites_sign.py +++ b/apps/sites/sites_sign.py @@ -101,6 +101,10 @@ def hdchina(site_name, site_name_cn, site_url, site_cookie, session): 'referer': site_url, 'cookie': site_cookie } + + #获取网站url,不带/结尾(获取crsf) + index_url = getSiteUrl(site_url) + '/index.php' + sign_url = 'https://hdchina.org/plugin_sign-in.php?cmd=signin' logger.info('--------------%s开始签到----------------' % site_name) @@ -108,16 +112,10 @@ def hdchina(site_name, site_name_cn, site_url, site_cookie, session): try: #请求首页获取csrf - response = session.get(site_url, headers=headers, timeout=10) + response = session.get(index_url, headers=headers, timeout=10) soup = BeautifulSoup(response.text, "lxml") - csrf = soup.find('meta',{'name':'x-csrf'}) - if csrf == None or csrf == "": - msg = "%s(%s) %s" % (site_name, site_name_cn, msg_err_cookie) - logger.error('--------------%s----------------' % site_name) - logger.error(str(e)) - - return False, msg + csrf = soup.find('meta',{'name':'x-csrf'}) csrf = csrf.attrs['content'] diff --git a/apps/sites/templates/sites/siteproxyadd.html b/apps/sites/templates/sites/siteproxyadd.html index fe440d8..7b08fe8 100644 --- a/apps/sites/templates/sites/siteproxyadd.html +++ b/apps/sites/templates/sites/siteproxyadd.html @@ -31,14 +31,14 @@
- +
- +
diff --git a/apps/sites/templates/sites/siteproxyedit.html b/apps/sites/templates/sites/siteproxyedit.html index 44bd4dc..201ea26 100644 --- a/apps/sites/templates/sites/siteproxyedit.html +++ b/apps/sites/templates/sites/siteproxyedit.html @@ -32,14 +32,14 @@
- +
- +
diff --git a/pthelper/settings.py b/pthelper/settings.py index e064884..affdf8c 100644 --- a/pthelper/settings.py +++ b/pthelper/settings.py @@ -226,7 +226,7 @@ DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField' #模板使用变量 SITE_NAME = 'PT助手' SITE_URL = 'https://github.com/xingsu1021/pthelper' -SITE_VERSION = '版本 2.2.3' +SITE_VERSION = '版本 2.2.4' SITE_COPYRIGHT = 'copyright © 2022' SITE_NAME_COPYRIGHT = 'copyright © 2022 PT助手'