From 05d3c65e43e89bb7aaae800101f3ba9cefc7162b Mon Sep 17 00:00:00 2001
From: hjdhnx <hjd124579>
Date: Thu, 22 Sep 2022 02:59:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.py                  |   6 +++---
 base/rules.db           | Bin 86016 -> 86016 bytes
 controllers/admin.py    |  12 ++++++++++--
 controllers/home.py     |   7 ++++---
 js/version.txt          |   2 +-
 readme.md               |   2 ++
 templates/settings.html |   2 +-
 7 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/app.py b/app.py
index af7e9be..b83792e 100644
--- a/app.py
+++ b/app.py
@@ -31,12 +31,12 @@ def create_flask_app():
     wlan_info,_ = get_wlan_info()
     logger.info(rule_list)
     logger.info(f'局域网: {getHost(1, app.config.get("HTTP_PORT"))}/index\n本地: {getHost(0, app.config.get("HTTP_PORT"))}/index\nwlan_info:{wlan_info}')
+    db.init_app(app)
+    db.app = app
+    db.create_all(app=app)
     return app
 
 app = create_flask_app()
-db.init_app(app)
-db.app = app
-db.create_all(app=app)
 migrate = Migrate(app, db)
 
 now_python_ver = ".".join([str(i) for i in sys.version_info[:3]])
diff --git a/base/rules.db b/base/rules.db
index 3031ee08ba95c02107da8b1929187dc640cee660..5a84f58d1d455e133f6bbac702382b7fcd9799b7 100644
GIT binary patch
delta 208
zcmZozz}m2Yb%L~DJ_7@TC=kPd;6xo``FsXF?+LuzsSKQ49t=GH_z&}?^9b_y@Jn!g
z;qu@<wXyLOCv&4F&*Tj5m7Mw9?BceHjE%gL75RlH3vh?B@NhDuPR`^`WU}R*ti)%_
z!LyWs17!SUL7u6M3Y(YnR5G&gGcveuR^fXP$iyJ9Suo)~|HKK>JX|1E0w98c9U>UO
tI{8Dr5L*I+AnzBp%^VF8e1iNf41)54jy|68A^zU3eiap)3;X&H0svniF%tj)

