From 60b58cc3977560259069ac70563fef74abcb41c0 Mon Sep 17 00:00:00 2001
From: Karson <karsonzhang@163.com>
Date: Fri, 11 Jan 2019 16:56:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0TP5=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=88=B05.0.24=20=E4=BC=98=E5=8C=96=E5=90=8E=E5=8F=B0=E9=AA=8C?=
 =?UTF-8?q?=E8=AF=81=E7=A0=81=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 addons                                  | 1 +
 addons/.gitkeep                         | 1 -
 application/admin/view/index/login.html | 2 +-
 composer.json                           | 2 +-
 public/assets/js/backend/addon.js       | 2 +-
 runtime/.gitkeep                        | 1 -
 6 files changed, 4 insertions(+), 5 deletions(-)
 create mode 120000 addons
 delete mode 100644 addons/.gitkeep
 delete mode 100644 runtime/.gitkeep

diff --git a/addons b/addons
new file mode 120000
index 00000000..d57b7579
--- /dev/null
+++ b/addons
@@ -0,0 +1 @@
+../fastadmin-freeaddons
\ No newline at end of file
diff --git a/addons/.gitkeep b/addons/.gitkeep
deleted file mode 100644
index 8b137891..00000000
--- a/addons/.gitkeep
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/application/admin/view/index/login.html b/application/admin/view/index/login.html
index 9750a79e..7b2bbecf 100644
--- a/application/admin/view/index/login.html
+++ b/application/admin/view/index/login.html
@@ -81,7 +81,7 @@
                                     <div class="input-group-addon"><span class="glyphicon glyphicon-option-horizontal" aria-hidden="true"></span></div>
                                     <input type="text" name="captcha" class="form-control" placeholder="{:__('Captcha')}" data-rule="{:__('Captcha')}:required;length(4)" />
                                     <span class="input-group-addon" style="padding:0;border:none;cursor:pointer;">
-                                        <img src="{:rtrim('__PUBLIC__', '/')}/index.php/captcha" width="100" height="30" onclick="this.src = '{:rtrim('__PUBLIC__', '/')}/index.php/captcha?r=' + Math.random();"/>
+                                        <img src="{:rtrim('__PUBLIC__', '/')}/index.php?s=/captcha" width="100" height="30" onclick="this.src = '{:rtrim('__PUBLIC__', '/')}/index.php?s=/captcha&r=' + Math.random();"/>
                                     </span>
                                 </div>
                                 {/if}
diff --git a/composer.json b/composer.json
index f37b8cc6..3dd55f07 100755
--- a/composer.json
+++ b/composer.json
@@ -16,7 +16,7 @@
     ],
     "require": {
         "php": ">=5.4.0",
-        "topthink/framework": "~5.0.23",
+        "topthink/framework": "~5.0.24",
         "overtrue/wechat": "~3.1",
         "endroid/qr-code": "^1.9",
         "topthink/think-captcha": "^1.0",
diff --git a/public/assets/js/backend/addon.js b/public/assets/js/backend/addon.js
index bea4c655..48dafeca 100644
--- a/public/assets/js/backend/addon.js
+++ b/public/assets/js/backend/addon.js
@@ -178,6 +178,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'template'], function
                 if (!userinfo) {
                     Layer.open({
                         content: Template("logintpl", {}),
+                        zIndex: 99,
                         area: ['430px', '350px'],
                         title: __('Login FastAdmin'),
                         resize: false,
@@ -196,7 +197,6 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'template'], function
                                 Layer.closeAll();
                                 Layer.alert(ret.msg);
                             }, function (data, ret) {
-                                Layer.alert(ret.msg);
                             });
                         },
                         btn2: function () {
diff --git a/runtime/.gitkeep b/runtime/.gitkeep
deleted file mode 100644
index 8b137891..00000000
--- a/runtime/.gitkeep
+++ /dev/null
@@ -1 +0,0 @@
-