diff --git a/.gitignore b/.gitignore
index 1962050f52dac6888412967374d70fe6356bdc17..e04395f5b281970cef2aeed3267546f5b0544219 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 fef1e16fbc119021aaf65de9072de7e0dd229301..09fc347cf469c94932f9856897fc58bcb3307bbe 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 506109760c5e392f28c8bacc325bdb91ab04962b..5f7069298d944d8d82592883211b8c42540c37d4 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/Ajax.php b/application/admin/controller/Ajax.php
index 5c40c065b91afd6338e5c1a81a1f5aa2cea84fe2..fa67be737c1f3686155e4e2706cc5b673f41e673 100644
--- a/application/admin/controller/Ajax.php
+++ b/application/admin/controller/Ajax.php
@@ -264,8 +264,9 @@ class Ajax extends Backend
      */
     public function area()
     {
-        $province = $this->request->get('province');
-        $city = $this->request->get('city');
+        $params = $this->request->get("row/a");
+        $province = !empty($params['province']) ? $params['province'] : $this->request->get('province');
+        $city = !empty($params['city']) ? $params['city'] : $this->request->get('city');
         $where = ['pid' => 0, 'level' => 1];
         $provincelist = null;
         if ($province !== '')
diff --git a/application/admin/controller/auth/Admin.php b/application/admin/controller/auth/Admin.php
index c3747b5d093144cfaf780ed75b571d58ec9dd885..e1b99adbd1e1d6408bc74945b5c6482b4d22f689 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';
diff --git a/application/config.php b/application/config.php
index 8a4c1125979bf3747e652d52ff43f7148e2642ee..15f1512b0c20c68897bd9d16694ea78ab2165372 100755
--- a/application/config.php
+++ b/application/config.php
@@ -26,7 +26,7 @@ return [
     // 是否支持多模块
     'app_multi_module'       => true,
     // 入口自动绑定模块
-    'auto_bind_module'       => false,
+    'auto_bind_module'       => true,
     // 注册的根命名空间
     'root_namespace'         => [],
     // 扩展函数文件
@@ -245,7 +245,7 @@ return [
     //FastAdmin配置
     'fastadmin'              => [
         //登录验证码
-        'login_captcha'    => false,
+        'login_captcha'    => true,
         //是否同一账号同一时间只能在一个地方登录
         'login_unique'     => false,
         //登录页默认背景图
diff --git a/public/admin.php b/public/admin.php
index a1c1350d353d420b31ffc459ffe07077cce2bf2b..004784df8936068ede9163a5ffa277ce651bf8a7 100644
--- a/public/admin.php
+++ b/public/admin.php
@@ -9,9 +9,7 @@
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-// [ 后台入口文件 ]
-// 使用此文件可以达到隐藏admin模块的效果
-// 建议将admin.php改成其它任意的文件名，同时修改config.php中的'deny_module_list',把admin模块也添加进去
+// [ 应用入口文件 ]
 // 定义应用目录
 define('APP_PATH', __DIR__ . '/../application/');
 
@@ -23,16 +21,4 @@ if (!is_file(APP_PATH . 'admin/command/Install/install.lock'))
 }
 
 // 加载框架引导文件
-require __DIR__ . '/../thinkphp/base.php';
-
-// 绑定到admin模块
-\think\Route::bind('admin');
-
-// 关闭路由
-\think\App::route(false);
-
-// 设置根url
-\think\Url::root('');
-
-// 执行应用
-\think\App::run()->send();
+require __DIR__ . '/../thinkphp/start.php';
diff --git a/public/admin.php.bak b/public/admin.php.bak
new file mode 100644
index 0000000000000000000000000000000000000000..a1c1350d353d420b31ffc459ffe07077cce2bf2b
--- /dev/null
+++ b/public/admin.php.bak
@@ -0,0 +1,38 @@
+<?php
+
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006-2016 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+// [ 后台入口文件 ]
+// 使用此文件可以达到隐藏admin模块的效果
+// 建议将admin.php改成其它任意的文件名，同时修改config.php中的'deny_module_list',把admin模块也添加进去
+// 定义应用目录
+define('APP_PATH', __DIR__ . '/../application/');
+
+// 判断是否安装FastAdmin
+if (!is_file(APP_PATH . 'admin/command/Install/install.lock'))
+{
+    header("location:./install.php");
+    exit;
+}
+
+// 加载框架引导文件
+require __DIR__ . '/../thinkphp/base.php';
+
+// 绑定到admin模块
+\think\Route::bind('admin');
+
+// 关闭路由
+\think\App::route(false);
+
+// 设置根url
+\think\Url::root('');
+
+// 执行应用
+\think\App::run()->send();