drpy升级至3.9.41beta14,增加自定义配置代理地址进行检测升级
This commit is contained in:
晚风拂柳颜
parent
4a5f1d85bc
commit
f6c3111e86
@ -16,11 +16,11 @@ DATABASE = 'pira'
|
||||
DB_URI = 'sqlite:///base/rules.db?charset=utf8&check_same_thread=False'
|
||||
SQLALCHEMY_DATABASE_URI = DB_URI
|
||||
SQLALCHEMY_TRACK_MODIFICATIONS = False
|
||||
SQLALCHEMY_ECHO = False # 打印sql语句
|
||||
JSON_AS_ASCII = False # jsonify返回的中文正常显示
|
||||
PLAY_URL = 'http://cms.nokia.press' # 匹配远程解析服务器链接 远程接口主页地址，后面不能有/
|
||||
SQLALCHEMY_ECHO = False # 打印sql语句
|
||||
JSON_AS_ASCII = False # jsonify返回的中文正常显示
|
||||
PLAY_URL = 'http://cms.nokia.press' # 匹配远程解析服务器链接 远程接口主页地址，后面不能有/
|
||||
PLAY_URL = PLAY_URL.rstrip('/')
|
||||
PID_URL = '' # 自定义的9001进程管理快捷方式
|
||||
PID_URL = '' # 自定义的9001进程管理快捷方式
|
||||
PID_URL = PID_URL.rstrip('/')
|
||||
HTTP_HOST = '0.0.0.0'
|
||||
HTTP_PORT = '5705'
|
||||
@ -30,28 +30,29 @@ WALL_PAPER_ENABLE = True # 启用自定义壁纸
|
||||
# WALL_PAPER = "https://picsum.photos/1280/720/?blur=10" # 自定义壁纸,可注释
|
||||
WALL_PAPER = "https://tuapi.eees.cc/api.php?category=fengjing&type=302" # 自定义壁纸,可注释
|
||||
SUP_PORT = 9001 # supervisord 服务端口
|
||||
RETRY_CNT = 3 # 验证码重试次数
|
||||
RETRY_CNT = 3 # 验证码重试次数
|
||||
# OCR_API = 'http://192.168.3.224:9000/api/ocr_img' # 验证码识别接口,传参数data
|
||||
# OCR_API = 'http://dm.mudery.com:10000' # 验证码识别接口,传参数data
|
||||
OCR_API = 'https://api.nn.ci/ocr/b64/text' # 验证码识别接口,传参数data
|
||||
OCR_API = 'https://api.nn.ci/ocr/b64/text' # 验证码识别接口,传参数data
|
||||
UNAME = 'admin' # 管理员账号
|
||||
PWD = 'drpy' # 管理员密码
|
||||
PWD = 'drpy' # 管理员密码
|
||||
USE_PY = 0 # 开启py源
|
||||
JS0_DISABLE = 0 # 禁用js0
|
||||
JS0_PASSWORD = '' # js0密码
|
||||
JS_MODE = 0 # js模式 0 drpy服务器解析 1 pluto本地解析
|
||||
JS0_DISABLE = 0 # 禁用js0
|
||||
JS0_PASSWORD = '' # js0密码
|
||||
JS_MODE = 0 # js模式 0 drpy服务器解析 1 pluto本地解析
|
||||
MAX_CONTENT_LENGTH = 1 * 1024 * 100 # 100 kB
|
||||
LIVE_MODE = 0 # 0 本地 1外网
|
||||
# LIVE_URL = 'https://gitcode.net/bd/v/-/raw/main/live/zb.txt' # 初始化外网直播地址(后续在管理界面改)
|
||||
# LIVE_URL = 'https://agit.ai/hu/hcr/raw/commit/f8e9c10309a533e5b06df133f859c45cb91f4731/0ER.txt' # 月光直播接口
|
||||
LIVE_URL = 'https://raw.fastgit.org/zhanghong1983/TVBOXZY/main/TV/live.txt' # 初始化外网直播地址(后续在管理界面改)
|
||||
CATE_EXCLUDE = '首页|留言|APP|下载|资讯|新闻|动态|明星|专题|最新|排行|解析' # 动态分类过滤
|
||||
TAB_EXCLUDE = '猜你|喜欢|APP|下载|剧情|简介|排序' # 动态线路名过滤
|
||||
TAB_EXCLUDE = '猜你|喜欢|下载|剧情|简介|排序' # 动态线路名过滤
|
||||
# {% if config.WALL_PAPER %}"wallpaper":"{{ config.WALL_PAPER }}",{% endif %}
|
||||
SEARCH_TIMEOUT = 5000 # 聚搜超时毫秒
|
||||
SEARCH_LIMIT = 24 # 聚搜限制条数
|
||||
SEARCH_TIMEOUT = 5000 # 聚搜超时毫秒
|
||||
SEARCH_LIMIT = 24 # 聚搜限制条数
|
||||
MULTI_MODE = 0 # 多源模式
|
||||
XR_MODE = 1 # 仙人模式
|
||||
JS_PROXY = 'http://localhost:5705/admin/view/=>https://ghproxy.net/https://raw.githubusercontent.com/hjdhnx/dr_py/main/js/' # 源代理
|
||||
ALI_TOKEN = '' # 适用于初始配置的阿里云token
|
||||
ALI_TOKEN = '' # 适用于初始配置的阿里云token
|
||||
ENV = '{"bili_cookie":""}' # 自定义环境变量
|
||||
UPDATE_PROXY = 'https://ghproxy.net/' # 检测升级代理
|
||||
|
||||
@ -136,7 +136,9 @@ def admin_get_ver():
|
||||
if not verfy_token():
|
||||
# return render_template('login.html')
|
||||
return R.error('请登录后再试')
|
||||
online_ver,msg = getOnlineVer()
|
||||
lsg = storage_service()
|
||||
update_proxy = lsg.getItem('UPDATE_PROXY')
|
||||
online_ver,msg = getOnlineVer(update_proxy)
|
||||
return jsonify({'local_ver':getLocalVer(),'online_ver':online_ver,'msg':msg})
|
||||
|
||||
@admin.route('/update_db')
|
||||
@ -161,7 +163,9 @@ def admin_update_db():
|
||||
def admin_update_ver():
|
||||
if not verfy_token():
|
||||
return R.failed('请登录后再试')
|
||||
msg = download_new_version()
|
||||
lsg = storage_service()
|
||||
update_proxy = lsg.getItem('UPDATE_PROXY')
|
||||
msg = download_new_version(update_proxy)
|
||||
return R.success(msg)
|
||||
|
||||
@admin.route('/rule_state/<int:state>',methods=['POST'])
|
||||
|
||||
@ -22,7 +22,7 @@ class storage_service(object):
|
||||
|
||||
def __init__(self):
|
||||
conf_list = ['LIVE_URL', 'USE_PY', 'JS_MODE','JS0_DISABLE','JS0_PASSWORD','PLAY_URL', 'PLAY_DISABLE', 'LAZYPARSE_MODE', 'WALL_PAPER_ENABLE',
|
||||
'WALL_PAPER', 'UNAME', 'PWD', 'LIVE_MODE', 'CATE_EXCLUDE', 'TAB_EXCLUDE','SEARCH_TIMEOUT','SEARCH_LIMIT','MULTI_MODE','XR_MODE','JS_PROXY','ENV','ALI_TOKEN','OCR_API']
|
||||
'WALL_PAPER', 'UNAME', 'PWD', 'LIVE_MODE', 'CATE_EXCLUDE', 'TAB_EXCLUDE','SEARCH_TIMEOUT','SEARCH_LIMIT','MULTI_MODE','XR_MODE','JS_PROXY','UPDATE_PROXY','ENV','ALI_TOKEN','OCR_API']
|
||||
for conf in conf_list:
|
||||
if not self.hasItem(conf):
|
||||
print(f'开始初始化{conf}')
|
||||
@ -32,9 +32,9 @@ class storage_service(object):
|
||||
def getStoreConf(self):
|
||||
# MAX_CONTENT_LENGTH 最大上传和端口ip一样是顶级配置,无法外部修改的
|
||||
conf_list = ['LIVE_URL', 'LIVE_MODE','PLAY_URL', 'PID_URL','USE_PY','JS_MODE', 'JS0_DISABLE','JS0_PASSWORD','PLAY_DISABLE', 'LAZYPARSE_MODE', 'WALL_PAPER_ENABLE',
|
||||
'WALL_PAPER', 'UNAME', 'PWD', 'CATE_EXCLUDE', 'TAB_EXCLUDE','SEARCH_TIMEOUT','SEARCH_LIMIT','MULTI_MODE','XR_MODE','JS_PROXY','ENV','ALI_TOKEN','OCR_API']
|
||||
'WALL_PAPER', 'UNAME', 'PWD', 'CATE_EXCLUDE', 'TAB_EXCLUDE','SEARCH_TIMEOUT','SEARCH_LIMIT','MULTI_MODE','XR_MODE','JS_PROXY','UPDATE_PROXY','ENV','ALI_TOKEN','OCR_API']
|
||||
conf_name_list = ['直播地址', '直播模式','远程地址', '进程管理链接','启用py源', 'js模式','禁用js0','js0密码','禁用免嗅', '免嗅模式', '启用壁纸', '壁纸链接', '管理账号',
|
||||
'管理密码', '分类排除', '线路排除','聚搜超时','搜索条数','多源模式','仙人模式','源代理','环境变量','阿里tk','OCR接口']
|
||||
'管理密码', '分类排除', '线路排除','聚搜超时','搜索条数','多源模式','仙人模式','源代理','升级代理','环境变量','阿里tk','OCR接口']
|
||||
conf_lists = []
|
||||
for i in range(len(conf_list)):
|
||||
conf = conf_list[i]
|
||||
|
||||
24
doc/js压缩.md
Normal file
24
doc/js压缩.md
Normal file
@ -0,0 +1,24 @@
|
||||
### 代码格式化压缩成一行教程
|
||||
```text
|
||||
npm install uglify-js -g
|
||||
uglifyjs xx.js -o xx.min.js
|
||||
|
||||
配置webstorm
|
||||
C:\Users\dashen\AppData\Roaming\npm\uglifyjs.cmd
|
||||
$FileName$ -o $FileNameWithoutExtension$.min.js
|
||||
$FileDir$
|
||||
```
|
||||
|
||||
### 格式化教程
|
||||
```text
|
||||
vscode安装插件 prettier
|
||||
webstorm安装插件 prettier
|
||||
在设置里找到prettier配置保存时执行
|
||||
对js文件右键，最下面的使用prettier重新格式化
|
||||
```
|
||||
|
||||
### 自动函数参数注释教程
|
||||
```text
|
||||
在函数上方输入 /**然后回车即可
|
||||
完结
|
||||
```
|
||||
@ -1,3 +1,7 @@
|
||||
###### 2023/04/28
|
||||
- [X] 3.9.41beta14 drpy2.js优化详情页内置线路过滤,移除APP字符串
|
||||
- [X] drpy后台管理设置中心增加 升级代理(UPDATE_PROXY)配置，可自定义github代理加速用于项目检测升级
|
||||
|
||||
###### 2023/04/23
|
||||
- [X] 3.9.41beta8 alist.js更新api,支持识别alist.json文件里的headers
|
||||
参考下面配置,支持Authorization,不需要这个参数的网址一定留空或者不填写否则会出错:
|
||||
|
||||
@ -1 +1 @@
|
||||
3.9.41beta13
|
||||
3.9.41beta14
|
||||
@ -55,7 +55,7 @@ function pre(){
|
||||
}
|
||||
|
||||
let rule = {};
|
||||
const VERSION = 'drpy1 3.9.41beta1 20230328';
|
||||
const VERSION = 'drpy1 3.9.41beta14 20230428';
|
||||
/** 已知问题记录
|
||||
* 1.影魔的jinjia2引擎不支持 {{fl}}对象直接渲染 (有能力解决的话尽量解决下，支持对象直接渲染字符串转义,如果加了|safe就不转义)[影魔牛逼，最新的文件发现这问题已经解决了]
|
||||
* Array.prototype.append = Array.prototype.push; 这种js执行后有毛病,for in 循环列表会把属性给打印出来 (这个大毛病需要重点排除一下)
|
||||
@ -87,7 +87,7 @@ const IOS_UA = 'Mozilla/5.0 (iPhone; CPU iPhone OS 13_2_3 like Mac OS X) AppleWe
|
||||
const RULE_CK = 'cookie'; // 源cookie的key值
|
||||
// const KEY = typeof(key)!=='undefined'&&key?key:'drpy_' + (rule.title || rule.host); // 源的唯一标识
|
||||
const CATE_EXCLUDE = '首页|留言|APP|下载|资讯|新闻|动态';
|
||||
const TAB_EXCLUDE = '猜你|喜欢|APP|下载|剧情|热播';
|
||||
const TAB_EXCLUDE = '猜你|喜欢|下载|剧情|热播';
|
||||
const OCR_RETRY = 3;//ocr验证重试次数
|
||||
// const OCR_API = 'http://dm.mudery.com:10000';//ocr在线识别接口
|
||||
// const OCR_API = 'http://192.168.3.239:5705/parse/ocr';//ocr在线识别接口
|
||||
|
||||
2
libs/drpy.min.js
vendored
2
libs/drpy.min.js
vendored
File diff suppressed because one or more lines are too long
@ -41,7 +41,7 @@ function pre(){
|
||||
|
||||
let rule = {};
|
||||
let vercode = typeof(pdfl) ==='function'?'drpy2.1':'drpy2';
|
||||
const VERSION = vercode+' 3.9.41beta1 20230328';
|
||||
const VERSION = vercode+' 3.9.41beta14 20230428';
|
||||
/** 已知问题记录
|
||||
* 1.影魔的jinjia2引擎不支持 {{fl}}对象直接渲染 (有能力解决的话尽量解决下，支持对象直接渲染字符串转义,如果加了|safe就不转义)[影魔牛逼，最新的文件发现这问题已经解决了]
|
||||
* Array.prototype.append = Array.prototype.push; 这种js执行后有毛病,for in 循环列表会把属性给打印出来 (这个大毛病需要重点排除一下)
|
||||
@ -74,7 +74,7 @@ const IOS_UA = 'Mozilla/5.0 (iPhone; CPU iPhone OS 13_2_3 like Mac OS X) AppleWe
|
||||
const RULE_CK = 'cookie'; // 源cookie的key值
|
||||
// const KEY = typeof(key)!=='undefined'&&key?key:'drpy_' + (rule.title || rule.host); // 源的唯一标识
|
||||
const CATE_EXCLUDE = '首页|留言|APP|下载|资讯|新闻|动态';
|
||||
const TAB_EXCLUDE = '猜你|喜欢|APP|下载|剧情|热播';
|
||||
const TAB_EXCLUDE = '猜你|喜欢|下载|剧情|热播';
|
||||
const OCR_RETRY = 3;//ocr验证重试次数
|
||||
// const OCR_API = 'http://dm.mudery.com:10000';//ocr在线识别接口
|
||||
// const OCR_API = 'http://192.168.3.239:5705/parse/ocr';//ocr在线识别接口
|
||||
|
||||
2
libs/drpy2.min.js
vendored
2
libs/drpy2.min.js
vendored
File diff suppressed because one or more lines are too long
@ -42,7 +42,7 @@
|
||||
|
||||
[更新日志](./doc/更新日志.md)
|
||||
[android&linux&macos搭建教程](./doc/安卓本地搭建说明.md) | [windows搭建教程](./doc/windows搭建说明.md)
|
||||
[写源教程](./doc/写源教程.md)
|
||||
[写源教程](./doc/写源教程.md) | [js压缩.min.js](./doc/js压缩.md)
|
||||
[十分钟学会python](https://www.w3cschool.cn/iqmrhf/wngzuozt.html)
|
||||
|
||||
---
|
||||
|
||||
@ -69,13 +69,17 @@ def getLocalVer():
|
||||
version = f.read()
|
||||
return version
|
||||
|
||||
def getOnlineVer():
|
||||
def getOnlineVer(update_proxy=''):
|
||||
ver = '1.0.1'
|
||||
msg = ''
|
||||
update_proxy = (update_proxy or '').strip()
|
||||
logger.info(f'update_proxy:{update_proxy}')
|
||||
try:
|
||||
# r = requests.get('https://gitcode.net/qq_32394351/dr_py/-/raw/master/js/version.txt',timeout=(2,2))
|
||||
# r = requests.get('https://code.gitlink.org.cn/api/v1/repos/hjdhnx/dr_py/raw/master/js/version.txt',timeout=(2,2))
|
||||
r = requests.get('https://ghproxy.net/https://raw.githubusercontent.com/hjdhnx/dr_py/main/js/version.txt',timeout=(2,2))
|
||||
url = f'{update_proxy}https://raw.githubusercontent.com/hjdhnx/dr_py/main/js/version.txt'
|
||||
logger.info(f'开始检查线上版本号:{url}')
|
||||
r = requests.get(url,headers=headers,timeout=(2,2),verify=False)
|
||||
ver = r.text
|
||||
except Exception as e:
|
||||
# print(f'{e}')
|
||||
@ -164,14 +168,16 @@ def copy_to_update():
|
||||
logger.info(f'升级程序执行完毕,全部文件已拷贝覆盖')
|
||||
return True
|
||||
|
||||
def download_new_version():
|
||||
def download_new_version(update_proxy=''):
|
||||
update_proxy = (update_proxy or '').strip()
|
||||
logger.info(f'update_proxy:{update_proxy}')
|
||||
t1 = getTime()
|
||||
base_path = os.path.dirname(os.path.abspath(os.path.dirname(__file__))) # 上级目录
|
||||
tmp_path = os.path.join(base_path, f'tmp')
|
||||
os.makedirs(tmp_path,exist_ok=True)
|
||||
# url = 'https://gitcode.net/qq_32394351/dr_py/-/archive/master/dr_py-master.zip'
|
||||
# url = 'https://code.gitlink.org.cn/api/v1/repos/hjdhnx/dr_py/archive/master.zip'
|
||||
url = 'https://ghproxy.net/https://github.com/hjdhnx/dr_py/archive/refs/heads/main.zip'
|
||||
url = f'{update_proxy}https://github.com/hjdhnx/dr_py/archive/refs/heads/main.zip'
|
||||
# tmp_files = os.listdir(tmp_path)
|
||||
# for tp in tmp_files:
|
||||
# print(f'清除缓存文件:{tp}')
|
||||
@ -181,7 +187,7 @@ def download_new_version():
|
||||
try:
|
||||
# print(f'开始下载:{url}')
|
||||
logger.info(f'开始下载:{url}')
|
||||
r = requests.get(url,headers=headers,timeout=(20,20))
|
||||
r = requests.get(url,headers=headers,timeout=(20,20),verify=False)
|
||||
rb = r.content
|
||||
download_path = os.path.join(tmp_path, 'dr_py.zip')
|
||||
with open(download_path,mode='wb+') as f:
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user