delta 200
zcmZozz}m2Yb%L~DHUk5LC=kN{|3n>Q`D_L~?+Ls-OBp!1zA*6o<3G%o&Lha*!=1{f
zz%Rk|WwT&H85d_hH@mp4B4Z=(WJP}A$pYM=%#E5HlfAiCP8Q^u${4?SIZq`clP%}u
zGu*bD<N1~bvN7_1VBr4%)clNJhL4d+HO(~5EHT;G+#)&2j0<Q#M4o{isNxC#<PY^i
oY_SZ2ykD3%b2LQo35rPahX!*ou`o#Th6cOF2Sjcz?CU=W0DmSk0{{R3

diff --git a/controllers/admin.py b/controllers/admin.py
index be374ab..5713b66 100644
--- a/controllers/admin.py
+++ b/controllers/admin.py
@@ -8,6 +8,9 @@ import os
 from flask import Blueprint,request,render_template,jsonify,make_response
 from controllers.service import storage_service,rules_service
 from base.R import R
+from base.database import db
+from utils.log import logger
+import shutil
 from utils.update import getLocalVer,getOnlineVer,download_new_version,download_lives,copy_to_update
 from utils import parser
 from utils.web import getParmas,verfy_token
@@ -97,12 +100,17 @@ def admin_update_db():
     if not verfy_token():
         # return render_template('login.html')
         return R.error('请登录后再试')
+    old_dbfile = 'migrations'
+    if os.path.exists(old_dbfile):
+        logger.info(f'开始删除历史数据库迁移文件:{old_dbfile}')
+        shutil.rmtree(old_dbfile)
+    db.session.execute('drop table if exists alembic_version')
     cmd = 'flask db migrate && flask db upgrade'
     if not os.path.exists('migrations'):
         cmd = 'flask db init && '+cmd
-    print(f'开始执行cmd:{cmd}')
+    logger.info(f'开始执行cmd:{cmd}')
     result = os.system(cmd)
-    print(f'cmd执行结果:{result}')
+    logger.info(f'cmd执行结果:{result}')
     return R.success('数据库升级完毕')
 
 @admin.route('/update_ver')
diff --git a/controllers/home.py b/controllers/home.py
index 099c24a..68d6c79 100644
--- a/controllers/home.py
+++ b/controllers/home.py
@@ -254,21 +254,22 @@ def config_gen():
         # print(set_local)
         set_area = render_template('config.txt',pys=pys,rules=rules,alists=alists,alists_str=alists_str,live_url=get_live_url(new_conf,1),mode=1,host=getHost(1),jxs=jxs)
         set_online = render_template('config.txt',pys=pys,rules=rules,alists=alists,alists_str=alists_str,live_url=get_live_url(new_conf,2),mode=1,host=getHost(2),jxs=jxs)
+        ali_token = new_conf.ALI_TOKEN
         with open('txt/pycms0.json','w+',encoding='utf-8') as f:
-            customConfig = getCustonDict(getHost(0))
+            customConfig = getCustonDict(getHost(0),ali_token)
             set_dict = custom_merge(parseText(set_local), customConfig)
             merged_hide(set_dict)
             # set_dict = json.loads(set_local)
             f.write(json.dumps(set_dict,ensure_ascii=False,indent=4))
         with open('txt/pycms1.json','w+',encoding='utf-8') as f:
-            customConfig = getCustonDict(getHost(1))
+            customConfig = getCustonDict(getHost(1),ali_token)
             set_dict = custom_merge(parseText(set_area), customConfig)
             merged_hide(set_dict)
             # set_dict = json.loads(set_area)
             f.write(json.dumps(set_dict,ensure_ascii=False,indent=4))
 
         with open('txt/pycms2.json','w+',encoding='utf-8') as f:
-            customConfig = getCustonDict(getHost(2))
+            customConfig = getCustonDict(getHost(2),ali_token)
             set_dict = custom_merge(parseText(set_online), customConfig)
             merged_hide(set_dict)
             # set_dict = json.loads(set_online)
diff --git a/js/version.txt b/js/version.txt
index 47b6be3..50d9854 100644
--- a/js/version.txt
+++ b/js/version.txt
@@ -1 +1 @@
-3.7.2
\ No newline at end of file
+3.7.3
\ No newline at end of file
diff --git a/readme.md b/readme.md
index 0e0b2b0..3255297 100644
--- a/readme.md
+++ b/readme.md
@@ -46,6 +46,8 @@
 [dockerfile教程](https://blog.csdn.net/qq_46158060/article/details/125718218)   
 [获取本地设备信息](https://blog.csdn.net/cui_yonghua/article/details/125508991)   
 [获取本地设备信息](https://m.jb51.net/article/140716.htm)   
+###### 2022/09/22
+- [X] 1.v3.7.3修复静态文件阿里token没渲染的bug,修复数据库升级bug,优化app.py
 ###### 2022/09/21
 - [X] 1.未来功能增加显示和隐藏多选规则的实际逻辑，增加顺序字段等待有缘人
 - [X] 2.版本升级至3.7.0
diff --git a/templates/settings.html b/templates/settings.html
index 414595c..a58e588 100644
--- a/templates/settings.html
+++ b/templates/settings.html
@@ -47,7 +47,7 @@
         console.log(this);
       });
       $('#update_db').click(function (){
-        if(confirm('确定要升级数据库?判断标准为是否正常打开缓存文件列表-查看界面,如果正常就不需要进行此操作。升级数据库后将正常使用未来功能多选操作,可对规则进行多选显示或者隐藏')){
+        if(confirm('确定要升级数据库?升级过程可能较长,需要耐心等待提示完成。判断标准为是否正常打开缓存文件列表-查看界面,如果正常就不需要进行此操作。升级数据库后将正常使用未来功能多选操作,可对规则进行多选显示或者隐藏')){
           $.get("/admin/update_db",function(data,status){
                    console.log(data);
                    if(data.code === 200){
-- 
GitLab