From 9e56f9f85e71456e1c157acdd8dc23602bb712a1 Mon Sep 17 00:00:00 2001 From: JaguarJack Date: Thu, 23 Apr 2020 14:04:26 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=9D=83=E9=99=90keepalive?= =?UTF-8?q?=E5=AD=97=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../20200409023815_change_permissions.php | 2 +- .../database/seeds/PermissionSeed.php | 118 +++++++++--------- catch/permissions/model/Permissions.php | 4 +- 3 files changed, 62 insertions(+), 62 deletions(-) diff --git a/catch/permissions/database/migrations/20200409023815_change_permissions.php b/catch/permissions/database/migrations/20200409023815_change_permissions.php index 1d22efa..f2d1c0a 100644 --- a/catch/permissions/database/migrations/20200409023815_change_permissions.php +++ b/catch/permissions/database/migrations/20200409023815_change_permissions.php @@ -34,7 +34,7 @@ class ChangePermissions extends Migrator $table->addColumn('component', 'string', ['default' => '', 'comment' => '组件名称', 'limit' => '255', 'after' => 'permission_mark']) ->addColumn('redirect', 'string', ['default' => '', 'comment' => '跳转地址', 'limit' => '255', 'after' => 'component']) ->addColumn('hide_children_in_menu', 'integer', ['limit' => \Phinx\Db\Adapter\MysqlAdapter::INT_TINY, 'default' => 1, 'comment' => '1 显示 2隐藏', 'after' => 'redirect']) - ->addColumn('keep_alive', 'integer', ['limit' => \Phinx\Db\Adapter\MysqlAdapter::INT_TINY, 'default' => 1, 'comment' => '1 缓存 2 不存在 ', 'after' => 'hide_children_in_menu']) + ->addColumn('keepalive', 'integer', ['limit' => \Phinx\Db\Adapter\MysqlAdapter::INT_TINY, 'default' => 1, 'comment' => '1 缓存 2 不存在 ', 'after' => 'hide_children_in_menu']) ->update(); } } diff --git a/catch/permissions/database/seeds/PermissionSeed.php b/catch/permissions/database/seeds/PermissionSeed.php index 68e2ef7..06269e3 100644 --- a/catch/permissions/database/seeds/PermissionSeed.php +++ b/catch/permissions/database/seeds/PermissionSeed.php @@ -60,7 +60,7 @@ class PermissionSeed extends Seeder 'component' => 'routeView', 'redirect' => '', 'hide_children_in_menu' => 2, - 'keep_alive' => 1, + 'keepalive' => 1, 'type' => 1, 'sort' => 1000, 'created_at' => 1587461227, @@ -82,7 +82,7 @@ class PermissionSeed extends Seeder 'component' => 'workplace', 'redirect' => '', 'hide_children_in_menu' => 2, - 'keep_alive' => 1, + 'keepalive' => 1, 'type' => 1, 'sort' => 1, 'created_at' => 1587461326, @@ -104,7 +104,7 @@ class PermissionSeed extends Seeder 'component' => 'pageView', 'redirect' => '', 'hide_children_in_menu' => 2, - 'keep_alive' => 1, + 'keepalive' => 1, 'type' => 1, 'sort' => 100, 'created_at' => 1587461455, @@ -126,7 +126,7 @@ class PermissionSeed extends Seeder 'component' => 'users', 'redirect' => '', 'hide_children_in_menu' => 2, - 'keep_alive' => 1, + 'keepalive' => 1, 'type' => 1, 'sort' => 10, 'created_at' => 1587461597, @@ -148,7 +148,7 @@ class PermissionSeed extends Seeder 'component' => '', 'redirect' => '', 'hide_children_in_menu' => 1, - 'keep_alive' => 1, + 'keepalive' => 1, 'type' => 2, 'sort' => 1, 'created_at' => 1587461647, @@ -170,7 +170,7 @@ class PermissionSeed extends Seeder 'component' => '', 'redirect' => '', 'hide_children_in_menu' => 1, - 'keep_alive' => 1, + 'keepalive' => 1, 'type' => 2, 'sort' => 1, 'created_at' => 1587461696, @@ -192,7 +192,7 @@ class PermissionSeed extends Seeder 'component' => '', 'redirect' => '', 'hide_children_in_menu' => 1, - 'keep_alive' => 1, + 'keepalive' => 1, 'type' => 2, 'sort' => 1, 'created_at' => 1587461721, @@ -214,7 +214,7 @@ class PermissionSeed extends Seeder 'component' => '', 'redirect' => '', 'hide_children_in_menu' => 1, - 'keep_alive' => 1, + 'keepalive' => 1, 'type' => 2, 'sort' => 1, 'created_at' => 1587461742, @@ -236,7 +236,7 @@ class PermissionSeed extends Seeder 'component' => '', 'redirect' => '', 'hide_children_in_menu' => 1, - 'keep_alive' => 1, + 'keepalive' => 1, 'type' => 2, 'sort' => 1, 'created_at' => 1587461762, @@ -258,7 +258,7 @@ class PermissionSeed extends Seeder 'component' => '', 'redirect' => '', 'hide_children_in_menu' => 1, - 'keep_alive' => 1, + 'keepalive' => 1, 'type' => 2, 'sort' => 1, 'created_at' => 1587461841, @@ -280,7 +280,7 @@ class PermissionSeed extends Seeder 'component' => '', 'redirect' => '', 'hide_children_in_menu' => 1, - 'keep_alive' => 1, + 'keepalive' => 1, 'type' => 2, 'sort' => 1, 'created_at' => 1587461876, @@ -302,7 +302,7 @@ class PermissionSeed extends Seeder 'component' => '', 'redirect' => '', 'hide_children_in_menu' => 1, - 'keep_alive' => 1, + 'keepalive' => 1, 'type' => 2, 'sort' => 1, 'created_at' => 1587461901, @@ -324,7 +324,7 @@ class PermissionSeed extends Seeder 'component' => 'roles', 'redirect' => '', 'hide_children_in_menu' => 2, - 'keep_alive' => 1, + 'keepalive' => 1, 'type' => 1, 'sort' => 9, 'created_at' => 1587461939, @@ -346,7 +346,7 @@ class PermissionSeed extends Seeder 'component' => '', 'redirect' => '', 'hide_children_in_menu' => 1, - 'keep_alive' => 1, + 'keepalive' => 1, 'type' => 2, 'sort' => 1, 'created_at' => 1587461984, @@ -368,7 +368,7 @@ class PermissionSeed extends Seeder 'component' => '', 'redirect' => '', 'hide_children_in_menu' => 1, - 'keep_alive' => 1, + 'keepalive' => 1, 'type' => 2, 'sort' => 1, 'created_at' => 1587462007, @@ -390,7 +390,7 @@ class PermissionSeed extends Seeder 'component' => '', 'redirect' => '', 'hide_children_in_menu' => 1, - 'keep_alive' => 1, + 'keepalive' => 1, 'type' => 2, 'sort' => 1, 'created_at' => 1587462021, @@ -412,7 +412,7 @@ class PermissionSeed extends Seeder 'component' => '', 'redirect' => '', 'hide_children_in_menu' => 1, - 'keep_alive' => 1, + 'keepalive' => 1, 'type' => 2, 'sort' => 1, 'created_at' => 1587462040, @@ -434,7 +434,7 @@ class PermissionSeed extends Seeder 'component' => '', 'redirect' => '', 'hide_children_in_menu' => 1, - 'keep_alive' => 1, + 'keepalive' => 1, 'type' => 2, 'sort' => 1, 'created_at' => 1587462058, @@ -456,7 +456,7 @@ class PermissionSeed extends Seeder 'component' => '', 'redirect' => '', 'hide_children_in_menu' => 1, - 'keep_alive' => 1, + 'keepalive' => 1, 'type' => 2, 'sort' => 1, 'created_at' => 1587462070, @@ -478,7 +478,7 @@ class PermissionSeed extends Seeder 'component' => '', 'redirect' => '', 'hide_children_in_menu' => 1, - 'keep_alive' => 1, + 'keepalive' => 1, 'type' => 2, 'sort' => 1, 'created_at' => 1587462094, @@ -500,7 +500,7 @@ class PermissionSeed extends Seeder 'component' => 'rules', 'redirect' => '', 'hide_children_in_menu' => 2, - 'keep_alive' => 1, + 'keepalive' => 1, 'type' => 1, 'sort' => 8, 'created_at' => 1587462147, @@ -522,7 +522,7 @@ class PermissionSeed extends Seeder 'component' => '', 'redirect' => '', 'hide_children_in_menu' => 1, - 'keep_alive' => 1, + 'keepalive' => 1, 'type' => 2, 'sort' => 1, 'created_at' => 1587462205, @@ -544,7 +544,7 @@ class PermissionSeed extends Seeder 'component' => '', 'redirect' => '', 'hide_children_in_menu' => 1, - 'keep_alive' => 1, + 'keepalive' => 1, 'type' => 2, 'sort' => 1, 'created_at' => 1587462232, @@ -566,7 +566,7 @@ class PermissionSeed extends Seeder 'component' => '', 'redirect' => '', 'hide_children_in_menu' => 1, - 'keep_alive' => 1, + 'keepalive' => 1, 'type' => 2, 'sort' => 1, 'created_at' => 1587462250, @@ -588,7 +588,7 @@ class PermissionSeed extends Seeder 'component' => '', 'redirect' => '', 'hide_children_in_menu' => 1, - 'keep_alive' => 1, + 'keepalive' => 1, 'type' => 2, 'sort' => 1, 'created_at' => 1587462273, @@ -610,7 +610,7 @@ class PermissionSeed extends Seeder 'component' => '', 'redirect' => '', 'hide_children_in_menu' => 1, - 'keep_alive' => 1, + 'keepalive' => 1, 'type' => 2, 'sort' => 1, 'created_at' => 1587462284, @@ -632,7 +632,7 @@ class PermissionSeed extends Seeder 'component' => '', 'redirect' => '', 'hide_children_in_menu' => 1, - 'keep_alive' => 1, + 'keepalive' => 1, 'type' => 2, 'sort' => 1, 'created_at' => 1587462296, @@ -654,7 +654,7 @@ class PermissionSeed extends Seeder 'component' => 'pageView', 'redirect' => '', 'hide_children_in_menu' => 2, - 'keep_alive' => 1, + 'keepalive' => 1, 'type' => 1, 'sort' => 1, 'created_at' => 1587462349, @@ -676,7 +676,7 @@ class PermissionSeed extends Seeder 'component' => 'departments', 'redirect' => '', 'hide_children_in_menu' => 2, - 'keep_alive' => 1, + 'keepalive' => 1, 'type' => 1, 'sort' => 7, 'created_at' => 1587462488, @@ -698,7 +698,7 @@ class PermissionSeed extends Seeder 'component' => '', 'redirect' => '', 'hide_children_in_menu' => 1, - 'keep_alive' => 1, + 'keepalive' => 1, 'type' => 2, 'sort' => 1, 'created_at' => 1587462529, @@ -720,7 +720,7 @@ class PermissionSeed extends Seeder 'component' => '', 'redirect' => '', 'hide_children_in_menu' => 1, - 'keep_alive' => 1, + 'keepalive' => 1, 'type' => 2, 'sort' => 1, 'created_at' => 1587462548, @@ -742,7 +742,7 @@ class PermissionSeed extends Seeder 'component' => '', 'redirect' => '', 'hide_children_in_menu' => 1, - 'keep_alive' => 1, + 'keepalive' => 1, 'type' => 2, 'sort' => 1, 'created_at' => 1587462579, @@ -764,7 +764,7 @@ class PermissionSeed extends Seeder 'component' => '', 'redirect' => '', 'hide_children_in_menu' => 1, - 'keep_alive' => 1, + 'keepalive' => 1, 'type' => 2, 'sort' => 1, 'created_at' => 1587462592, @@ -786,7 +786,7 @@ class PermissionSeed extends Seeder 'component' => 'jobs', 'redirect' => '', 'hide_children_in_menu' => 2, - 'keep_alive' => 1, + 'keepalive' => 1, 'type' => 1, 'sort' => 1, 'created_at' => 1587462707, @@ -808,7 +808,7 @@ class PermissionSeed extends Seeder 'component' => '', 'redirect' => '', 'hide_children_in_menu' => 1, - 'keep_alive' => 1, + 'keepalive' => 1, 'type' => 2, 'sort' => 1, 'created_at' => 1587462757, @@ -830,7 +830,7 @@ class PermissionSeed extends Seeder 'component' => '', 'redirect' => '', 'hide_children_in_menu' => 1, - 'keep_alive' => 1, + 'keepalive' => 1, 'type' => 2, 'sort' => 1, 'created_at' => 1587462774, @@ -852,7 +852,7 @@ class PermissionSeed extends Seeder 'component' => '', 'redirect' => '', 'hide_children_in_menu' => 1, - 'keep_alive' => 1, + 'keepalive' => 1, 'type' => 2, 'sort' => 1, 'created_at' => 1587462785, @@ -874,7 +874,7 @@ class PermissionSeed extends Seeder 'component' => '', 'redirect' => '', 'hide_children_in_menu' => 1, - 'keep_alive' => 1, + 'keepalive' => 1, 'type' => 2, 'sort' => 1, 'created_at' => 1587462794, @@ -896,7 +896,7 @@ class PermissionSeed extends Seeder 'component' => '', 'redirect' => '', 'hide_children_in_menu' => 1, - 'keep_alive' => 1, + 'keepalive' => 1, 'type' => 2, 'sort' => 1, 'created_at' => 1587462818, @@ -918,7 +918,7 @@ class PermissionSeed extends Seeder 'component' => 'database', 'redirect' => '', 'hide_children_in_menu' => 2, - 'keep_alive' => 1, + 'keepalive' => 1, 'type' => 1, 'sort' => 8, 'created_at' => 1587463087, @@ -940,7 +940,7 @@ class PermissionSeed extends Seeder 'component' => '', 'redirect' => '', 'hide_children_in_menu' => 1, - 'keep_alive' => 1, + 'keepalive' => 1, 'type' => 2, 'sort' => 1, 'created_at' => 1587463113, @@ -962,7 +962,7 @@ class PermissionSeed extends Seeder 'component' => '', 'redirect' => '', 'hide_children_in_menu' => 1, - 'keep_alive' => 1, + 'keepalive' => 1, 'type' => 2, 'sort' => 10, 'created_at' => 1587463173, @@ -984,7 +984,7 @@ class PermissionSeed extends Seeder 'component' => '', 'redirect' => '', 'hide_children_in_menu' => 1, - 'keep_alive' => 1, + 'keepalive' => 1, 'type' => 2, 'sort' => 1, 'created_at' => 1587463201, @@ -1006,7 +1006,7 @@ class PermissionSeed extends Seeder 'component' => '', 'redirect' => '', 'hide_children_in_menu' => 1, - 'keep_alive' => 1, + 'keepalive' => 1, 'type' => 2, 'sort' => 1, 'created_at' => 1587463217, @@ -1028,7 +1028,7 @@ class PermissionSeed extends Seeder 'component' => 'attachment', 'redirect' => '', 'hide_children_in_menu' => 2, - 'keep_alive' => 1, + 'keepalive' => 1, 'type' => 1, 'sort' => 10, 'created_at' => 1587463302, @@ -1050,7 +1050,7 @@ class PermissionSeed extends Seeder 'component' => '', 'redirect' => '', 'hide_children_in_menu' => 1, - 'keep_alive' => 1, + 'keepalive' => 1, 'type' => 2, 'sort' => 1, 'created_at' => 1587463335, @@ -1072,7 +1072,7 @@ class PermissionSeed extends Seeder 'component' => '', 'redirect' => '', 'hide_children_in_menu' => 1, - 'keep_alive' => 1, + 'keepalive' => 1, 'type' => 2, 'sort' => 1, 'created_at' => 1587463355, @@ -1094,7 +1094,7 @@ class PermissionSeed extends Seeder 'component' => '', 'redirect' => '', 'hide_children_in_menu' => 1, - 'keep_alive' => 1, + 'keepalive' => 1, 'type' => 2, 'sort' => 1, 'created_at' => 1587466919, @@ -1116,7 +1116,7 @@ class PermissionSeed extends Seeder 'component' => '', 'redirect' => '', 'hide_children_in_menu' => 1, - 'keep_alive' => 1, + 'keepalive' => 1, 'type' => 2, 'sort' => 1, 'created_at' => 1587466939, @@ -1138,7 +1138,7 @@ class PermissionSeed extends Seeder 'component' => 'config', 'redirect' => '', 'hide_children_in_menu' => 2, - 'keep_alive' => 1, + 'keepalive' => 1, 'type' => 1, 'sort' => 9, 'created_at' => 1587466991, @@ -1160,7 +1160,7 @@ class PermissionSeed extends Seeder 'component' => '', 'redirect' => '', 'hide_children_in_menu' => 1, - 'keep_alive' => 1, + 'keepalive' => 1, 'type' => 2, 'sort' => 1, 'created_at' => 1587467036, @@ -1182,7 +1182,7 @@ class PermissionSeed extends Seeder 'component' => '', 'redirect' => '', 'hide_children_in_menu' => 1, - 'keep_alive' => 1, + 'keepalive' => 1, 'type' => 2, 'sort' => 1, 'created_at' => 1587467052, @@ -1204,7 +1204,7 @@ class PermissionSeed extends Seeder 'component' => '', 'redirect' => '', 'hide_children_in_menu' => 1, - 'keep_alive' => 1, + 'keepalive' => 1, 'type' => 2, 'sort' => 1, 'created_at' => 1587467062, @@ -1226,7 +1226,7 @@ class PermissionSeed extends Seeder 'component' => 'loginLog', 'redirect' => '', 'hide_children_in_menu' => 2, - 'keep_alive' => 1, + 'keepalive' => 1, 'type' => 1, 'sort' => 5, 'created_at' => 1587467150, @@ -1248,7 +1248,7 @@ class PermissionSeed extends Seeder 'component' => 'operateLog', 'redirect' => '', 'hide_children_in_menu' => 2, - 'keep_alive' => 1, + 'keepalive' => 1, 'type' => 1, 'sort' => 1, 'created_at' => 1587467180, @@ -1270,7 +1270,7 @@ class PermissionSeed extends Seeder 'component' => '', 'redirect' => '', 'hide_children_in_menu' => 1, - 'keep_alive' => 1, + 'keepalive' => 1, 'type' => 2, 'sort' => 1, 'created_at' => 1587467206, @@ -1292,7 +1292,7 @@ class PermissionSeed extends Seeder 'component' => '', 'redirect' => '', 'hide_children_in_menu' => 1, - 'keep_alive' => 1, + 'keepalive' => 1, 'type' => 2, 'sort' => 1, 'created_at' => 1587467221, @@ -1314,7 +1314,7 @@ class PermissionSeed extends Seeder 'component' => '', 'redirect' => '', 'hide_children_in_menu' => 1, - 'keep_alive' => 1, + 'keepalive' => 1, 'type' => 2, 'sort' => 1, 'created_at' => 1587467246, @@ -1336,7 +1336,7 @@ class PermissionSeed extends Seeder 'component' => '', 'redirect' => '', 'hide_children_in_menu' => 1, - 'keep_alive' => 1, + 'keepalive' => 1, 'type' => 2, 'sort' => 1, 'created_at' => 1587467266, diff --git a/catch/permissions/model/Permissions.php b/catch/permissions/model/Permissions.php index bbd9d64..0a0bba2 100644 --- a/catch/permissions/model/Permissions.php +++ b/catch/permissions/model/Permissions.php @@ -18,7 +18,7 @@ class Permissions extends CatchModel 'icon', 'component', // 组件 'redirect', - 'keep_alive', + 'keepalive', 'hide_children_in_menu', 'creator_id', 'module', // 模块 @@ -71,7 +71,7 @@ class Permissions extends CatchModel return parent::whereIn('id', $permissionIds) ->field(['permission_name as title', 'id', 'parent_id', 'route', 'icon', 'component', 'redirect', - 'keep_alive as keepAlive', 'hide_children_in_menu', 'type' + 'keepalive as keepAlive', 'hide_children_in_menu', 'type' ]) ->select(); }