From 74394293f0b3eff471c50bd59be1981a6d50db4c Mon Sep 17 00:00:00 2001
From: PPPSCN <35696959@qq.com>
Date: Thu, 15 Mar 2018 20:06:17 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=A2=9E=E9=95=BFadmin=5Flog.url=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E9=95=BF=E5=BA=A6varchar(2000)=202.=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E4=B8=80=E9=94=AE=E7=94=9F=E6=88=90CRUD=E6=97=B6admin=5Fids?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=A4=9A=E9=80=89=E4=B8=8B=E6=8B=89=E6=A1=86?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                      | 1 +
 application/admin/command/Crud.php              | 2 ++
 application/admin/command/Install/fastadmin.sql | 2 +-
 application/admin/controller/auth/Admin.php     | 2 +-
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1962050f..e04395f5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ composer.lock
 *.css.map
 !.gitkeep
 .env
+/.svn
diff --git a/application/admin/command/Crud.php b/application/admin/command/Crud.php
index fef1e16f..09fc347c 100755
--- a/application/admin/command/Crud.php
+++ b/application/admin/command/Crud.php
@@ -603,6 +603,8 @@ class Crud extends Command
                                 $attrArr['data-params'] = '##replacetext##';
                                 $search = '"##replacetext##"';
                                 $replace = '\'{"custom[type]":"' . $table . '"}\'';
+                            } elseif ($selectpageController == 'admin') {
+                                $attrArr['data-source'] = 'auth/admin/selectpage';
                             }
                             if ($this->isMatchSuffix($field, $this->selectpagesSuffix)) {
                                 $attrArr['data-multiple'] = 'true';
diff --git a/application/admin/command/Install/fastadmin.sql b/application/admin/command/Install/fastadmin.sql
index 50610976..5f706929 100755
--- a/application/admin/command/Install/fastadmin.sql
+++ b/application/admin/command/Install/fastadmin.sql
@@ -50,7 +50,7 @@ CREATE TABLE `fa_admin_log` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT 'ID',
   `admin_id` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '管理员ID',
   `username` varchar(30) NOT NULL DEFAULT '' COMMENT '管理员名字',
-  `url` varchar(255) NOT NULL DEFAULT '' COMMENT '操作页面',
+  `url` varchar(2000) NOT NULL DEFAULT '' COMMENT '操作页面',
   `title` varchar(100) NOT NULL DEFAULT '' COMMENT '日志标题',
   `content` text NOT NULL COMMENT '内容',
   `ip` varchar(50) NOT NULL DEFAULT '' COMMENT 'IP',
diff --git a/application/admin/controller/auth/Admin.php b/application/admin/controller/auth/Admin.php
index c3747b5d..e1b99adb 100644
--- a/application/admin/controller/auth/Admin.php
+++ b/application/admin/controller/auth/Admin.php
@@ -262,7 +262,7 @@ class Admin extends Backend
     /**
      * 下拉搜索
      */
-    protected function selectpage()
+    public function selectpage()
     {
         $this->dataLimit = 'auth';
         $this->dataLimitField = 'id';