diff --git a/apps/common/sites_sign.py b/apps/common/sites_sign.py index e316fce..35c6330 100644 --- a/apps/common/sites_sign.py +++ b/apps/common/sites_sign.py @@ -13,7 +13,61 @@ import ddddocr logger = logging.getLogger('sign') user_agent = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/98.0.4758.102 Safari/537.36' -def signIngress(site_name, site_name_cn, site_url, site_cookie): +def signIngress(site_name, site_name_cn, site_url, site_cookie, sign_type): + """ + 签到站点匹配入口 + """ + + if sign_type == 'hdchina': + flag, data = hdchina(site_name, site_name_cn, site_url, site_cookie) + elif sign_type == 'general': + flag, data = general(site_name, site_name_cn, site_url, site_cookie) + elif sign_type == 'pterclub': + flag, data = pterclub(site_name, site_name_cn, site_url, site_cookie) + elif sign_type == 'hdarea': + flag, data = hdarea(site_name, site_name_cn, site_url, site_cookie) + elif sign_type == 'hdcity': + flag, data = hdcity(site_name, site_name_cn, site_url, site_cookie) + elif sign_type == 'btschool': + flag, data = btschool(site_name, site_name_cn, site_url, site_cookie) + elif sign_type == 'hares': + flag, data = hares(site_name, site_name_cn, site_url, site_cookie) + elif sign_type == 'totheglory': + flag, data = ttg(site_name, site_name_cn, site_url, site_cookie) + elif sign_type == '52pt': + flag, data = pt52(site_name, site_name_cn, site_url, site_cookie) + elif sign_type == 'nosign': + flag, data = nosign(site_name, site_name_cn, site_url, site_cookie) + elif sign_type == 'keepfrds': + flag, data = keepfrds(site_name, site_name_cn, site_url, site_cookie) + elif sign_type == 'tjupt': + flag, data = tjupt(site_name, site_name_cn, site_url, site_cookie) + elif sign_type == 'hd': + flag, data = hd(site_name, site_name_cn, site_url, site_cookie) + elif sign_type == 'greatposterwall': + flag, data = greatposterwall(site_name, site_name_cn, site_url, site_cookie) + elif sign_type == 'open': + try: + flag, data = opencd(site_name, site_name_cn, site_url, site_cookie) + except Exception as e: + logger.error(str(e)) + return False,'%s 数据异常' % site_name + elif sign_type == 'hdsky': + try: + flag, data = hdsky(site_name, site_name_cn, site_url, site_cookie) + except Exception as e: + logger.error(str(e)) + return False,'%s 数据异常' % site_name + elif sign_type == 'haidan': + flag, data = haidan(site_name, site_name_cn, site_url, site_cookie) + elif sign_type == 'ptsbao': + flag, data = ptsbao(site_name, site_name_cn, site_url, site_cookie) + else: + flag, data = (False,'%s 未匹配站点' % site_name) + + return flag, data + +def signIngressOld(site_name, site_name_cn, site_url, site_cookie): """ 签到站点匹配入口 """ @@ -22,7 +76,7 @@ def signIngress(site_name, site_name_cn, site_url, site_cookie): flag, data = hdchina(site_name, site_name_cn, site_url, site_cookie) elif site_name in ['hdfans','1ptba','ptchina','3wmg','discfan','hddolby','hdatmos','soulvoice', 'pthome','hdtime','hdzone','htpt','audiences','nicept','hdhome','pttime', - 'lemonhd','ourbits','asf']: + 'lemonhd','ourbits','hdmayi','asf']: flag, data = general(site_name, site_name_cn, site_url, site_cookie) elif site_name == 'pterclub': flag, data = pterclub(site_name, site_name_cn, site_url, site_cookie) @@ -38,8 +92,8 @@ def signIngress(site_name, site_name_cn, site_url, site_cookie): flag, data = ttg(site_name, site_name_cn, site_url, site_cookie) elif site_name == '52pt': flag, data = pt52(site_name, site_name_cn, site_url, site_cookie) - elif site_name in ['beitai','msg','hdmayi','oshen','avgv','eastgame','et8','itzmx']: - flag, data = noSign(site_name, site_name_cn, site_url, site_cookie) + elif site_name in ['beitai','msg','oshen','avgv','eastgame','et8','itzmx']: + flag, data = nosign(site_name, site_name_cn, site_url, site_cookie) elif site_name == 'keepfrds': flag, data = keepfrds(site_name, site_name_cn, site_url, site_cookie) elif site_name == 'tjupt': @@ -482,7 +536,7 @@ def general(site_name, site_name_cn, site_url, site_cookie): return False, msg -def noSign(site_name, site_name_cn, site_url, site_cookie): +def nosign(site_name, site_name_cn, site_url, site_cookie): """ 无签到，直接访问 """ diff --git a/apps/cron/crontabs.py b/apps/cron/crontabs.py index 3254cf3..de93970 100644 --- a/apps/cron/crontabs.py +++ b/apps/cron/crontabs.py @@ -39,6 +39,7 @@ def sign(crontab_id): site_config = SiteConfig.objects.get(name=site_name) site_url = site_config.index_url site_name_cn = site_config.name_cn + site_sign_type = site_config.sign_type #headers = { #'user-agent': user_agent, @@ -46,7 +47,7 @@ def sign(crontab_id): #'cookie': site_cookie #} #统一签到入口 - flag, data = signIngress(site_name, site_name_cn, site_url, site_cookie) + flag, data = signIngress(site_name, site_name_cn, site_url, site_cookie, site_sign_type) try: Log.objects.create(name = '签到',type_id = 1000, crontab_id = crontab_id, site_name=site_name, message = data, status = flag) diff --git a/apps/initdata/initDatas.py b/apps/initdata/initDatas.py index 79d8afd..6a710b2 100644 --- a/apps/initdata/initDatas.py +++ b/apps/initdata/initDatas.py @@ -26,50 +26,50 @@ def init_datas(): print("管理员已经存在,忽略...") print('开始初始化站点配置...') - sites_data = [{'name':'hdfans','name_cn':'红豆饭','index_url':'https://hdfans.org'}, - {'name':'1ptba','name_cn':'壹PT吧','index_url':'https://1ptba.com'}, - {'name':'ptchina','name_cn':'铂金学院','index_url':'https://ptchina.org'}, - {'name':'hdchina','name_cn':'瓷器','index_url':'https://hdchina.org'}, - {'name':'hdmayi','name_cn':'小蚂蚁','index_url':'http://hdmayi.com'}, - {'name':'msg','name_cn':'马杀鸡','index_url':'https://pt.msg.vg'}, - {'name':'beitai','name_cn':'备胎','index_url':'https://www.beitai.pt'}, - {'name':'oshen','name_cn':'奥申','index_url':'http://www.oshen.win'}, - {'name':'avgv','name_cn':'爱薇','index_url':'http://avgv.cc'}, - {'name':'eastgame','name_cn':'吐鲁番','index_url':'https://pt.eastgame.org'}, - {'name':'keepfrds','name_cn':'朋友','index_url':'https://pt.keepfrds.com'}, - {'name':'tjupt','name_cn':'北洋园','index_url':'https://tjupt.org'}, - {'name':'itzmx','name_cn':'分享站','index_url':'https://pt.itzmx.com'}, - {'name':'greatposterwall','name_cn':'海豹','index_url':'https://greatposterwall.com'}, - {'name':'hd','name_cn':'海带','index_url':'https://www.hd.ai'}, - {'name':'m-team','name_cn':'馒头','index_url':'https://kp.m-team.cc'}, - {'name':'lemonhd','name_cn':'柠檬','index_url':'https://lemonhd.org'}, - {'name':'btschool','name_cn':'学校','index_url':'https://pt.btschool.club'}, - {'name':'pthome','name_cn':'铂金家','index_url':'https://pthome.net'}, - {'name':'totheglory','name_cn':'听听歌','index_url':'https://totheglory.im'}, - {'name':'hdhome','name_cn':'家园','index_url':'https://hdhome.org'}, - {'name':'pterclub','name_cn':'猫站','index_url':'https://pterclub.com'}, - {'name':'ourbits','name_cn':'我堡','index_url':'https://ourbits.club'}, - {'name':'hdsky','name_cn':'天空','index_url':'https://hdsky.me'}, - {'name':'hares','name_cn':'白兔','index_url':'https://club.hares.top'}, - {'name':'et8','name_cn':'他吹吹风','index_url':'https://et8.org'}, - {'name':'audiences','name_cn':'观众','index_url':'https://audiences.me'}, - {'name':'hdcity','name_cn':'城市','index_url':'https://hdcity.city'}, - {'name':'open','name_cn':'皇后','index_url':'https://open.cd'}, - {'name':'hdarea','name_cn':'高清视界','index_url':'https://www.hdarea.co'}, - {'name':'soulvoice','name_cn':'聆音','index_url':'https://pt.soulvoice.club'}, - {'name':'nicept','name_cn':'老师','index_url':'https://www.nicept.net'}, - {'name':'haidan','name_cn':'海胆','index_url':'https://www.haidan.video'}, - {'name':'3wmg','name_cn':'芒果','index_url':'https://www.3wmg.com'}, - {'name':'discfan','name_cn':'碟粉','index_url':'https://discfan.net'}, - {'name':'htpt','name_cn':'海棠','index_url':'https://www.htpt.cc'}, - {'name':'hddolby','name_cn':'杜比','index_url':'https://www.hddolby.com'}, - {'name':'hdzone','name_cn':'高清地带','index_url':'https://hdzone.me'}, - {'name':'pttime','name_cn':'时间','index_url':'https://www.pttime.org'}, - {'name':'hdatmos','name_cn':'阿童木','index_url':'https://hdatmos.club'}, - {'name':'52pt','name_cn':'52PT','index_url':'https://52pt.site'}, - {'name':'hdtime','name_cn':'高清时间','index_url':'https://hdtime.org'}, - {'name':'asf','name_cn':'A-SOUL','index_url':'https://p2p.bbs.asf.ink'}, - {'name':'ptsbao','name_cn':'烧包','index_url':'https://ptsbao.club'}, + sites_data = [{'name':'hdfans','name_cn':'红豆饭','index_url':'https://hdfans.org','sign_type':'general'}, + {'name':'1ptba','name_cn':'壹PT吧','index_url':'https://1ptba.com','sign_type':'general'}, + {'name':'ptchina','name_cn':'铂金学院','index_url':'https://ptchina.org','sign_type':'general'}, + {'name':'hdchina','name_cn':'瓷器','index_url':'https://hdchina.org','sign_type':'hdchina'}, + {'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':'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'}, + {'name':'itzmx','name_cn':'分享站','index_url':'https://pt.itzmx.com','sign_type':'nosign'}, + {'name':'greatposterwall','name_cn':'海豹','index_url':'https://greatposterwall.com','sign_type':'greatposterwall'}, + {'name':'hd','name_cn':'海带','index_url':'https://www.hd.ai','sign_type':'hd'}, + {'name':'m-team','name_cn':'馒头','index_url':'https://kp.m-team.cc','sign_type':'nosign'}, + {'name':'lemonhd','name_cn':'柠檬','index_url':'https://lemonhd.org','sign_type':'general'}, + {'name':'btschool','name_cn':'学校','index_url':'https://pt.btschool.club','sign_type':'btschool'}, + {'name':'pthome','name_cn':'铂金家','index_url':'https://pthome.net','sign_type':'general'}, + {'name':'totheglory','name_cn':'听听歌','index_url':'https://totheglory.im','sign_type':'ttg'}, + {'name':'hdhome','name_cn':'家园','index_url':'https://hdhome.org','sign_type':'general'}, + {'name':'pterclub','name_cn':'猫站','index_url':'https://pterclub.com','sign_type':'pterclub'}, + {'name':'ourbits','name_cn':'我堡','index_url':'https://ourbits.club','sign_type':'general'}, + {'name':'hdsky','name_cn':'天空','index_url':'https://hdsky.me','sign_type':'hdsky'}, + {'name':'hares','name_cn':'白兔','index_url':'https://club.hares.top','sign_type':'hares'}, + {'name':'et8','name_cn':'他吹吹风','index_url':'https://et8.org','sign_type':'nosign'}, + {'name':'audiences','name_cn':'观众','index_url':'https://audiences.me','sign_type':'general'}, + {'name':'hdcity','name_cn':'城市','index_url':'https://hdcity.city','sign_type':'hdcity'}, + {'name':'open','name_cn':'皇后','index_url':'https://open.cd','sign_type':'opencd'}, + {'name':'hdarea','name_cn':'高清视界','index_url':'https://www.hdarea.co','sign_type':'hdarea'}, + {'name':'soulvoice','name_cn':'聆音','index_url':'https://pt.soulvoice.club','sign_type':'general'}, + {'name':'nicept','name_cn':'老师','index_url':'https://www.nicept.net','sign_type':'general'}, + {'name':'haidan','name_cn':'海胆','index_url':'https://www.haidan.video','sign_type':'haidan'}, + {'name':'3wmg','name_cn':'芒果','index_url':'https://www.3wmg.com','sign_type':'general'}, + {'name':'discfan','name_cn':'碟粉','index_url':'https://discfan.net','sign_type':'general'}, + {'name':'htpt','name_cn':'海棠','index_url':'https://www.htpt.cc','sign_type':'general'}, + {'name':'hddolby','name_cn':'杜比','index_url':'https://www.hddolby.com','sign_type':'general'}, + {'name':'hdzone','name_cn':'高清地带','index_url':'https://hdzone.me','sign_type':'general'}, + {'name':'pttime','name_cn':'时间','index_url':'https://www.pttime.org','sign_type':'general'}, + {'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://p2p.bbs.asf.ink','sign_type':'general'}, + {'name':'ptsbao','name_cn':'烧包','index_url':'https://ptsbao.club','sign_type':'ptsbao'}, ] for site in sites_data: @@ -78,15 +78,15 @@ def init_datas(): SiteConfig.objects.create(name = site['name'], name_cn = site['name_cn'], index_url = site['index_url'], + sign_type = site['sign_type'], ) print('添加站点 [%s] 成功' % site['name']) else: #更新站点配置 - #SiteConfig.objects.filter(name=site['name']).update(name_cn = site['name_cn'], - #index_url=site['index_url'], - #) - #print('站点 [%s] 更新成功' % site['name']) - print('站点 [%s] 已经存在,忽略...' % site['name']) + SiteConfig.objects.filter(name=site['name']).update(sign_type = site['sign_type']) + + print('站点 [%s] 更新成功' % site['name']) + #print('站点 [%s] 已经存在,忽略...' % site['name']) print('开始初始化任务类型...')