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 1/3] =?UTF-8?q?1.=E5=A2=9E=E9=95=BFadmin=5Flog.url?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E9=95=BF=E5=BA=A6varchar(2000)=202.=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E4=B8=80=E9=94=AE=E7=94=9F=E6=88=90CRUD=E6=97=B6admin?= =?UTF-8?q?=5Fids=E5=AD=97=E6=AE=B5=E5=A4=9A=E9=80=89=E4=B8=8B=E6=8B=89?= =?UTF-8?q?=E6=A1=86bug?= 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 1962050f5..e04395f5b 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 fef1e16fb..09fc347cf 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 506109760..5f7069298 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 c3747b5d0..e1b99adbd 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'; -- Gitee From fcde614faeebf13518dce8b01c79f6f4241f0f75 Mon Sep 17 00:00:00 2001 From: PPPSCN <35696959@qq.com> Date: Sun, 18 Mar 2018 22:13:02 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=20ajax/area=E5=85=BC?= =?UTF-8?q?=E5=AE=B9=E4=B8=80=E9=94=AECRUD=E7=94=9F=E6=88=90=E7=9A=84row?= =?UTF-8?q?=E6=95=B0=E7=BB=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/admin/controller/Ajax.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/application/admin/controller/Ajax.php b/application/admin/controller/Ajax.php index 5c40c065b..fa67be737 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 !== '') -- Gitee From a2c2189fe9742520a1ac590bbbeb44d9f1159b2d Mon Sep 17 00:00:00 2001 From: PPPSCN <35696959@qq.com> Date: Mon, 19 Mar 2018 10:24:53 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=BC=80=E5=90=AF=E5=85=A5=E5=8F=A3?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E8=87=AA=E5=8A=A8=E7=BB=91=E5=AE=9A=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=EF=BC=8C=E4=BB=A5=E4=BE=BFadmin.php=E7=9B=B4=E6=8E=A5?= =?UTF-8?q?=E8=AE=BF=E9=97=AE=E5=90=8E=E5=8F=B0=EF=BC=8C=E5=B9=B6=E5=85=BC?= =?UTF-8?q?=E5=AE=B9addons=E6=8F=92=E4=BB=B6=E8=AE=BF=E9=97=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/config.php | 4 ++-- public/admin.php | 18 ++---------------- public/admin.php.bak | 38 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 42 insertions(+), 18 deletions(-) create mode 100644 public/admin.php.bak diff --git a/application/config.php b/application/config.php index 8a4c11259..15f1512b0 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 a1c1350d3..004784df8 100644 --- a/public/admin.php +++ b/public/admin.php @@ -9,9 +9,7 @@ // +---------------------------------------------------------------------- // | Author: liu21st // +---------------------------------------------------------------------- -// [ 后台入口文件 ] -// 使用此文件可以达到隐藏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 000000000..a1c1350d3 --- /dev/null +++ b/public/admin.php.bak @@ -0,0 +1,38 @@ + +// +---------------------------------------------------------------------- +// [ 后台入口文件 ] +// 使用此文件可以达到隐藏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(); -- Gitee