对 CasbinRule Model 增加name属性的配置

php-casbin · Dec 29, 2018 · 2a57a32 · 2a57a32
1 parent 046257f
commit 2a57a32
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/config/casbin.php b/config/casbin.php
@@ -23,7 +23,10 @@
         // 数据库连接名称，不填为默认配置.
         'connection' => '',
 
-        // 策略表名.
-        'casbin_rules_table' => 'casbin_rule',
+        // 策略表名（不含表前缀）
+        'casbin_rules_name' => 'casbin_rule',
+
+        // 策略表完整名称.
+        'casbin_rules_table' => null,
     ],
 ];
diff --git a/database/migrations/20181113071924_casbin_rule.php b/database/migrations/20181113071924_casbin_rule.php
@@ -27,7 +27,7 @@ class CasbinRule extends Migrator
      */
     public function up()
     {
-        $table = $this->table(config('casbin.database.casbin_rules_table'));
+        $table = $this->table(config('casbin.database.casbin_rules_name'));
         $table->addColumn('ptype', 'string', ['null' => true])
             ->addColumn('v0', 'string', ['null' => true])
             ->addColumn('v1', 'string', ['null' => true])
@@ -40,7 +40,7 @@ public function up()
 
     public function down()
     {
-        $table = $this->table(config('casbin.database.casbin_rules_table'));
+        $table = $this->table(config('casbin.database.casbin_rules_name'));
         $table->delete();
     }
 }
diff --git a/src/Models/CasbinRule.php b/src/Models/CasbinRule.php
@@ -8,11 +8,12 @@ class CasbinRule extends Model
 {
     public function __construct($data = [])
     {
-        parent::__construct($data);
-
-        //TODO:初始化内容
         $this->connection = config('casbin.database.connection') ?: '';
 
         $this->table = config('casbin.database.casbin_rules_table');
+
+        $this->name = config('casbin.database.casbin_rules_name');
+
+        parent::__construct($data);
     }
 }