From f7d5f131a11752d12cc18605506cf58c2a2fe897 Mon Sep 17 00:00:00 2001
From: xiaoz <xiaoz93@outlook.com>
Date: Thu, 14 Apr 2022 20:12:17 +0800
Subject: [PATCH] fix bug

---
 class/Api.php                               |   7 +++++++
 data/.htaccess                              |   2 ++
 db/onenav.simple.db3                        | Bin 49152 -> 53248 bytes
 db/sql/20220413.sql                         |  18 ++++++++++++++++++
 templates/admin/setting/theme.php           |  10 +++++-----
 templates/admin/setting/transition_page.php |   6 +++---
 templates/admin/static/embed.js             |   2 +-
 7 files changed, 36 insertions(+), 9 deletions(-)
 create mode 100755 data/.htaccess
 create mode 100644 db/sql/20220413.sql

diff --git a/class/Api.php b/class/Api.php
index 7f638bf..02c325a 100755
--- a/class/Api.php
+++ b/class/Api.php
@@ -781,6 +781,13 @@ class Api {
         //数据库sql目录
         $sql_dir = 'db/sql/';
         $name = $data['name'];
+        //查询sql是否已经执行过
+        $count = $this->db->count("on_db_logs",[
+            "sql_name"  =>  $name
+        ]);
+        if( $count >= 1 ) {
+            $this->err_msg(-2000,$name."已经更新过！");
+        }
         $sql_name = $sql_dir.$name;
         //如果文件不存在，直接返回错误
         if ( !file_exists($sql_name) ) {
diff --git a/data/.htaccess b/data/.htaccess
new file mode 100755
index 0000000..baa56e5
--- /dev/null
+++ b/data/.htaccess
@@ -0,0 +1,2 @@
+order allow,deny
+deny from all
\ No newline at end of file
diff --git a/db/onenav.simple.db3 b/db/onenav.simple.db3
index 671dd2c9f4a38cc5d843656c86884fbdec4775c4..6ed4ea7f92b5fdb29b89e28d137ce0893820b58a 100644
GIT binary patch
delta 639
zcmZo@U~X8zJV9Epn}LCW7l>g%a-xp0YBz(Pe=RSE4+9UI0s~(-cLo1`HU&O8ULFo{
zZWhjmT*o=nIeu&w6qv)hS%FQ5iG}MA!<vZ`S8(PEv5OljGB%1%j^R-B<8=;lbqsM;
z@bq(WjZjd^&x_A5D9OyvD~``jt&I0{iBRI@^7liQP*Tv~<x)^k0?I2XI0ifOa%olw
zvWx2jjntjIn?qr8EeD@3vO$?Cc+JU70UM)(ZfIjNKfAc1B4e}QWLZwr$xK}4%s?wA
z&t{VhD@)8NO;u6|ag7LpXiKdqNzDVA0~c}j_X`dQa`f~I0XiM*A+Ue)^KyWW4)ya4
z40Tn|fO|m`=m%qg$&wuMGBDp8B0_?N&!2$<6!e=}xF4!W!y*Al^D#3kG6EH*B*o|C
zrx$Z>YG4uA%;Lc0u$j%^A3q-}e-Q)!BmQIjtN8o)i#7`?B=B2Eak4R}vWPMm85kKE
zm>8Pq6&L0tMexoE2?}+U;y{rzMwXkrYJL>Zz*P+Vclpoo?*<zA4rt&E{>f+7b4o(Z
g;S^w2WrP|G*31EvwSee)57l*-C|&za7BvU}0ClIRumAu6

delta 421
zcmZozz}(QlJV9EpiGhKE2Z&)nbfS*2aub7IZ~`xf4+A%w0s~(-cLo1`HU&O8PGOGC
z93i|s9OB$8n*{~tv2Ipi(_s?e+|9rN(jLprCT^(6SU#DNQ_+soImp#9#8tu5&&4%D
zAwMrZzn~;DKd(4GJGC<2(<MT|-w#PtK|={BuA~{q#U`$=$XGqOfK$PV1(y+-DcDTN
zOwoZD(x}SGF0QD^*d#jnHK*xhFJ65YUM^0soI;3eM2Lo&iKc>|e~5x#sE>~hP^v63
zr!*BT1>&Vvl%(dRfVsR}ntc9@p5m&ijIFkto4D;6H?wd*RFURH_=k^~S&<RQO-YK+
z$xkn4-_*b&u$jey$zd~_!9RX3X8u(S{EzsL@vqt}s4$0r@~Zh!9L)S@82In<pV=(1
ZU>5(x1!|Methay&z6S|zfC}z60RSv<bM62D

diff --git a/db/sql/20220413.sql b/db/sql/20220413.sql
new file mode 100644
index 0000000..dad463a
--- /dev/null
+++ b/db/sql/20220413.sql
@@ -0,0 +1,18 @@
+DROP TABLE on_options;
+CREATE TABLE on_options (
+  "id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+  "key" TEXT(64) NOT NULL,
+  "value" TEXT,
+  "extend" TEXT,
+  CONSTRAINT "option_key_only" UNIQUE ("key" ASC)
+);
+
+CREATE INDEX "main"."on_options_id_IDX"
+ON "on_options" (
+  "id" ASC,
+  "key" ASC
+);
+CREATE INDEX "main"."on_options_key_IDX"
+ON "on_options" (
+  "key" ASC
+);
\ No newline at end of file
diff --git a/templates/admin/setting/theme.php b/templates/admin/setting/theme.php
index c92db27..46cbb2e 100644
--- a/templates/admin/setting/theme.php
+++ b/templates/admin/setting/theme.php
@@ -10,10 +10,10 @@
                 //var_dump($theme['info']->name);
             ?>
             <!-- 主题列表 -->
-            <div class="layui-col-lg2">
-                <fieldset style = "padding:1em;border:0px;height:180px;background-color:#EEEEEE;box-shadow: 2px 2px 3px #888888;color:#666666">
-                    <legend style = "font-size:38px;"><?php echo $key; ?></legend>
-                    <p><h1><?php echo $theme['info']->name ?></h1></p>
+            <div class="layui-col-lg3">
+                <fieldset style = "padding:1em;border:0px;height:170px;background-color:#EEEEEE;box-shadow: 2px 2px 3px #888888;color:#666666">
+                    <legend style = "font-size:32px;"><?php echo $key; ?></legend>
+                    <p><h2><?php echo $theme['info']->name ?></h2></p>
                     <p>版本：<?php echo $theme['info']->version ?></p>
                     <p>更新时间：<?php echo $theme['info']->update ?></p>
                     <br />
@@ -57,7 +57,7 @@ function set_theme(name) {
             }, 2000);
         }
         else{
-            layer.msg(data.data, {icon: 5});
+            layer.msg(data.err_msg, {icon: 5});
         }
     });
 }
diff --git a/templates/admin/setting/transition_page.php b/templates/admin/setting/transition_page.php
index 5639506..ed26bff 100644
--- a/templates/admin/setting/transition_page.php
+++ b/templates/admin/setting/transition_page.php
@@ -9,7 +9,7 @@
     <form class="layui-form layui-form-pane" action="">
 
         <div class="layui-form-item">
-            <label class="layui-form-label">过渡页</label>
+            <label class="layui-form-label" style = "width:130px;">过渡页</label>
             <div class="layui-input-block">
             <input type="radio" name="control" value="off" <?php echo ( $transition_page['control'] == 'off' ) ? "checked" : ''; ?> title="关闭">
             <input type="radio" name="control" value="on" <?php echo ( $transition_page['control'] == 'on' ) ? "checked" : ''; ?> title="开启">
@@ -17,7 +17,7 @@
         </div>
 
         <div class="layui-form-item">
-            <label class="layui-form-label">访客停留时间</label>
+            <label class="layui-form-label" style = "width:130px;">访客停留时间</label>
             <div class="layui-input-inline">
                 <input type="number" min="0" max="86400" lay-verify="required|number" name="visitor_stay_time" value = "<?php echo $transition_page['visitor_stay_time']; ?>" autocomplete="off" placeholder="访客停留时间，单位s" class="layui-input">
             </div>
@@ -25,7 +25,7 @@
         </div>
 
         <div class="layui-form-item">
-            <label class="layui-form-label">管理员停留时间</label>
+            <label class="layui-form-label" style = "width:130px;">管理员停留时间</label>
             <div class="layui-input-inline">
                 <input type="number" min="0" max="86400" lay-verify="required|number" name="admin_stay_time" value = "<?php echo $transition_page['admin_stay_time']; ?>" required  lay-verify="required" autocomplete="off" placeholder="管理员停留时间，单位s" class="layui-input">
             </div>
diff --git a/templates/admin/static/embed.js b/templates/admin/static/embed.js
index 2507b1a..9ed9bd4 100755
--- a/templates/admin/static/embed.js
+++ b/templates/admin/static/embed.js
@@ -507,7 +507,7 @@ function get_sql_update_list() {
 function exe_sql(sqlname) {
   $.ajax({ url: "index.php?c=api&method=exe_sql&name=" + sqlname, async:false, success: function(data,status){
     if( data.code == 0 ){
-      $("#console_log").append(data.data);
+      $("#console_log").append(data.data + "\n" );
     }
     else {
       $("#console_log").append(sqlname + "更新失败！\n");