iotcat
/
PyOne
mirror of https://github.com/IoTcat/PyOne.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

修复若干bug

Browse Source
master
Abbey 5 years ago
parent 17b07f718f
commit bed09d9a29
7 changed files with 67 additions and 58 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 26
      app/admin/install.py
  2. 4
      app/admin/pan_manage.py
  3. 81
      app/admin/setting.py
  4. 2
      app/utils/header.py
  5. 2
      config.py
  6. 2
      install.sh
  7. 8
      update.sh

26
app/admin/install.py
Unescape View File

@ -46,16 +46,16 @@ def install():
if request.method=='POST':
if step==3:
od_type=request.form.get('od_type','nocn')
set('od_type',od_type,user)
set_config('od_type',od_type,user)
elif step==4:
od_type=request.form.get('od_type','nocn')
od_prefix=request.form.get('od_prefix')
client_id=request.form.get('client_id')
client_secret=request.form.get('client_secret')
set('client_id',client_id,user)
set('client_secret',client_secret,user)
set_config('client_id',client_id,user)
set_config('client_secret',client_secret,user)
if od_type=='cn':
set('app_url','https://{}-my.sharepoint.cn/'.format(od_prefix),user)
set_config('app_url','https://{}-my.sharepoint.cn/'.format(od_prefix),user)
login_url=GetLoginUrl(client_id=client_id,redirect_uri=GetConfig('redirect_uri'),od_type=od_type)
else:
client_secret=request.form.get('client_secret')
@ -115,11 +115,11 @@ def test_config():
if check_mongo(host,port,user,password,db):
resp['msg']='MongoDB信息检查正确！'
resp['code']=1
set('MONGO_HOST',host)
set('MONGO_PORT',port)
set('MONGO_USER',user)
set('MONGO_PASSWORD',password)
set('MONGO_DB',db)
set_config('MONGO_HOST',host)
set_config('MONGO_PORT',port)
set_config('MONGO_USER',user)
set_config('MONGO_PASSWORD',password)
set_config('MONGO_DB',db)
else:
resp['msg']='MongoDB信息错误！'
@ -128,10 +128,10 @@ def test_config():
if check_redis(host,port,password,db):
resp['msg']='Redis信息检查正确！'
resp['code']=1
set('REDIS_HOST',host)
set('REDIS_PORT',port)
set('REDIS_PASSWORD',password)
set('REDIS_DB',db)
set_config('REDIS_HOST',host)
set_config('REDIS_PORT',port)
set_config('REDIS_PASSWORD',password)
set_config('REDIS_DB',db)
else:
resp['msg']='Redis信息错误！'
resp['code']=0

4
app/admin/pan_manage.py
Unescape View File

@ -13,7 +13,7 @@ def panage():
user=re.findall('\[(.*?)\]',k)[0]
key=re.findall('(.*)\[',k)[0]
InfoLogger().print_r('setting {}\'s {}\'s value {}'.format(user,key,v))
set(key,v,user)
set_config(key,v,user)
config_path=os.path.join(config_dir,'self_config.py')
with open(config_path,'r') as f:
text=f.read()
@ -84,7 +84,7 @@ def rm_pan():
@admin.route('/setDefaultPan',methods=["POST"])
def setDefaultPan():
pan=request.form.get('pan')
set('default_pan',pan)
set_config('default_pan',pan)
redis_client.delete("od_users")
redis_client.set('default_pan',pan)
return jsonify({'msg':'修改成功'})

81
app/admin/setting.py
Unescape View File

