修改权限

catch/permissions/model/Permissions.php

@@ -11,9 +11,10 @@ class Permissions extends CatchModel
             'id', // 
 			'permission_name', // 菜单名称
 			'parent_id', // 父级ID
-            'module', // 模块
+      'icon',
+      'module', // 模块
 			'route', // 路由
-            'method', // 请求方法
+      'method', // 请求方法
 			'permission_mark', // 权限标识
 			'type', // 1 菜单 2 按钮
 			'sort', // 排序字段

catch/user/Auth.php

@@ -81,11 +81,9 @@ class Auth
 
         $roles = $user->getRoles();
 
-        foreach ($roles as &$role) {
-            $role['permissions'] = Roles::where('id', $role['id'])->find()->getPermissions([
-                'type' => Permissions::MENU_TYPE
-            ], ['permission_name', 'route']);
-        }
+        $user->permissions = Permissions::whereIn('id', $user->getPermissionsBy())
+                                  ->field(['permission_name as title', 'route', 'icon'])
+                                  ->select();
 
         $user->roles = $roles;
 

catch/user/route.php

@@ -5,3 +5,4 @@ $router->resource('users', '\catchAdmin\user\controller\User');
 $router->put('users/switch/status/<id>', '\catchAdmin\user\controller\User@switchStatus');
 $router->put('users/recover/<id>', '\catchAdmin\user\controller\User@recover');
 $router->get('users/get/roles', '\catchAdmin\user\controller\User@getRoles');
+$router->get('user/info', '\catchAdmin\user\controller\User@info');

composer.lock

@@ -1,7 +1,7 @@
 {
     "_readme": [
         "This file locks the dependencies of your project to a known state",
-        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
+        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
     "content-hash": "867a29731eb9f56d75d75bd32e8a9f37",
@@ -69,16 +69,16 @@
         },
         {
             "name": "league/flysystem",
-            "version": "1.0.57",
+            "version": "1.0.61",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/flysystem.git",
-                "reference": "0e9db7f0b96b9f12dcf6f65bc34b72b1a30ea55a"
+                "reference": "4fb13c01784a6c9f165a351e996871488ca2d8c9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/0e9db7f0b96b9f12dcf6f65bc34b72b1a30ea55a",
-                "reference": "0e9db7f0b96b9f12dcf6f65bc34b72b1a30ea55a",
+                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/4fb13c01784a6c9f165a351e996871488ca2d8c9",
+                "reference": "4fb13c01784a6c9f165a351e996871488ca2d8c9",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -155,7 +155,7 @@
                 "sftp",
                 "storage"
             ],
-            "time": "2019-10-16T21:01:05+00:00"
+            "time": "2019-12-08T21:46:50+00:00"
         },
         {
             "name": "league/flysystem-cached-adapter",
@@ -1039,16 +1039,16 @@
         },
         {
             "name": "symfony/var-dumper",
-            "version": "v4.4.1",
+            "version": "v4.4.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "0a89a1dbbedd9fb2cfb2336556dec8305273c19a"
+                "reference": "be330f919bdb395d1e0c3f2bfb8948512d6bdd99"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/0a89a1dbbedd9fb2cfb2336556dec8305273c19a",
-                "reference": "0a89a1dbbedd9fb2cfb2336556dec8305273c19a",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/be330f919bdb395d1e0c3f2bfb8948512d6bdd99",
+                "reference": "be330f919bdb395d1e0c3f2bfb8948512d6bdd99",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -1117,7 +1117,7 @@
                 "debug",
                 "dump"
             ],
-            "time": "2019-11-28T13:33:56+00:00"
+            "time": "2019-12-18T13:41:29+00:00"
         },
         {
             "name": "topthink/think-trace",