From 42656637015b6b396817a8197c597bdf6cc65e18 Mon Sep 17 00:00:00 2001 From: panliang <1163816051@qq.com> Date: Wed, 10 Aug 2022 11:43:44 +0800 Subject: [PATCH 1/3] add merchant --- packages/goods/src/Models/Goods.php | 1 - packages/goods/updates/CreateGoodsTable.php | 1 - packages/merchant | 1 + 3 files changed, 1 insertion(+), 2 deletions(-) create mode 160000 packages/merchant diff --git a/packages/goods/src/Models/Goods.php b/packages/goods/src/Models/Goods.php index 1c8524b..cffef68 100644 --- a/packages/goods/src/Models/Goods.php +++ b/packages/goods/src/Models/Goods.php @@ -9,7 +9,6 @@ use Peidikeji\Goods\Filters\GoodsFilter; class Goods extends Model { - use SoftDeletes; use Filterable; protected $table = 'goods'; diff --git a/packages/goods/updates/CreateGoodsTable.php b/packages/goods/updates/CreateGoodsTable.php index aa987f2..37471a5 100644 --- a/packages/goods/updates/CreateGoodsTable.php +++ b/packages/goods/updates/CreateGoodsTable.php @@ -65,7 +65,6 @@ class CreateGoodsTable extends Migration $table->json('spec')->nullable()->comment('规格[{name, values: [{name, value}]}]'); $table->json('part')->nullable()->comment('配件[{name, values: [{name, value}]}]'); $table->timestamps(); - $table->softDeletes(); $table->foreign('category_id')->references('id')->on('goods_category'); $table->foreign('type_id')->references('id')->on('goods_type'); diff --git a/packages/merchant b/packages/merchant new file mode 160000 index 0000000..2b3e329 --- /dev/null +++ b/packages/merchant @@ -0,0 +1 @@ +Subproject commit 2b3e329a33bea20dc39d5c869faf0fb8f7e96e4d From 80245a9775d9cc3d0817b85aabaa4f1cc4b4fa99 Mon Sep 17 00:00:00 2001 From: panliang <1163816051@qq.com> Date: Wed, 10 Aug 2022 14:08:27 +0800 Subject: [PATCH 2/3] add commadn --- packages/merchant | 1 - src/Console/ModelFillable.php | 56 +++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 1 deletion(-) delete mode 160000 packages/merchant create mode 100644 src/Console/ModelFillable.php diff --git a/packages/merchant b/packages/merchant deleted file mode 160000 index 2b3e329..0000000 --- a/packages/merchant +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 2b3e329a33bea20dc39d5c869faf0fb8f7e96e4d diff --git a/src/Console/ModelFillable.php b/src/Console/ModelFillable.php new file mode 100644 index 0000000..f65fb2d --- /dev/null +++ b/src/Console/ModelFillable.php @@ -0,0 +1,56 @@ +argument('table'); + $except = ['id', 'created_at', 'updated_at']; + + if (Schema::hasTable($table)) { + if (DB::getDefaultConnection() === 'mysql') { + $list = DB::table('information_schema.columns')->where(['table_schema' => config('database.connections.mysql.database'), 'table_name' => $table])->pluck('COLUMN_NAME')->all(); + } else { + $list = Schema::getColumnListing($table); + } + $list = array_filter($list, fn($v) => !in_array($v, $except)); + $this->info("protected \$fillable = ['".implode('\', \'', $list)."'];"); + } else { + $this->error('table ' . $table . ' is not exists'); + } + } +} From 029ca3c743ccfbe06b4ec200b8dd512aa1723b20 Mon Sep 17 00:00:00 2001 From: panliang <1163816051@qq.com> Date: Wed, 10 Aug 2022 06:16:21 +0000 Subject: [PATCH 3/3] 1 --- src/AdminServiceProvider.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/AdminServiceProvider.php b/src/AdminServiceProvider.php index bb31b4f..80f43ac 100755 --- a/src/AdminServiceProvider.php +++ b/src/AdminServiceProvider.php @@ -49,6 +49,7 @@ class AdminServiceProvider extends ServiceProvider Console\ExtensionDiableCommand::class, Console\ExtensionUpdateCommand::class, Console\UpdateCommand::class, + Console\ModelFillable::class, ]; /**