@ -8,14 +8,15 @@ def setting():
if request.method=='POST':
if request.files.keys()!=[]:
favicon=request.files['favicon']
favicon.save('./app/static/img/favicon.ico')
if favicon.content_length!=0:
favicon.save('./app/static/img/favicon.ico')
title=request.form.get('title','PyOne')
theme=request.form.get('theme','material')
title_pre=request.form.get('title_pre','index of ')
set('title',title)
set('title_pre',title_pre)
set('theme',theme)
set_config('title',title)
set_config('title_pre',title_pre)
set_config('theme',theme)
# reload()
redis_client.set('title',title)
@ -60,33 +61,33 @@ def sys_setting():
thread_num=request.form.get('thread_num','5')
verify_url=request.form.get('verify_url','False')
set('downloadUrl_timeout',downloadUrl_timeout)
set('allow_site',allow_site)
set_config('downloadUrl_timeout',downloadUrl_timeout)
set_config('allow_site',allow_site)
#Aria2
set('ARIA2_HOST',ARIA2_HOST)
set('ARIA2_PORT',ARIA2_PORT)
set('ARIA2_SECRET',ARIA2_SECRET)
set('ARIA2_SCHEME',ARIA2_SCHEME)
set_config('ARIA2_HOST',ARIA2_HOST)
set_config('ARIA2_PORT',ARIA2_PORT)
set_config('ARIA2_SECRET',ARIA2_SECRET)
set_config('ARIA2_SCHEME',ARIA2_SCHEME)
#MongoDB
set('MONGO_HOST',MONGO_HOST)
set('MONGO_PORT',MONGO_PORT)
set('MONGO_DB',MONGO_DB)
set('MONGO_USER',MONGO_USER)
set('MONGO_PASSWORD',MONGO_PASSWORD)
set_config('MONGO_HOST',MONGO_HOST)
set_config('MONGO_PORT',MONGO_PORT)
set_config('MONGO_DB',MONGO_DB)
set_config('MONGO_USER',MONGO_USER)
set_config('MONGO_PASSWORD',MONGO_PASSWORD)
#Redis
set('REDIS_HOST',REDIS_HOST)
set('REDIS_PORT',REDIS_PORT)
set('REDIS_DB',REDIS_DB)
set('REDIS_PASSWORD',REDIS_PASSWORD)
set('default_sort',default_sort)
set('admin_prefix',admin_prefix)
set('balance',balance)
set('order_m',order_m)
set('show_secret',show_secret)
set('encrypt_file',encrypt_file)
set('thread_num',thread_num)
set('verify_url',verify_url)
set_config('REDIS_HOST',REDIS_HOST)
set_config('REDIS_PORT',REDIS_PORT)
set_config('REDIS_DB',REDIS_DB)
set_config('REDIS_PASSWORD',REDIS_PASSWORD)
set_config('default_sort',default_sort)
set_config('admin_prefix',admin_prefix)
set_config('balance',balance)
set_config('order_m',order_m)
set_config('show_secret',show_secret)
set_config('encrypt_file',encrypt_file)
set_config('thread_num',thread_num)
set_config('verify_url',verify_url)
# reload()
redis_client.set('downloadUrl_timeout',downloadUrl_timeout)
@ -134,11 +135,11 @@ def setCode():
cssCode=request.form.get('cssCode','')
robots=request.form.get('robots','')
#redis
set('tj_code',tj_code)
set('headCode',headCode)
set('footCode',footCode)
set('cssCode',cssCode)
set('robots',robots)
set_config('tj_code',tj_code)
set_config('headCode',headCode)
set_config('footCode',footCode)
set_config('cssCode',cssCode)
set_config('robots',robots)
# reload()
redis_client.set('tj_code',tj_code)
redis_client.set('headCode',headCode)
@ -156,31 +157,31 @@ def setCode():
def show_setting():
if request.method=='POST':
show_redirect=request.form.get('show_redirect')
set('show_redirect',show_redirect)
set_config('show_redirect',show_redirect)
redis_client.set('show_redirect',show_redirect)
show_doc=request.form.get('show_doc')
set('show_doc',show_doc)
set_config('show_doc',show_doc)
redis_client.set('show_doc',show_doc)
show_image=request.form.get('show_image')
set('show_image',show_image)
set_config('show_image',show_image)
redis_client.set('show_image',show_image)
show_video=request.form.get('show_video')
set('show_video',show_video)
set_config('show_video',show_video)
redis_client.set('show_video',show_video)
show_dash=request.form.get('show_dash')
set('show_dash',show_dash)
set_config('show_dash',show_dash)
redis_client.set('show_dash',show_dash)
show_audio=request.form.get('show_audio')
set('show_audio',show_audio)
set_config('show_audio',show_audio)
redis_client.set('show_audio',show_audio)
show_code=request.form.get('show_code')
set('show_code',show_code)
set_config('show_code',show_code)
redis_client.set('show_code',show_code)

2
app/utils/header.py
Unescape View File

@ -99,7 +99,7 @@ def GetConfig(key):
############功能函数
def set(key,value,user=GetConfig('default_pan')):
def set_config(key,value,user=GetConfig('default_pan')):
InfoLogger().print_r('set {}:{}'.format(key,value))
config_path=os.path.join(config_dir,'self_config.py')
if key in ['client_secret','client_id','share_path','other_name','od_type','app_url']:

2
config.py
Unescape View File

@ -14,7 +14,7 @@ class config:
if REDIS_PASSWORD!='':
CACHE_REDIS_PASSWORD=REDIS_PASSWORD
SEND_FILE_MAX_AGE_DEFAULT=timedelta(seconds=1)
version='4.190724'
version='4.190726'
@staticmethod
def init_app(app):

2
install.sh
Unescape View File

@ -156,7 +156,7 @@ install_aria2(){
touch /root/.aria2/aria2.session
chmod +x /root/.aria2/trackers-list-aria2.sh
chmod 777 /root/.aria2/aria2.session
sed -i "s/rpc-secret=/rpc-secret=${pass}/g" /root/.aria2/aria2.conf
sed -i "s/rpc-secret=/rpc-secret=${aria2_pass}/g" /root/.aria2/aria2.conf
echo -e "${Blue}开始设置trackers-list自动更新！${Font}"
if [[ "${release}" = "centos" ]]; then
echo "0 0 */7 * * /root/.aria2/trackers-list-aria2.sh" >> /var/spool/cron/root

8
update.sh
Unescape View File

@ -150,6 +150,13 @@ Disallow: /
echo 'show_doc="csv,doc,docx,odp,ods,odt,pot,potm,potx,pps,ppsx,ppsxm,ppt,pptm,pptx,rtf,xls,xlsx"' >> self_config.py
fi
value=`cat /root/.aria2/aria2.conf | grep "rpc-secret=" | sed -e 's/\(.*\)=\(.*\)/\2/g'`
if [[ $value == "" ]]; then
secret=`cat self_config.py | grep "ARIA2_SECRET=" | sed -e 's/\(.*\)=\"\(.*\)\"/\2/g'`
sed -i "s/rpc-secret=/rpc-secret=${secret}/g" /root/.aria2/aria2.conf
fi
}
@ -244,6 +251,7 @@ echo "2019.05.31更新版本：新增功能：1）下载链接验证开关；优
echo "2019.06.13更新版本：新增功能：文件展示设置"
echo "2019.06.14更新版本：稍微完善一下日志记录；分享页面取消token验证；修复开启下载验证之后，后台文件打开失败的bug；新增内嵌窗口"
echo "2019.07.24更新版本：1. 优化安装脚本，适应Centos7、Debian9+、Ubuntu16+等系统；2、优化安装流程"
echo "2019.07.26更新版本：修复若干bug"
echo "---------------------------------------------------------------"
echo "更新完成！"
echo "如果网站无法访问，请检查config.py!"

Write Preview
Loading…
Cancel
Save