From 21f8fdd88094be550ddfada7b6a0636db91d91a3 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Tue, 16 Apr 2019 16:21:46 +0800
Subject: [PATCH] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E5=90=8C=E6=AD=A5Framework?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/view/index/index.html | 22 ++++++++--------------
 application/admin/view/login/index.html |  2 +-
 config/log.php                          | 14 ++++++++------
 public/static/admin.js                  |  3 +--
 public/static/theme/css/console.css     |  2 +-
 5 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/application/admin/view/index/index.html b/application/admin/view/index/index.html
index 4362a149b..d7e55f829 100644
--- a/application/admin/view/index/index.html
+++ b/application/admin/view/index/index.html
@@ -115,22 +115,16 @@
 {if session('user.id') and sysconf('system_message_state')}
 <script>
     require(['spop'], function () {
-        syncMessage();
-
-        function syncMessage() {
-            $.get('{:url("@admin/api.message/gets")}', function (ret) {
-                if (ret.code && ret.data.length > 0) for (var i in ret.data) {
-                    var item = ret.data[i];
-                    if ($('[data-message-code=' + item.code + ']').size() < 1) spop({
-                        template: '<h4 data-message-code="' + item.code + '" class="spop-title">' + item.title + '</h4>' + item.desc + '<span class="font-s10 color-desc pull-right"> ' + item.create_at + ' </span>',
-                        position: 'bottom-right', style: 'success', group: item.code, onClose: function () {
-                            $.post('{:url("@admin/api.message/set")}', {code: this.group});
-                        }
-                    });
-                }
+        (function syncMessage() {
+            $.get('{:url("@admin/api.message/gets")}').then(function (ret) {
+                if (ret.code && ret.data.length > 0) for (var i in ret.data) if ($('[data-message-code=' + ret.data[i].code + ']').size() < 1) spop({
+                    template: '<h4 data-message-code="' + ret.data[i].code + '" class="spop-title">' + ret.data[i].title + '</h4>' + ret.data[i].desc + '<span class="font-s10 color-desc pull-right"> ' + ret.data[i].create_at + ' </span>', position: 'bottom-right', style: 'success', group: ret.data[i].code, onClose: function () {
+                        $.post('{:url("@admin/api.message/set")}', {code: this.group});
+                    }
+                });
                 setTimeout(syncMessage, 3000)
             });
-        }
+        })();
     });
 </script>
 {/if}
diff --git a/application/admin/view/login/index.html b/application/admin/view/login/index.html
index 22823bc47..c26b9ed88 100644
--- a/application/admin/view/login/index.html
+++ b/application/admin/view/login/index.html
@@ -6,7 +6,7 @@
         <a href="{:url('@')}" class="title">{:sysconf('app_name')} <span class="padding-left-5 font-s10">{:sysconf('app_version')}</span></a>
         <ul>
             <li class="layui-hide"><a target="_blank" href="http://document.framework.thinkadmin.top">在线帮助</a></li>
-            <li><a target="_blank" href="http://soft.ftsm-shop.com/19/3911.html">推荐使用谷歌浏览器</a></li>
+            <li><a target="_blank" href="https://www.google.cn/chrome">推荐使用谷歌浏览器</a></li>
         </ul>
     </div>
     <form data-login-form onsubmit="return false;" method="post" class="layui-anim layui-anim-upbit" autocomplete="off">
diff --git a/config/log.php b/config/log.php
index e4f4861b7..d9f4f640d 100644
--- a/config/log.php
+++ b/config/log.php
@@ -13,12 +13,14 @@
 // +----------------------------------------------------------------------
 
 return [
-    // 启用JSON日志
-    'json'      => true,
     // 设置日志文件名
-    'single'    => 'signle',
-    // 最多保留100个文件
-    'max_files' => 50,
+    'single'      => 'single',
+    // 最多保留50个文件
+    'max_files'   => 50,
     // 日志每10兆分割文件
-    'file_size' => 10485760,
+    'file_size'   => 10485760,
+    // 设置记录目录的类型
+    'level'       => ['error'],
+    // 日志类型分别写入文件
+    'apart_level' => ['error', 'sql'],
 ];
\ No newline at end of file
diff --git a/public/static/admin.js b/public/static/admin.js
index b01b47c95..531789b81 100644
--- a/public/static/admin.js
+++ b/public/static/admin.js
@@ -467,8 +467,7 @@ $(function () {
     $.fn.uploadFile = function (callback) {
         if (this.attr('data-inited')) return false;
         var that = this, mode = $(this).attr('data-file') || 'one';
-        this.attr('data-inited', true);
-        this.attr('data-multiple', (mode !== 'btn' && mode !== 'one') ? 1 : 0);
+        this.attr('data-inited', true).attr('data-multiple', (mode !== 'btn' && mode !== 'one') ? 1 : 0);
         require(['upload'], function (apply) {
             apply(that, null, callback);
         });
diff --git a/public/static/theme/css/console.css b/public/static/theme/css/console.css
index 8c29fe350..8ed86f216 100644
--- a/public/static/theme/css/console.css
+++ b/public/static/theme/css/console.css
@@ -20,7 +20,7 @@
 ::-moz-selection{background-color:#ec494e!important;color:#fff!important}
 :-webkit-autofill,:-webkit-autofill:active,:-webkit-autofill:focus,:-webkit-autofill:hover{box-shadow:0 2px 3px 0 rgba(0,0,0,.1) inset!important;-webkit-transition:color 9999s ease-out,background-color 9999s ease-out!important;-webkit-transition-delay:9999s!important;-webkit-text-fill-color:#333!important}
 body{font-size:12px;color:#333;font-family:'\5FAE\8F6F\96C5\9ED1','Microsoft YaHei','Helvetica Neue','Luxi Sans','DejaVu Sans','Hiragino Sans GB','serif'}
-a{color:#06C;cursor:pointer}a:hover{color:#039}input::-ms-clear{display:none}
+a{color:#06C;cursor:pointer}a:hover{color:#039}input::-ms-clear{display:none}.moxie-shim{display:none!important}
 .version-debug{width:100%;height:100px;font-size:20px;line-height:100px;text-align:center;background-color:#E90D24;color:#fff;margin-bottom:40px;}
 
 /* 页面布局 - 全局 */