update

Author: edenleung

src/Contract/Role.php

@@ -11,8 +11,8 @@ public function users():belongsToMany;
 
     public function permissions();
 
-    public function findById(int $id);
+    public function getById(int $id);
 
-    public function findByName(string $name);
+    public function getByName(string $name);
 
 }

src/Contract/User.php

@@ -19,13 +19,13 @@ public function roles():BelongsToMany;
      * @param integer $id
      * @return void
      */
-    public function findById(int $id);
+    public function getById(int $id);
 
     /**
      * 通过name获取详情
      *
      * @param string $name
      * @return void
      */
-    public function findByName(string $name);
+    public function getByName(string $name);
 }

src/Exceptions/PermissionAlreadyExists.php

@@ -1,5 +1,6 @@
 <?php
 namespace xiaodi\Permission\Exceptions;
+
 use InvalidArgumentException;
 
 class PermissionAlreadyExists extends InvalidArgumentException

src/Exceptions/UnauthorizedException.php

@@ -0,0 +1,12 @@
+<?php
+namespace xiaodi\Permission\Exceptions;
+
+use InvalidArgumentException;
+
+class UnauthorizedException extends InvalidArgumentException
+{
+    public static function create(string $permissionName)
+    {
+        return new static("访问出错，你没有此 `{$permissionName}` 权限.");
+    }
+}

src/Middlewares/Auth.php

@@ -0,0 +1,32 @@
+<?php
+namespace xiaodi\Permission\Middlewares;
+
+use xiaodi\Permission\Exceptions\UnauthorizedException;
+
+/**
+ * 权限验证中间件(验证规则专用)
+ * 
+ */
+class Permission
+{
+    /**
+     * 入口
+     *
+     * @param [type] $request
+     * @param \Closure $next
+     * @param [type] $permissions 验证的规则
+     * @return void
+     */
+    public function handle($request, \Closure $next, $permissions)
+    {
+        $permissions = is_array($permissions) ? $permissions : \explode('|', $permissions);
+
+        foreach ($permissions as $permission) {
+            if (app('Permission')->user()->can($permission)) {
+                return $next($request);
+            }
+        }
+
+        throw UnauthorizedException::create($permission);
+    }
+}

src/Middlewares/Permission.php

@@ -0,0 +1,9 @@
+<?php
+namespace xiaodi\Permission\Models;
+
+use think\Model;
+
+class HasPermissionAccess extends Model
+{
+    protected $table = 'auth_has_permission';
+}

src/Models/HasPermissionAccess.php

@@ -22,7 +22,7 @@ public function __construct($data = [])
 
         parent::__construct($data);
     }
-
+    
     /**
      * 获取具有此权限的角色
      *
@@ -93,5 +93,6 @@ public function getById(int $id)
 
     public function getByName(string $name)
     {
+        return $this->get(['name' => $name]);
     }
 }

src/Models/Permission.php

@@ -29,6 +29,44 @@ public function __construct($data = [])
         parent::__construct($data);
     }
 
+    public function access():BelongsToMany
+    {
+        $permissions = $this->belongsToMany(
+            config('permission.models.permission'),
+            config('permission.tables.role_permission_access'),
+            'permission_id',
+            'role_id'
+        );
+
+        return $permissions;
+    }
+
+    /**
+     * 获取(用户直接，角色)分配的权限
+     *
+     * @return void
+     */
+    public function permissions()
+    {
+        return $this->morphMany(
+            config('permission.models.has_permission'),
+            'model'
+        );
+    }
+
+    /**
+     * 删除角色所有权限
+     *
+     * @return void
+     */
+    public function revokeAllPermission()
+    {
+        $this->permissions()->where('model_id', $this->id)->delete();
+        $this->access()->detach(
+            $this->access()->column('permission_id')
+        );
+    }
+
     public function revokePermissionTo(string $name)
     {
         $this->permissions()->where('content', 'in', $name)->delete();
@@ -40,7 +78,7 @@ public function revokePermissionTo(string $name)
      * @param integer $id
      * @return void
      */
-    public function findById(int $id)
+    public function getById(int $id)
     {
         $res = $this->get($id);
         return $res;
@@ -52,7 +90,7 @@ public function findById(int $id)
      * @param string $name
      * @return void
      */
-    public function findByName(string $name)
+    public function getByName(string $name)
     {
         $res = $this->get([
             'name' => $name

src/Models/Role.php

@@ -45,14 +45,14 @@ public function assignRole($roles)
         }
     }
 
-    public function findById(int $id)
+    public function getById(int $id)
     {
         $user = $this->get($id);
 
         return $user;
     }
 
-    public function findByName(string $name)
+    public function getByName(string $name)
     {
         $user = $this->get([
             'name' => $name