From 53a8b87776584637aaf6492e104f82db385356a8 Mon Sep 17 00:00:00 2001
From: hjdhnx <hjd124579>
Date: Wed, 21 Sep 2022 11:22:22 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E4=B8=AD=E5=BF=83=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=95=B0=E6=8D=AE=E5=BA=93=E5=8D=87=E7=BA=A7=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 base/rules.db           | Bin 40960 -> 49152 bytes
 controllers/admin.py    |  13 +++++++++++++
 models/ruleclass.py     |   5 +++++
 templates/settings.html |  15 +++++++++++++++
 4 files changed, 33 insertions(+)

diff --git a/base/rules.db b/base/rules.db
index 10d981c8dcb96fd840ee1887ff554e8279f1d79d..4d1275e2d0045d1bbefdccfa5997d595275a7c2e 100644
GIT binary patch
delta 1076
zcmd7OPmBvu90%|>+BKc&>wJxWQ-AwfmaT1EHkL>l5j$xbESeJH(9X8At5Vx!TC4;8
z!$D*vyGG)IgoF?WWaHvO!o|hK#YH48E)FYME)p?6NwpCi#KC0dlbJW~z2EPB8&Bso
z8osF&Iv8Wzd)gPK69W;jjXS48{1#KxImW-@nKs6COa^UDAgs<kY@Sf-m7r`Sqf#?e
z8ZX)trHPz#ylm$RWvg1vopeeyJ6E)7c4v_9$e7!+rbrJDnFq!1=8HYUqO(Tyb#{t3
z;{n;|@0VIi%^E4Y7ed!vonQ8AId;gs%lE6Th$I`)sB}(o@AEt9YRxO}Rm++wGm{Vn
z$M(Lz_auhAKC<cEW<qqf?;4C%oTBZ-+H2j@Tqxt#F*~ltlZv}RO9mjZ00ribY1iro
z6>X)dsUOF6RN2_(g`@u>oUTqfCk_4~ovsBx$K(A{+Q*8|OyWpBJi2Lg&?*dU-clGD
zRJ|T0%rftmXY~AAOz-V+XX}36J?UmcWN2b9QVd`486WWh@9_?A@EWi15-;!^Pw*Iz
z@BsI48#izjS8xdzaUN%J2B%O%1xH~ckHa{Ceb|MRSMHNm_xqUCN318-5xvA(Vhs@^
zqJ$tK#A;#{v65I$EF;2%K`bSf5Q~XL#6m(R77+0J>P*t;HAHYCNT`HD1PGa!PxKIe
R!uL-S3H^VOZ2kL4z5y+m=28Fv

delta 184
zcmZo@U~V|TG(lRBje&uI3y3*@m<dEr)G?N3W6<-Sz{^|1z{(@Yz_XP9Fkd>4Ab$@C
zZcbE~%FWa$JXw%u3QJ=MBm3l)JfV}rc_Syk<rA9B%O}jj&&cq4awhi*CR^6YN_@7H
z)A{DIcZ(}3GB$ZmUeDtXRBN=khd(1h!qPZ3)zZw^BH6;s6lgODFak0AX2FE}{1XFM
PCx57C;Xziks6hb$)VwTv

diff --git a/controllers/admin.py b/controllers/admin.py
index 6d8e473..406f944 100644
--- a/controllers/admin.py
+++ b/controllers/admin.py
@@ -93,6 +93,19 @@ def admin_get_ver():
     online_ver,msg = getOnlineVer()
     return jsonify({'local_ver':getLocalVer(),'online_ver':online_ver,'msg':msg})
 
+@admin.route('/update_db')
+def admin_update_db():
+    if not verfy_token():
+        # return render_template('login.html')
+        return R.error('请登录后再试')
+    cmd = 'flask db migrate && flask db upgrade'
+    if not os.path.exists('migrations'):
+        cmd = 'flask db init && '+cmd
+    print(f'开始执行cmd:{cmd}')
+    result = os.system(cmd)
+    print(f'cmd执行结果:{result}')
+    return R.success('数据库升级完毕')
+
 @admin.route('/update_ver')
 def admin_update_ver():
     if not verfy_token():
diff --git a/models/ruleclass.py b/models/ruleclass.py
index fbe1e4e..f27578c 100644
--- a/models/ruleclass.py
+++ b/models/ruleclass.py
@@ -5,6 +5,7 @@
 # Date  : 2022/9/6
 
 from base.database import db
+from datetime import datetime
 
 class RuleClass(db.Model):
     __tablename__ = 'rule_class'
@@ -13,6 +14,10 @@ class RuleClass(db.Model):
     class_name = db.Column(db.String(255))
     class_url = db.Column(db.String(255))
     cookie = db.Column(db.String(255))
+    state = db.Column(db.Integer, default=0)
+    order = db.Column(db.Integer, default=0)
+    create_date = db.Column(db.DateTime, index=True, default=datetime.now)
+    write_date = db.Column(db.DateTime, index=True, default=datetime.now,onupdate=datetime.now)
 
     def __repr__(self):
         return "<RuleClass(name='%s', class_name='%s', class_url='%s',cookie='%s')>" % (
diff --git a/templates/settings.html b/templates/settings.html
index 6f46de3..5323e4a 100644
--- a/templates/settings.html
+++ b/templates/settings.html
@@ -46,6 +46,19 @@
       $(".save_conf1").click(function () {
         console.log(this);
       });
+      $('#update_db').click(function (){
+        $.get("/admin/update_db",function(data,status){
+                   console.log(data);
+                   if(data.code === 200){
+                       alert(data.msg);
+                      // location.reload();
+                   }else{
+                       alert(data.msg);
+                       console.log('升级失败了...');
+                       return false
+                   }
+           });
+      });
     });
 </script>
 <h2 class="title">欢迎使用DR-PY配置界面<div><span class="ver_title">当前版本: {{ ver }}</span><span
@@ -54,6 +67,8 @@
 <h4>
     <button type="button" class="yongyin"><a href="/admin">返回管理页</a></button>
 <!--    <button type="button" class="yongyin"><a href="/index">返回首页</a></button>-->
+  <button type="button" class="yongyin3"><a href="javascript:void(0);"
+            class="funcbtn" id="update_db">升级数据库</a></button>
   <button type="button" class="yongyin2"><a href="javascript:copy('cp ./tmp/dr_py-master/app.py ./app.py');"
             class="funcbtn" id="update_by_self">升级指令</a></button>
     <button type="button" class="yongyin2"><a href="javascript:copy('cp ./tmp/dr_py-master/base/custom.conf base');"
-- 
GitLab