修改命名空间

Author: Tinywan

composer.json

@@ -1,6 +1,6 @@
 {
-  "name": "tinywan/casbin",
-  "description": "Webman Casbin Plugin",
+  "name": "casbin/webman-permission",
+  "description": "webman casbin permission Plugin",
   "type": "library",
   "license": "MIT",
   "require": {
@@ -12,23 +12,17 @@
   },
   "autoload": {
     "psr-4": {
-      "Tinywan\\Casbin\\": "src"
+      "Casbin\\WebmanPermission\\": "src"
     }
   },
   "autoload-dev": {
     "psr-4": {
-      "Tinywan\\Tests\\": "tests/"
+      "Casbin\\WebmanPermission\\Tests\\": "tests/"
     }
   },
   "require-dev": {
     "phpunit/phpunit": "~7.0|~8.0|~9.0",
     "php-coveralls/php-coveralls": "^2.1",
     "workerman/webman": "^1.0"
-  },
-  "repositories": {
-    "packagist": {
-      "type": "composer",
-      "url": "https://mirrors.aliyun.com/composer//"
-    }
   }
 }

src/Adapter/DatabaseAdapter.php

@@ -8,7 +8,7 @@
 
 declare(strict_types=1);
 
-namespace Tinywan\Casbin\Adapter;
+namespace Casbin\WebmanPermission\Adapter;
 
 use Casbin\Model\Model;
 use Casbin\Persist\Adapter;
@@ -19,7 +19,7 @@
 use Casbin\Persist\Adapters\Filter;
 use Casbin\Exceptions\InvalidFilterTypeException;
 use think\facade\Db;
-use Tinywan\Casbin\Model\RuleModel;
+use Casbin\WebmanPermission\Model\RuleModel;
 
 /**
  * DatabaseAdapter.

src/Install.php

@@ -1,5 +1,5 @@
 <?php
-namespace Tinywan\Casbin;
+namespace Casbin\WebmanPermission;
 
 class Install
 {
@@ -8,7 +8,9 @@ class Install
     /**
      * @var array
      */
-    protected static $pathRelation = array ('config/plugin/tinywan/casbin' => 'config/plugin/tinywan/casbin');
+    protected static $pathRelation = array (
+    'config/plugin/casbin/webman-permission' => 'config/plugin/casbin/webman-permission',
+    );
 
     /**
      * Install
@@ -43,6 +45,8 @@ public static function installByRelation()
             }
             //symlink(__DIR__ . "/$source", base_path()."/$dest");
             copy_dir(__DIR__ . "/$source", base_path()."/$dest");
+            echo "Create $dest
+";
         }
     }
 
@@ -57,9 +61,12 @@ public static function uninstallByRelation()
             if (!is_dir($path) && !is_file($path)) {
                 continue;
             }
-            /*if (is_link($path) {
+            echo "Remove $dest
+";
+            if (is_file($path) || is_link($path)) {
                 unlink($path);
-            }*/
+                continue;
+            }
             remove_dir($path);
         }
     }

src/Model/RuleModel.php

@@ -8,7 +8,7 @@
 
 declare(strict_types=1);
 
-namespace Tinywan\Casbin\Model;
+namespace Casbin\WebmanPermission\Model;
 
 use think\Model;
 use think\contract\Arrayable;

src/Permission.php

@@ -7,20 +7,20 @@
 
 declare(strict_types=1);
 
-namespace Tinywan\Casbin;
+namespace Casbin\WebmanPermission;
 
 
 use Casbin\Enforcer;
 use Casbin\Exceptions\CasbinException;
 use Casbin\Model\Model;
 use support\Container;
-use Tinywan\Casbin\Watcher\RedisWatcher;
+use Casbin\WebmanPermission\Watcher\RedisWatcher;
 use Workerman\Worker;
 use Webman\Bootstrap;
 
 /**
  * @see \Casbin\Enforcer
- * @mixin \Casbin\Enforcer
+ * @mixin Enforcer
  * @method static enforce(mixed ...$rvals) 权限检查，输入参数通常是(sub, obj, act)
  * @method static bool addPolicy(mixed ...$params) 当前策略添加授权规则
  * @method static bool addPolicies(mixed ...$params) 当前策略添加授权规则
@@ -61,15 +61,15 @@ class Permission implements Bootstrap
     public static function start($worker)
     {
         if ($worker) {
-            $configType = config('plugin.tinywan.casbin.permission.basic.model.config_type');
+            $configType = config('plugin.casbin.webman-permission.permission.basic.model.config_type');
             $model = new Model();
             if ('file' == $configType) {
-                $model->loadModel(config('plugin.tinywan.casbin.permission.basic.model.config_file_path'));
+                $model->loadModel(config('plugin.casbin.webman-permission.permission.basic.model.config_file_path'));
             } elseif ('text' == $configType) {
-                $model->loadModel(config('plugin.tinywan.casbin.permission.basic.model.config_text'));
+                $model->loadModel(config('plugin.casbin.webman-permission.permission.basic.model.config_text'));
             }
             if (is_null(static::$_manager)) {
-                static::$_manager = new Enforcer($model, Container::get(config('plugin.tinywan.casbin.permission.basic.adapter')),false);
+                static::$_manager = new Enforcer($model, Container::get(config('plugin.casbin.webman-permission.permission.basic.adapter')),false);
             }
 
             $watcher = new RedisWatcher(config('redis.default'));

src/Watcher/RedisWatcher.php

@@ -7,7 +7,7 @@
 
 declare(strict_types=1);
 
-namespace Tinywan\Casbin\Watcher;
+namespace Casbin\WebmanPermission\Watcher;
 
 
 use Casbin\Persist\Watcher;

src/config/plugin/tinywan/casbin/app.php renamed to src/config/plugin/casbin/webman-permission/app.php

@@ -0,0 +1,4 @@
+<?php
+return [
+    Casbin\WebmanPermission\Permission::class
+];

src/config/plugin/casbin/webman-permission/bootstrap.php

@@ -14,7 +14,7 @@
             'config_text' => '',
         ],
         # 适配器
-        'adapter' => \Tinywan\Casbin\Adapter\DatabaseAdapter::class,
+        'adapter' => Casbin\WebmanPermission\Adapter\DatabaseAdapter::class,
         'database' => [
             'connection' => '',
             'rules_table' => 'casbin_rule',