From d533aeaa9eaefc455bcccde6333738140d087c04 Mon Sep 17 00:00:00 2001 From: JaguarJack Date: Mon, 7 Sep 2020 08:29:12 +0800 Subject: [PATCH] update --- .../database/seeds/PermissionsMenusSeed.php | 46 ++++---- .../system/database/seeds/SystemMenusSeed.php | 12 +- catch/system/model/Config.php | 106 ++---------------- .../wechat/database/seeds/WechatMenusSeed.php | 64 +++++------ extend/catcher/CatchUpload.php | 29 ++++- extend/catcher/Utils.php | 13 +++ 6 files changed, 109 insertions(+), 161 deletions(-) diff --git a/catch/permissions/database/seeds/PermissionsMenusSeed.php b/catch/permissions/database/seeds/PermissionsMenusSeed.php index 9eae6fd..dd540dc 100644 --- a/catch/permissions/database/seeds/PermissionsMenusSeed.php +++ b/catch/permissions/database/seeds/PermissionsMenusSeed.php @@ -30,7 +30,7 @@ class PermissionsMenusSeed extends Seeder 'icon' => 'el-icon-cpu', 'module' => 'permissions', 'creator_id' => 1, - 'permission_mark' => 'permission@index', + 'permission_mark' => 'permission', 'component' => 'layout', 'redirect' => '/permissions/users', 'hidden' => 1, @@ -38,7 +38,7 @@ class PermissionsMenusSeed extends Seeder 'type' => 1, 'sort' => 100, 'created_at' => 1587461455, - 'updated_at' => 1599219097, + 'updated_at' => 1599362429, 'deleted_at' => 0, 'children' => array ( @@ -60,7 +60,7 @@ class PermissionsMenusSeed extends Seeder 'type' => 1, 'sort' => 10, 'created_at' => 1587461597, - 'updated_at' => 1599116793, + 'updated_at' => 1599362429, 'deleted_at' => 0, 'children' => array ( @@ -244,7 +244,7 @@ class PermissionsMenusSeed extends Seeder 'icon' => 'el-icon-s-custom', 'module' => 'permissions', 'creator_id' => 1, - 'permission_mark' => 'role@index', + 'permission_mark' => 'role', 'component' => 'roles', 'redirect' => '', 'hidden' => 1, @@ -252,7 +252,7 @@ class PermissionsMenusSeed extends Seeder 'type' => 1, 'sort' => 9, 'created_at' => 1587461939, - 'updated_at' => 1599116793, + 'updated_at' => 1599362438, 'deleted_at' => 0, 'children' => array ( @@ -274,7 +274,7 @@ class PermissionsMenusSeed extends Seeder 'type' => 2, 'sort' => 1, 'created_at' => 1587461984, - 'updated_at' => 1599030223, + 'updated_at' => 1599362438, 'deleted_at' => 0, ), 1 => @@ -295,7 +295,7 @@ class PermissionsMenusSeed extends Seeder 'type' => 2, 'sort' => 1, 'created_at' => 1587462007, - 'updated_at' => 1599030223, + 'updated_at' => 1599362438, 'deleted_at' => 0, ), 2 => @@ -316,7 +316,7 @@ class PermissionsMenusSeed extends Seeder 'type' => 2, 'sort' => 1, 'created_at' => 1587462021, - 'updated_at' => 1599030223, + 'updated_at' => 1599362438, 'deleted_at' => 0, ), 3 => @@ -337,7 +337,7 @@ class PermissionsMenusSeed extends Seeder 'type' => 2, 'sort' => 1, 'created_at' => 1587462040, - 'updated_at' => 1599030223, + 'updated_at' => 1599362438, 'deleted_at' => 0, ), 4 => @@ -358,7 +358,7 @@ class PermissionsMenusSeed extends Seeder 'type' => 2, 'sort' => 1, 'created_at' => 1587462058, - 'updated_at' => 1599030223, + 'updated_at' => 1599362438, 'deleted_at' => 0, ), 5 => @@ -379,7 +379,7 @@ class PermissionsMenusSeed extends Seeder 'type' => 2, 'sort' => 1, 'created_at' => 1587462070, - 'updated_at' => 1599030223, + 'updated_at' => 1599362438, 'deleted_at' => 0, ), 6 => @@ -400,7 +400,7 @@ class PermissionsMenusSeed extends Seeder 'type' => 2, 'sort' => 1, 'created_at' => 1587462094, - 'updated_at' => 1599030223, + 'updated_at' => 1599362438, 'deleted_at' => 0, ), ), @@ -415,7 +415,7 @@ class PermissionsMenusSeed extends Seeder 'icon' => 'el-icon-collection-tag', 'module' => 'permissions', 'creator_id' => 1, - 'permission_mark' => 'permission@index', + 'permission_mark' => 'permission', 'component' => 'rules', 'redirect' => '', 'hidden' => 1, @@ -423,7 +423,7 @@ class PermissionsMenusSeed extends Seeder 'type' => 1, 'sort' => 8, 'created_at' => 1587462147, - 'updated_at' => 1599116793, + 'updated_at' => 1599362475, 'deleted_at' => 0, 'children' => array ( @@ -445,7 +445,7 @@ class PermissionsMenusSeed extends Seeder 'type' => 2, 'sort' => 1, 'created_at' => 1587462205, - 'updated_at' => 1599030338, + 'updated_at' => 1599362475, 'deleted_at' => 0, ), 1 => @@ -466,7 +466,7 @@ class PermissionsMenusSeed extends Seeder 'type' => 2, 'sort' => 1, 'created_at' => 1587462232, - 'updated_at' => 1599030338, + 'updated_at' => 1599362475, 'deleted_at' => 0, ), 2 => @@ -487,7 +487,7 @@ class PermissionsMenusSeed extends Seeder 'type' => 2, 'sort' => 1, 'created_at' => 1587462250, - 'updated_at' => 1599030338, + 'updated_at' => 1599362475, 'deleted_at' => 0, ), 3 => @@ -508,7 +508,7 @@ class PermissionsMenusSeed extends Seeder 'type' => 2, 'sort' => 1, 'created_at' => 1587462273, - 'updated_at' => 1599220816, + 'updated_at' => 1599362475, 'deleted_at' => 0, ), 4 => @@ -529,7 +529,7 @@ class PermissionsMenusSeed extends Seeder 'type' => 2, 'sort' => 1, 'created_at' => 1587462284, - 'updated_at' => 1599030338, + 'updated_at' => 1599362475, 'deleted_at' => 0, ), 5 => @@ -550,7 +550,7 @@ class PermissionsMenusSeed extends Seeder 'type' => 2, 'sort' => 1, 'created_at' => 1587462296, - 'updated_at' => 1599030338, + 'updated_at' => 1599362475, 'deleted_at' => 0, ), 6 => @@ -571,7 +571,7 @@ class PermissionsMenusSeed extends Seeder 'type' => 2, 'sort' => 1, 'created_at' => 1599221913, - 'updated_at' => 1599222591, + 'updated_at' => 1599362475, 'deleted_at' => 0, ), ), @@ -594,7 +594,7 @@ class PermissionsMenusSeed extends Seeder 'type' => 1, 'sort' => 7, 'created_at' => 1587462488, - 'updated_at' => 1599116793, + 'updated_at' => 1599362429, 'deleted_at' => 0, 'children' => array ( @@ -702,7 +702,7 @@ class PermissionsMenusSeed extends Seeder 'type' => 1, 'sort' => 1, 'created_at' => 1587462707, - 'updated_at' => 1599219794, + 'updated_at' => 1599362429, 'deleted_at' => 0, 'children' => array ( diff --git a/catch/system/database/seeds/SystemMenusSeed.php b/catch/system/database/seeds/SystemMenusSeed.php index 617de99..8786ba7 100644 --- a/catch/system/database/seeds/SystemMenusSeed.php +++ b/catch/system/database/seeds/SystemMenusSeed.php @@ -52,7 +52,7 @@ class SystemMenusSeed extends Seeder 'icon' => 'el-icon-copy-document', 'module' => 'system', 'creator_id' => 1, - 'permission_mark' => 'dataDictionary@index', + 'permission_mark' => 'dataDictionary', 'component' => 'database', 'redirect' => '', 'hidden' => 1, @@ -60,7 +60,7 @@ class SystemMenusSeed extends Seeder 'type' => 1, 'sort' => 8, 'created_at' => 1587463087, - 'updated_at' => 1599288737, + 'updated_at' => 1599362678, 'deleted_at' => 0, 'children' => array ( @@ -82,7 +82,7 @@ class SystemMenusSeed extends Seeder 'type' => 2, 'sort' => 1, 'created_at' => 1587463113, - 'updated_at' => 1591343449, + 'updated_at' => 1599362691, 'deleted_at' => 0, ), 1 => @@ -103,7 +103,7 @@ class SystemMenusSeed extends Seeder 'type' => 2, 'sort' => 10, 'created_at' => 1587463173, - 'updated_at' => 1587547118, + 'updated_at' => 1599362678, 'deleted_at' => 0, ), 2 => @@ -124,7 +124,7 @@ class SystemMenusSeed extends Seeder 'type' => 2, 'sort' => 1, 'created_at' => 1587463201, - 'updated_at' => 1587547118, + 'updated_at' => 1599362678, 'deleted_at' => 0, ), 3 => @@ -145,7 +145,7 @@ class SystemMenusSeed extends Seeder 'type' => 2, 'sort' => 1, 'created_at' => 1587463217, - 'updated_at' => 1587547118, + 'updated_at' => 1599362678, 'deleted_at' => 0, ), ), diff --git a/catch/system/model/Config.php b/catch/system/model/Config.php index 9489066..f42862d 100644 --- a/catch/system/model/Config.php +++ b/catch/system/model/Config.php @@ -95,96 +95,6 @@ class Config extends CatchModel } return true; - - - // 子配置 - if ($data['pid'] ?? false) { - $config = \json_decode($data['config'], true); - $pid = $data['pid']; - unset($data['pid']); - /**[ - 'key' => [ - 'k' => 'v' - ], - - 'k' => 'v' - ]*/ - /** - foreach ($config as $key => $value) { - if (empty($value)) { - continue; - } - // 如果二级配置存在 - $secondLevel = $this->isExistConfig($key, $pid); - if ($secondLevel) { - // value 是字符串 - if (!is_array($value)) { - if ($value != $secondLevel->value) { - $secondLevel->value = $value; - $secondLevel->save(); - } - } else { - // 数组 - $thirdLevel = []; - $this->subConfig($secondLevel->id, ['id', 'key', 'value']) - ->each(function ($item, $key) use (&$thirdLevel){ - $thirdLevel[$item['key']] = $item; - }); - - if (!empty($value)) { - $new = []; - foreach ($value as $k => $v) { - if (isset($thirdLevel[$k])) { - if ($v != $thirdLevel[$k]->value) { - $thirdLevel[$k]->value = $v; - $thirdLevel[$k]->save(); - } - } else { - $new[] = [ - 'pid' => $secondLevel->id, - 'key' => $k, - 'value' => $v, - ]; - } - } - - if (!empty($new)) { - parent::insertAllBy($new); - } - } - } - } else { - if (!is_array($value)) { - parent::createBy([ - 'pid' => $pid, - 'key' => $key, - 'value' => $value, - ]); - } else { - $id = parent::createBy([ - 'pid' => $pid, - 'key' => $key, - ]); - if (!empty($value)) { - $newConfig = []; - foreach ($value as $k => $v) { - $newConfig[] = [ - 'key' => $k, - 'value' => $v, - 'pid' => $id, - ]; - } - parent::insertAllBy($newConfig); - } - } - } - } -*/ - - return true; - } - - return parent::storeBy($data); } /** @@ -227,28 +137,26 @@ class Config extends CatchModel * 获取配置 * * @time 2020年04月20日 - * @param int $pid + * @param string $component * @throws \think\db\exception\DataNotFoundException * @throws \think\db\exception\DbException * @throws \think\db\exception\ModelNotFoundException * @return array|mixed */ - public function getConfig($pid = 0) + public function getConfig(string $component) { $data = []; - - $configs = $this->where('pid', $pid) + $configs = $this->where('pid', $this->where('component', $component)->value('id')) ->field('id,`key` as k,value,pid') ->select(); foreach ($configs as $config) { - if ($config->value !== '') { - $data[$config->k] = $config->value; - } else { - $data[$config->k] = $this->getConfig($config->id); + if (strpos($config['k'], '.') !== false) { + list($object, $key) = explode('.', $config['k']); + $data[$object][$key] = $config['value']; } } - return empty($data) ? '' : $data; + return $data; } } \ No newline at end of file diff --git a/catch/wechat/database/seeds/WechatMenusSeed.php b/catch/wechat/database/seeds/WechatMenusSeed.php index a8242fe..8352550 100644 --- a/catch/wechat/database/seeds/WechatMenusSeed.php +++ b/catch/wechat/database/seeds/WechatMenusSeed.php @@ -31,14 +31,14 @@ class WechatMenusSeed extends Seeder 'module' => 'wechat', 'creator_id' => 1, 'permission_mark' => 'wechat', - 'component' => 'routeView', - 'redirect' => '', + 'component' => 'layout', + 'redirect' => '/wechat/menus', 'hidden' => 1, 'keepalive' => 1, 'type' => 1, 'sort' => 1, 'created_at' => 1591603025, - 'updated_at' => 1599289456, + 'updated_at' => 1599371183, 'deleted_at' => 0, 'children' => array ( @@ -58,9 +58,9 @@ class WechatMenusSeed extends Seeder 'hidden' => 1, 'keepalive' => 1, 'type' => 1, - 'sort' => 1, + 'sort' => 18, 'created_at' => 1591603088, - 'updated_at' => 1599289456, + 'updated_at' => 1599371183, 'deleted_at' => 0, 'children' => array ( @@ -82,7 +82,7 @@ class WechatMenusSeed extends Seeder 'type' => 2, 'sort' => 1, 'created_at' => 1593304908, - 'updated_at' => 1593589434, + 'updated_at' => 1599371167, 'deleted_at' => 0, ), 1 => @@ -103,7 +103,7 @@ class WechatMenusSeed extends Seeder 'type' => 2, 'sort' => 1, 'created_at' => 1593304915, - 'updated_at' => 1593589434, + 'updated_at' => 1599371167, 'deleted_at' => 0, ), 2 => @@ -124,7 +124,7 @@ class WechatMenusSeed extends Seeder 'type' => 2, 'sort' => 1, 'created_at' => 1593304923, - 'updated_at' => 1593589434, + 'updated_at' => 1599371167, 'deleted_at' => 0, ), 3 => @@ -145,7 +145,7 @@ class WechatMenusSeed extends Seeder 'type' => 2, 'sort' => 1, 'created_at' => 1593304929, - 'updated_at' => 1593589434, + 'updated_at' => 1599371167, 'deleted_at' => 0, ), 4 => @@ -166,7 +166,7 @@ class WechatMenusSeed extends Seeder 'type' => 2, 'sort' => 1, 'created_at' => 1593304938, - 'updated_at' => 1593589434, + 'updated_at' => 1599371167, 'deleted_at' => 0, ), ), @@ -182,14 +182,14 @@ class WechatMenusSeed extends Seeder 'module' => 'wechat', 'creator_id' => 1, 'permission_mark' => 'users', - 'component' => 'pageView', + 'component' => 'routerView', 'redirect' => '', 'hidden' => 1, 'keepalive' => 1, 'type' => 1, 'sort' => 1, 'created_at' => 1592624761, - 'updated_at' => 1599289538, + 'updated_at' => 1599371697, 'deleted_at' => 0, 'children' => array ( @@ -199,7 +199,7 @@ class WechatMenusSeed extends Seeder 'permission_name' => '微信用户', 'parent_id' => 75, 'level' => '66-75', - 'route' => '/wechat/users', + 'route' => '/wechat/users/user', 'icon' => 'user', 'module' => 'wechat', 'creator_id' => 1, @@ -211,7 +211,7 @@ class WechatMenusSeed extends Seeder 'type' => 1, 'sort' => 1, 'created_at' => 1592624799, - 'updated_at' => 1599289538, + 'updated_at' => 1599376002, 'deleted_at' => 0, 'children' => array ( @@ -233,7 +233,7 @@ class WechatMenusSeed extends Seeder 'type' => 2, 'sort' => 1, 'created_at' => 1593304869, - 'updated_at' => 1593589434, + 'updated_at' => 1599376002, 'deleted_at' => 0, ), 1 => @@ -254,7 +254,7 @@ class WechatMenusSeed extends Seeder 'type' => 2, 'sort' => 1, 'created_at' => 1593304876, - 'updated_at' => 1593589434, + 'updated_at' => 1599376002, 'deleted_at' => 0, ), 2 => @@ -275,7 +275,7 @@ class WechatMenusSeed extends Seeder 'type' => 2, 'sort' => 1, 'created_at' => 1593304884, - 'updated_at' => 1593589434, + 'updated_at' => 1599376002, 'deleted_at' => 0, ), 3 => @@ -296,7 +296,7 @@ class WechatMenusSeed extends Seeder 'type' => 2, 'sort' => 1, 'created_at' => 1593304892, - 'updated_at' => 1593589434, + 'updated_at' => 1599376002, 'deleted_at' => 0, ), 4 => @@ -317,7 +317,7 @@ class WechatMenusSeed extends Seeder 'type' => 2, 'sort' => 1, 'created_at' => 1593304900, - 'updated_at' => 1593589434, + 'updated_at' => 1599376002, 'deleted_at' => 0, ), ), @@ -328,11 +328,11 @@ class WechatMenusSeed extends Seeder 'permission_name' => '微信标签', 'parent_id' => 75, 'level' => '66-75', - 'route' => '/wechat/tags', + 'route' => '/wechat/users/tag', 'icon' => 'el-icon-paperclip', 'module' => 'wechat', 'creator_id' => 1, - 'permission_mark' => 'users@tags', + 'permission_mark' => 'tags', 'component' => 'wechatTags', 'redirect' => '', 'hidden' => 1, @@ -340,7 +340,7 @@ class WechatMenusSeed extends Seeder 'type' => 1, 'sort' => 1, 'created_at' => 1592722634, - 'updated_at' => 1599289538, + 'updated_at' => 1599376011, 'deleted_at' => 0, 'children' => array ( @@ -354,7 +354,7 @@ class WechatMenusSeed extends Seeder 'icon' => '', 'module' => 'wechat', 'creator_id' => 1, - 'permission_mark' => 'wechatTags@index', + 'permission_mark' => 'tags@index', 'component' => '', 'redirect' => '', 'hidden' => 1, @@ -362,7 +362,7 @@ class WechatMenusSeed extends Seeder 'type' => 2, 'sort' => 1, 'created_at' => 1593304575, - 'updated_at' => 1593589434, + 'updated_at' => 1599376011, 'deleted_at' => 0, ), 1 => @@ -375,7 +375,7 @@ class WechatMenusSeed extends Seeder 'icon' => '', 'module' => 'wechat', 'creator_id' => 1, - 'permission_mark' => 'wechatTags@save', + 'permission_mark' => 'tags@save', 'component' => '', 'redirect' => '', 'hidden' => 1, @@ -383,7 +383,7 @@ class WechatMenusSeed extends Seeder 'type' => 2, 'sort' => 1, 'created_at' => 1593304592, - 'updated_at' => 1593589434, + 'updated_at' => 1599376011, 'deleted_at' => 0, ), 2 => @@ -404,7 +404,7 @@ class WechatMenusSeed extends Seeder 'type' => 2, 'sort' => 1, 'created_at' => 1593304830, - 'updated_at' => 1593589434, + 'updated_at' => 1599376011, 'deleted_at' => 0, ), 3 => @@ -425,7 +425,7 @@ class WechatMenusSeed extends Seeder 'type' => 2, 'sort' => 1, 'created_at' => 1593304837, - 'updated_at' => 1593589434, + 'updated_at' => 1599376011, 'deleted_at' => 0, ), 4 => @@ -446,7 +446,7 @@ class WechatMenusSeed extends Seeder 'type' => 2, 'sort' => 1, 'created_at' => 1593304846, - 'updated_at' => 1593589434, + 'updated_at' => 1599376011, 'deleted_at' => 0, ), 5 => @@ -467,7 +467,7 @@ class WechatMenusSeed extends Seeder 'type' => 2, 'sort' => 1, 'created_at' => 1593304859, - 'updated_at' => 1593589434, + 'updated_at' => 1599376011, 'deleted_at' => 0, ), ), @@ -492,7 +492,7 @@ class WechatMenusSeed extends Seeder 'type' => 1, 'sort' => 1, 'created_at' => 1593227704, - 'updated_at' => 1599289456, + 'updated_at' => 1599371183, 'deleted_at' => 0, 'children' => array ( @@ -621,7 +621,7 @@ class WechatMenusSeed extends Seeder 'type' => 1, 'sort' => 1, 'created_at' => 1593323887, - 'updated_at' => 1599292185, + 'updated_at' => 1599371183, 'deleted_at' => 0, 'children' => array ( diff --git a/extend/catcher/CatchUpload.php b/extend/catcher/CatchUpload.php index c22a0b7..6dac2d0 100644 --- a/extend/catcher/CatchUpload.php +++ b/extend/catcher/CatchUpload.php @@ -45,7 +45,12 @@ class CatchUpload */ protected $path = ''; - /** + public function __construct() + { + $this->initDriver(); + } + + /** * upload files * * @param UploadedFile $file @@ -77,6 +82,13 @@ class CatchUpload throw new FailedException('Upload Failed, Try Again!'); } + /** + * 本地路径 + * + * @time 2020年09月07日 + * @param $path + * @return string + */ protected function getLocalPath($path) { if ($this->getDriver() === self::LOCAL) { @@ -296,6 +308,21 @@ class CatchUpload } } + /** + * 初始化 + * + * @time 2020年09月07日 + * @return $this + */ + protected function initDriver() + { + if ($driver = Utils::config('site.upload')) { + $this->driver = $driver; + } + + return $this; + } + /** * 获取云存储的域名 * diff --git a/extend/catcher/Utils.php b/extend/catcher/Utils.php index 9131e98..84fbd69 100644 --- a/extend/catcher/Utils.php +++ b/extend/catcher/Utils.php @@ -1,6 +1,7 @@ user()->id == config('catch.permissions.super_admin_id'); } + + /** + * 获取配置 + * + * @time 2020年09月07日 + * @param $key + * @return mixed + */ + public static function config($key) + { + return Config::where('key', $key)->value('value'); + } }