From fa0af1b1e8eee046e52dfe803d8e935eac2998fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=A1=82=E6=88=90?= <475772164@qq.com>
Date: Fri, 2 Aug 2019 20:34:59 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20fast.js=20=E8=A7=A3?=
 =?UTF-8?q?=E5=86=B3api=E6=A8=A1=E5=9D=97=E9=83=A8=E7=BD=B2=E4=BA=8C?=
 =?UTF-8?q?=E7=BA=A7=E5=9F=9F=E5=90=8D=E6=97=B6token=E9=80=9A=E8=AE=AF?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/assets/js/fast.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/public/assets/js/fast.js b/public/assets/js/fast.js
index 388ebddd0..f2df1d48d 100644
--- a/public/assets/js/fast.js
+++ b/public/assets/js/fast.js
@@ -68,6 +68,9 @@ define(['jquery', 'bootstrap', 'toastr', 'layer', 'lang'], function ($, undefine
                 options = $.extend({
                     type: "POST",
                     dataType: "json",
+                    xhrFields: {
+                        withCredentials: true
+                    },
                     success: function (ret) {
                         index && Layer.close(index);
                         ret = Fast.events.onAjaxResponse(ret);
-- 
Gitee


From c8a6f4fd09160d5dbff1730817eebe684ebd5f98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=A1=82=E6=88=90?= <475772164@qq.com>
Date: Sat, 3 Aug 2019 18:05:50 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20login.html=20=E9=87=8D?=
 =?UTF-8?q?=E7=BD=AE=E5=AF=86=E7=A0=81=E6=97=B6=EF=BC=8C=E7=A6=81=E6=AD=A2?=
 =?UTF-8?q?=E6=B5=8F=E8=A7=88=E5=99=A8=E8=87=AA=E5=8A=A8=E5=A1=AB=E5=85=85?=
 =?UTF-8?q?=E9=AA=8C=E8=AF=81=E7=A0=81=E5=92=8C=E6=96=B0=E5=AF=86=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/index/view/user/login.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 mode change 100755 => 100644 application/index/view/user/login.html

diff --git a/application/index/view/user/login.html b/application/index/view/user/login.html
old mode 100755
new mode 100644
index ff2af389e..51999943d
--- a/application/index/view/user/login.html
+++ b/application/index/view/user/login.html
@@ -73,7 +73,7 @@
             <div class="form-group">
                 <label for="newpassword" class="control-label col-xs-12 col-sm-3">{:__('New password')}:</label>
                 <div class="col-xs-12 col-sm-8">
-                    <input type="password" class="form-control" id="newpassword" name="newpassword" value="" data-rule="required;password" placeholder="">
+                    <input type="password" class="form-control" id="newpassword" name="newpassword" value="" data-rule="required;password" placeholder="新密码" autocomplete="new-password">
                     <span class="msg-box"></span>
                 </div>
             </div>
-- 
Gitee


From a82b6421183b48adb2de54843931de87799d1f38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=A1=82=E6=88=90?= <475772164@qq.com>
Date: Mon, 12 Aug 2019 02:31:12 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20AdminLog.php?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/model/AdminLog.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/admin/model/AdminLog.php b/application/admin/model/AdminLog.php
index 5f951129b..3254e4d5d 100644
--- a/application/admin/model/AdminLog.php
+++ b/application/admin/model/AdminLog.php
@@ -37,7 +37,7 @@ class AdminLog extends Model
         if (!$content) {
             $content = request()->param();
             foreach ($content as $k => $v) {
-                if (is_string($v) && strlen($v) > 200 || stripos($k, 'password') !== false) {
+                if (is_string($v) && strlen($v) > 200 || stripos($k, 'password') !== false || is_array($v) || is_object($v)) {
                     unset($content[$k]);
                 }
             }
-- 
Gitee