Merge pull request #22 from windhoney/develop

命名空间bug修复，路由列表注掉查询应用所有路由部分

Author: windhoney

controllers/GroupsController.php

@@ -3,16 +3,16 @@
  * 用户分组
  */
 
-namespace work\modules\rbac\controllers;
+namespace wind\rest\controllers;
 
-use work\modules\rbac\controllers\base\ApiController;
-use work\modules\rbac\models\AuthGroups;
+use wind\rest\controllers\base\ApiController;
+use wind\rest\models\AuthGroups;
 
 class GroupsController extends ApiController
 {
 
     /**
-     * @var \work\modules\rbac\models\AuthGroups
+     * @var \wind\rest\models\AuthGroups
      */
     public $group_model;
 

controllers/UserController.php

@@ -3,7 +3,6 @@
 namespace wind\rest\controllers;
 
 use yii\helpers\ArrayHelper;
-use work\models\AdminUser;
 use wind\rest\controllers\base\ApiController;
 use Yii;
 use wind\rest\models\form\Login;

models/AuthGroups.php

@@ -1,17 +1,17 @@
 <?php
 
-namespace work\modules\rbac\models;
+namespace wind\rest\models;
 
-use work\modules\rbac\components\DbManager;
-use work\modules\rbac\components\Helper;
+use wind\rest\components\DbManager;
+use wind\rest\components\Helper;
 use Yii;
 
 /**
  * AuthGroups model
  *
  * @property string $group_name
  * @property string $group_id
- * @package work\modules\rbac\models
+ * @package  wind\rest\models
  */
 class AuthGroups extends \yii\db\ActiveRecord
 {
@@ -130,7 +130,7 @@ public function assignUser()
         $assign = $group_child_model->assigned($this->id);
         $user_id_arr = array_filter(array_column($assign, 'id'));
         //all  所有
-        $user_model = new \work\modules\rbac\models\searchs\User();
+        $user_model = new \wind\rest\models\searchs\User();
         $all = $user_model->allUsers(['id', 'realname']);
         foreach ($all as $key => $val) {
             if (in_array($val['id'], $user_id_arr)) {

models/AuthGroupsChild.php

@@ -1,15 +1,15 @@
 <?php
 
-namespace work\modules\rbac\models;
+namespace wind\rest\models;
 
-use work\modules\rbac\components\DbManager;
+use wind\rest\components\DbManager;
 
 /**
  * Class AuthGroups
  *
  * @property string $user_id
  * @property string $group_id
- * @package work\modules\rbac\models
+ * @package  wind\rest\models
  */
 class AuthGroupsChild extends \yii\db\ActiveRecord
 {

models/Route.php

@@ -96,8 +96,7 @@ public function remove($routes)
     public function getRoutes()
     {
         $manager = Yii::$app->getAuthManager();
-        $routes = $this->getAppRoutes();
-//        print_r($routes);die;
+//        $routes = $this->getAppRoutes();
         $exists = [];
         foreach ($manager->getPermissions() as $name) {
             $name = ArrayHelper::toArray($name);
@@ -108,12 +107,12 @@ public function getRoutes()
             $route['description'] = $name['description'];
             $route['parent_name'] = $name['parent_name'];
             $exists[] = $route;
-            unset($routes[$name['name']]);
+//            unset($routes[$name['name']]);
         }
         $exists = ArrayHelper::index($exists, null, 'parent_name');
 
         return [
-            'avaliable' => array_keys($routes),
+//            'avaliable' => array_keys($routes),
             'assigned' => $exists
         ];
     }

rule/BelongShopRule.php

@@ -3,7 +3,7 @@
  * 规则--用户所属店铺
  */
 
-namespace work\modules\rbac\rule;
+namespace  wind\rest\rule;
 
 use yii\rbac\Rule;
 use yii;