From a6b4a1d3557792fdb7d46f6319fa54bada33f143 Mon Sep 17 00:00:00 2001 From: Jayin Ton Date: Mon, 6 Jul 2020 16:16:13 +0800 Subject: [PATCH 01/34] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=85=B3=E9=97=AD?= =?UTF-8?q?=E8=B7=AF=E7=94=B1=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/install.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/install.php b/public/install.php index c0ba3f6e..b6239e57 100644 --- a/public/install.php +++ b/public/install.php @@ -21,7 +21,7 @@ require __DIR__ . '/../thinkphp/base.php'; \think\Route::bind('\app\admin\command\Install', 'controller'); // 关闭路由 -\think\App::route(true); +\think\App::route(false); // 设置根url \think\Url::root(''); From 1dfbc62783d7c59c79bbfc5098c96a01716a8d14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=A5=87=E5=B3=B0?= <274160737@qq.com> Date: Thu, 6 Aug 2020 22:19:46 +0800 Subject: [PATCH 02/34] Update Crud.php There is a mistake when the amount of relationModel more than one --- application/admin/command/Crud.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/admin/command/Crud.php b/application/admin/command/Crud.php index 589a8bef..59786f13 100755 --- a/application/admin/command/Crud.php +++ b/application/admin/command/Crud.php @@ -211,7 +211,7 @@ class Crud extends Command //关联表 $relation = $input->getOption('relation'); //自定义关联表模型 - $relationModel = $input->getOption('relationmodel'); + $relationModels = $input->getOption('relationmodel'); //模式 $relationMode = $mode = $input->getOption('relationmode'); //外键 @@ -337,7 +337,7 @@ class Crud extends Command } } $relationTableInfo = $relationTableInfo[0]; - $relationModel = isset($relationModel[$index]) ? $relationModel[$index] : ''; + $relationModel = isset($relationModels[$index]) ? $relationModels[$index] : ''; list($relationNamespace, $relationName, $relationFile) = $this->getModelData($modelModuleName, $relationModel, $relationName); From 7f2ca19ef8ab4ede2d09b71e0e755d5879445521 Mon Sep 17 00:00:00 2001 From: youwo Date: Mon, 17 Aug 2020 22:44:06 +0800 Subject: [PATCH 03/34] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=85=A5=E5=8F=A3=E6=96=87=E4=BB=B6=E5=90=8D=E4=B8=8D=E8=83=BD?= =?UTF-8?q?=E5=8C=85=E5=90=ABadmin?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/admin/view/index/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/admin/view/index/index.html b/application/admin/view/index/index.html index 8a8aa9cd..d3bb93d9 100644 --- a/application/admin/view/index/index.html +++ b/application/admin/view/index/index.html @@ -10,7 +10,7 @@