diff --git a/app-ht/config/params.php b/app-ht/config/params.php
index a1f383b..5c74be7 100644
--- a/app-ht/config/params.php
+++ b/app-ht/config/params.php
@@ -1,5 +1,5 @@
 <?php
 return [
-    'VERSION' => 'v1.8.6 build 15',
-    'MANUFACTURE_ROLE_ID' => 1
+    'MANUFACTURE_ROLE_ID' => 1,
+    'VERSION'             => 'v1.8.6 build 15',
 ];
\ No newline at end of file
diff --git a/app-ht/modules/datas/config/perm.php b/app-ht/modules/datas/config/perm.php
index d10bcc3..84d5999 100644
--- a/app-ht/modules/datas/config/perm.php
+++ b/app-ht/modules/datas/config/perm.php
@@ -3,7 +3,7 @@
 return [
     'label' => '数据统计',
     'items' => [
-        'shop_city' => [
+        'data-stats' => [
             'label' => '数据统计',
             'items' => [
                 2 => '数据统计',
diff --git a/app-ht/modules/device/controllers/DeviceController.php b/app-ht/modules/device/controllers/DeviceController.php
index d2f96b3..9c0ca66 100644
--- a/app-ht/modules/device/controllers/DeviceController.php
+++ b/app-ht/modules/device/controllers/DeviceController.php
@@ -329,7 +329,17 @@ class DeviceController extends BaseController
         $type = $req->post('type');
         $keyword = $req->post('query');
         $e = new stdClass();
-        $list = CreateBatchRepository::getSerialNoComponent($type, $keyword);
+        $where = [];
+        if ('manufacture' == $type) {
+            $user = Yii::$app->user->identity;
+            if (isset($user->is_manufacture) && $user->is_manufacture == 1) {
+                $where = 'sys_user_id = '.$user->id;
+
+            } else {
+                $where = 'id >0';
+            }
+        }
+        $list = CreateBatchRepository::getSerialNoComponent($type, $where);
         $e->list = $list;
 
         return $this->renderJson($e);
diff --git a/app-ht/modules/home/controllers/BoardController.php b/app-ht/modules/home/controllers/BoardController.php
index 03cf3d9..c1bbe36 100644
--- a/app-ht/modules/home/controllers/BoardController.php
+++ b/app-ht/modules/home/controllers/BoardController.php
@@ -37,179 +37,6 @@ class BoardController extends BaseController
         return $this->render("index", $params);
     }
 
-    // 获取仪表盘信息
-    public function actionGetData()
-    {
-        $act = $this->request->get('pickOrder');
-        $e= new stdClass();
-
-        if (empty($act)) {
-            $e->engineerAuth = $this->getEngineerAuth(EngineerStatus::STATUS_REALNAME_REVIEW);
-            $e->engineerAvaliable  = $this->getEngineerAuth();
-            $e->engineerSkillAuth = $this->getEngineerSkillAuth();
-            $e->deviceReview = $this->getDeviceReview();
-            $e->appeal = $this->getAppeal();
-            $e->errorInvoice = $this->getErrorInvoice();
-            $e->withdraw = $this->getWithdraw();
-        } else {
-            $queryPickOrder = RepairOrderModel::find();
-            $queryPickOrder->where(['status' => RepairOrderStatus::STATUS_WAIT_PICK]);
-            $count = $queryPickOrder->count();
-            if (empty($count)) {
-                $count = 0;
-            }
-            $e->pickOrderCount = $count;
-        }
-
-        return $this->renderJson($e);
-    }
-
-    // 获取订单数据
-    public function actionGetOrderData()
-    {
-        $e = new stdClass();
-        $e->success = true;
-        $end = time();
-        $endT = strtotime(date('Y-m-d')) + 1;
-        $start = $endT - 6 * 24 * 3600;
-        $status = array(
-            RepairOrderStatus::STATUS_FINISH,
-            RepairOrderStatus::STATUS_WAIT_RATE,
-            RepairOrderStatus::STATUS_USER_CANCEL,
-            RepairOrderStatus::STATUS_ENGINEER_CANCEL,
-            RepairOrderStatus::STATUS_USER_CLOSE,
-            RepairOrderStatus::STATUS_ENGINEER_CLOSE
-        );
-
-        $type = 0;
-        $orderListTmp = $this->getOrder($start, $end, $type, $status);
-        $orderList = array();
-        if ($orderListTmp) {
-            foreach ($orderListTmp as $k => $v) {
-                $orderList[$v['mydate']] = $v;
-            }
-        }
-        $dateList = $this->genDate($start);
-        $data =array();
-        foreach ($dateList as $kk => $vv) {
-            $myArr = array();
-            $myArr['date'] = $kk;
-            if ($type == 0) {
-                $myArr['pay_price'] = isset($orderList[$kk]['pay_price']) ? $orderList[$kk]['pay_price'] : 0;
-                $myArr['repair_price'] = isset($orderList[$kk]['repair_price']) ? $orderList[$kk]['repair_price'] : 0;
-            }
-
-            $data[] = $myArr;
-        }
-        $e->data = $data;
-        return $this->renderJson($e);
-    }
-
-    // 热力图
-    public function actionGetHeatData()
-    {
-        $e=  new stdClass();
-        $e->success = true;
-        $north_east= $this->request->get('north_east');
-        $south_west = $this->request->get('south_west');
-        $zoom = $this->request->get('zoom');
-        $distance = 25000; //25公里内的点
-        $earthRadius = Distance::EARTH_RADIUS;
-        $table1 = 'address';
-        $end = time();
-        $endT =strtotime(date('Y-m-d')) + 1;
-        $start = $endT - 6 * 24 * 3600;
-        $status =array(
-            RepairOrderStatus::STATUS_FINISH,
-            RepairOrderStatus::STATUS_WAIT_RATE,
-            RepairOrderStatus::STATUS_USER_CANCEL,
-            RepairOrderStatus::STATUS_ENGINEER_CANCEL,
-            RepairOrderStatus::STATUS_USER_CLOSE,
-            RepairOrderStatus::STATUS_ENGINEER_CLOSE
-        );
-
-        /*
-        $vRadian= "$earthRadius * acos( cos( radians('$lat') ) * cos( radians( $table1.latitude ) ) * cos( radians( $table1.longitude ) - radians('$lng') ) +
-			sin( radians('$lat') ) * sin( radians( $table1.latitude ) ) )";
-        */
-
-        $repairOrderModel = RepairOrderModel::find();
-        $repairOrderModel->leftJoin("address","address.id = repair_order.address_id");
-        $repairOrderModel->select(["concat(address.latitude,'_',address.longitude) as latlng", "count(*) as mycount"]);
-        $repairOrderModel->where(['repair_order.status' => $status]);
-        $repairOrderModel->andFilterWhere(['>', 'repair_order.created_at', $start]);
-        $repairOrderModel->andFilterWhere(['<', 'repair_order.created_at', $end]);
-        
-        $repairOrderModel->andFilterWhere(['<', "address.latitude", $north_east[0]]);
-        $repairOrderModel->andFilterWhere(['>', "address.latitude", $south_west[0]]);
-
-        $repairOrderModel->andFilterWhere(['<', "address.longitude", $north_east[1]]);
-        $repairOrderModel->andFilterWhere(['>', "address.longitude", $south_west[1]]);
-        $repairOrderModel->groupBy('latlng');
-        $repairOrderModel->asArray();
-        $olist = $repairOrderModel->all();
-
-
-        $item = array('max' => 100, 'data' => array());
-        if ($olist) {
-            foreach ($olist as $k => $v) {
-                $latlngTemp = explode('_', $v['latlng']);
-                $item['data'][] = array('lat' => $latlngTemp[0], 'lng' => $latlngTemp[1], 'count' => $v['mycount']);
-            }
-        }
-        $e->item =$item;
-        return $this->renderJson($e);
-    }
-
-    // 获取通知
-    public function actionGetNotice()
-    {
-        $act = $this->request->post('act');
-        if ($act == 'remove') {
-            $id = $this->request->post('id');
-            return $this->removeNotice($id);
-        }
-        $e = new stdClass();
-        $e->success = false;
-
-        $e->count = 0;
-
-        $noticeInfoModel = NoticeInfoModel::find();
-        $noticeInfoModel->where(['status' => NoticeInfoModel::STATUS_UNREAD]);
-
-        $noticeInfoModel->asArray();
-        $count = $noticeInfoModel->count();
-        $noticeInfoModel->limit(6);
-        $nList = $noticeInfoModel->all();
-        $e->msgList = array();
-        if ($nList) {
-            $tt = time();
-            foreach ($nList as $k => $v) {
-                $v['created_date_time'] = date('Y-m-d H:i:s', $v['created_at']);
-                $v['created_time'] = $this->getTime($v['created_at'], $tt);
-                $nList[$k] = $v;
-            }
-            $e->count = $count;
-            $e->msgList = $nList;
-            $e->success = true;
-        }
-
-        return $this->renderJson($e);
-    }
-
-    // 删除
-    protected function removeNotice($id)
-    {
-        $e= new stdClass();
-        $e->success = false;
-        $e->error = 'Fail';
-        $noticeInfo = NoticeInfoModel::findOne($id);
-        if ($noticeInfo && $noticeInfo->delete()) {
-            $e->success = true;
-        }
-
-        return $this->renderJson($e);
-    }
 
     // 判断时间
     protected function getTime($t, $curT)
@@ -241,124 +68,4 @@ class BoardController extends BaseController
         return $dataArr;
     }
 
-    // 贴码设备
-    protected function getDeviceReview()
-    {
-        $bindDeviceModel = BindDeviceApplyModel::find();
-        $wh = array('status' => BindDeviceApplyModel::STATUS_APPLYING);
-        $bindDeviceModel->where($wh);
-        $count = $bindDeviceModel->count();
-
-        $url = Url::toRoute('/device/userdevice/apply?status=0');
-        $returnArr = array(0, $url);
-        if ($count > 0) {
-            $returnArr = array($count, $url);
-        }
-
-        return $returnArr;
-    }
-
-    // 质保申请
-    protected function getAppeal()
-    {
-        $repairOrderAppealModel = RepairOrderAppealModel::find();
-        $wh = array('status' => RepairOrderAppealModel::STATUS_APPEALING);
-        $repairOrderAppealModel->where($wh);
-        $count = $repairOrderAppealModel->count();
-        $url = Url::toRoute('/trade/appeal/index');
-        $returnArr = array(0, $url);
-        if ($count > 0) {
-            $returnArr = array($count, $url);
-        }
-
-        return $returnArr;
-    }
-
-    // 工程师认证
-    protected function getEngineerAuth($status = EngineerStatus::STATUS_SKILL_AUTH)
-    {
-        $engineerModel = EngineerModel::find();
-        $wh = array('status' => $status, 'is_fake_id' => 0);
-        $engineerModel->where($wh);
-        $count = $engineerModel->count();
-        $url = Url::toRoute('/engineer/engineer/index?status=2');
-        $returnArr = array(0, $url);
-        if ($count > 0) {
-            $returnArr = array($count, $url);
-        }
-
-        return $returnArr;
-    }
-
-    // 技能审核,这里不能以人为单位，应该以技能为单位，一个人可以多项技能认证
-    protected function getEngineerSkillAuth()
-    {
-        $engineerSkillModel = EngineerSkillsModel::find();
-        $wh = array('engineer_skills.status' => EngineerSkillsModel::STATUS_REVIEWING);
-        $engineerSkillModel->select(["engineer_skills.engineer_id"]);
-        $engineerSkillModel->distinct();
-        $engineerSkillModel->where($wh);
-
-        $count = $engineerSkillModel->count();
-        $url = Url::toRoute('/engineer/engineer/index?status=6');
-        $returnArr = array(0, $url);
-        if ($count > 0) {
-            $returnArr = array($count, $url);
-        }
-
-        return $returnArr;
-    }
-
-    // 提现审核
-    protected function getWithdraw()
-    {
-        $count = EngineerWithdrawRepository::getReviewingWithdrawCount();
-        $url = Url::toRoute('/engineer/withdraw/index');
-        $returnArr = array(0, $url);
-        if ($count > 0) {
-            $returnArr = array($count, $url);
-        }
-
-        return $returnArr;
-    }
-
-    // 发票出错
-    protected function getErrorInvoice($kplx = InvoiceApi::KPLX_NORMAL)
-    {
-        $invoiceModel = InvoiceModel::find();
-        $wh = array('status' => InvoiceModel::STATUS_ERROR, 'kplx' => $kplx);
-        $invoiceModel->where($wh);
-        $count = $invoiceModel->count();
-        $url = Url::toRoute(['/invoice/invoice/index', 'invoice_status' => InvoiceModel::STATUS_ERROR]);
-        $returnArr = array(0, $url);
-        if ($count > 0) {
-            $returnArr = array($count, $url);
-        }
-
-        return $returnArr;
-    }
-
-    /*  订单数据  */
-    //获取订单数量（当日和七天，已支付，未支付）
-    protected function getOrder($start, $end, $selectType = 0, $status = 0)
-    {
-        $orderModel = RepairOrderModel::find();
-        if ($status != 0) {
-            $orderModel->where(['status' => $status]);
-        }
-
-        if ($selectType == 0) {
-            $orderModel->select(['FROM_UNIXTIME(`created_at`, "%Y-%m-%d") as mydate','sum(pay_price) as pay_price','sum(repair_price) as repair_price']);
-        } else {
-            $orderModel->select(['FROM_UNIXTIME(`created_at`, "%Y-%m-%d") as mydate','count(*) as cc']);
-        }
-
-        $orderModel->andFilterWhere(['>', 'created_at', $start]);
-        $orderModel->andFilterWhere(['<', 'created_at', $end]);
-        $orderModel->groupBy('mydate');
-        $orderModel->asArray();
-        $oList = $orderModel->all();
-
-        return $oList;
-    }
 }
\ No newline at end of file
diff --git a/app-ht/modules/home/views/board/index.php b/app-ht/modules/home/views/board/index.php
index d4cb83b..4e481ba 100644
--- a/app-ht/modules/home/views/board/index.php
+++ b/app-ht/modules/home/views/board/index.php
@@ -61,13 +61,5 @@ $this->params['breadcrumbs'][] = '控制面板';
 
 <script>
 
-    $(function(){
-
-
-
-
-
-
-    })
 
 </script>
diff --git a/app-ht/modules/upgrade/controllers/UpgradeController.php b/app-ht/modules/upgrade/controllers/UpgradeController.php
index 900953d..06c218f 100644
--- a/app-ht/modules/upgrade/controllers/UpgradeController.php
+++ b/app-ht/modules/upgrade/controllers/UpgradeController.php
@@ -76,7 +76,7 @@ class UpgradeController extends BaseController
         }
         $user = Yii::$app->user->identity;
         if (isset($user->is_manufacture) && $user->is_manufacture == 1) {
-            $where[] = ['like', 'mf.sys_user_id', $user->id];
+            $where[] = ['=', 'mf.sys_user_id', $user->id];// ???
         }
         if ($type == 0) {
             $pageList = UpgradeRepository::getPageList($where, 0 , 0);
diff --git a/app-ht/views/layouts/_main-header.php b/app-ht/views/layouts/_main-header.php
index e9cbd08..2a00449 100644
--- a/app-ht/views/layouts/_main-header.php
+++ b/app-ht/views/layouts/_main-header.php
@@ -13,10 +13,10 @@ use yii\helpers\Url;
         <div class="navbar-custom-menu">
             <ul class="nav navbar-nav">
                 <li>
-                    <a href="<?= Url::toRoute(['/my']) ?>">我的账号</a>
+                    <a href="javascript:window.location.href='#/my/default/my-index';window.location.reload()" >我的账号</a>
                 </li>
                 <li>
-                    <a href="<?= Url::toRoute(['/my/default/password']) ?>">修改密码</a>
+                    <a href="javascript:window.location.href='#/my/default/password';window.location.reload()">修改密码</a>
                 </li>
                 <li class="dropdown user user-menu">
                     <a href="javascript:;" class="dropdown-toggle" data-toggle="dropdown">
diff --git a/domain/device/CreateBatchRepository.php b/domain/device/CreateBatchRepository.php
index ad1a1ac..3215c85 100644
--- a/domain/device/CreateBatchRepository.php
+++ b/domain/device/CreateBatchRepository.php
@@ -27,16 +27,16 @@ class CreateBatchRepository
 
     /**
      * @param $type
-     * @param $keyword
+     * @param $where
      * @return array
      */
-    static function getSerialNoComponent($type, $keyword)
+    static function getSerialNoComponent($type, $where)
     {
         if ('manufacture' == $type) {
             $q = new Query();
             $q->select(['concat(id, "_", manufacture_no) as uid', 'id','manufacture_no', 'name']);
             $q->from('manufacture');
-            $q->where('id >0');
+            $q->where($where);
 
             $list = $q->all();
 
@@ -45,7 +45,7 @@ class CreateBatchRepository
             $q = new Query();
             $q->select(['concat(id,"_", project_no) as uid', 'id','project_no', 'name']);
             $q->from('project');
-            $q->where('id >0');
+            $q->where('id >0 and is_delete = 0');
 
             $list = $q->all();
 
@@ -54,7 +54,7 @@ class CreateBatchRepository
             $q = new Query();
             $q->select(['concat(id,"_", model_no) as uid','id','model_no', 'name']);
             $q->from('model');
-            $q->where('id >0');
+            $q->where('id >0 and is_delete = 0');
             $list = $q->all();
 
             return $list;
@@ -62,7 +62,7 @@ class CreateBatchRepository
             $q = new Query();
             $q->select(['concat(id,"_", production_no) as uid','id','production_no', 'name']);
             $q->from('production');
-            $q->where('id >0');
+            $q->where('id >0 and is_delete = 0');
             $list = $q->all();
 
             return $list;
diff --git a/domain/system/AuthPerm.php b/domain/system/AuthPerm.php
new file mode 100644
index 0000000..5c428f8
--- /dev/null
+++ b/domain/system/AuthPerm.php
@@ -0,0 +1,119 @@
+<?php
+namespace domain\system;
+
+use Yii;
+use domain\system\models\AuthPerm  as AuthPermModel;
+use domain\system\models\AuthPermsRoutes as AuthPermsRoutesModel;
+
+
+class AuthPerm
+{
+    const LEVEL_MODULE      = 1; //
+    const LEVEL_CONTROLLER  = 2; //
+    const LEVEL_ACTION      = 3; //
+
+    /**
+     * @param $item
+     * @return null|object
+     * @throws \yii\base\InvalidConfigException
+     */
+    static function create($item)
+    {
+        if (empty($item)) {
+            return null;
+        }
+        $arr = [
+            'class'     => AuthPermModel::className(),
+            'name'      => $item['name'],
+            'parent_id' => $item['parent_id'],
+            'level'     => $item['level'],
+            'desc'      => $item['desc'],
+        ];
+
+        $model = Yii::createObject($arr);
+        $model->save();
+
+        return $model;
+    }
+
+    /**
+     * @param $condition
+     * @return bool|int
+     */
+    static function deleteAll($condition)
+    {
+        if (empty($condition)) {
+            return false;
+        }
+
+        return AuthPermModel::deleteAll($condition);
+    }
+
+    /**
+     * @param $item
+     * @param $routers
+     * @return array|null
+     * @throws \yii\base\InvalidConfigException
+     */
+    static function createWithRouters($item, $routers)
+    {
+        if (empty($item) || empty($routers)) {
+            return null;
+        }
+        $arr = [
+            'class'     => AuthPermModel::className(),
+            'name'      => $item['name'],
+            'parent_id' => $item['parent_id'],
+            'level'     => $item['level'],
+            'desc'      => $item['desc'],
+        ];
+
+        $model = Yii::createObject($arr);
+        $routerArr = [];
+        if ($model->save()) {
+            foreach ($routers as $k => $v) {
+                $tmpArr = [
+                    'class'     => AuthPermsRoutesModel::className(),
+                    'perm_id'   => $model->perm_id,
+                    'route'     => $v,
+                ];
+                $routerModel = Yii::createObject($tmpArr);
+                $routerModel->save();
+                $routerArr[] = $routerModel;
+            }
+            return [$model, $routerArr];
+        }
+
+        return null;
+    }
+
+    /**
+     * @param $permId
+     * @param $router
+     * @return bool|object
+     * @throws \yii\base\InvalidConfigException
+     */
+    static function createRouter($permId, $router)
+    {
+        if (empty($permId) || empty($router)) {
+            return false;
+        }
+        $modelArr = [
+            'class'     => AuthPermsRoutesModel::className(),
+            'perm_id'   => $permId,
+            'route'     => $router,
+        ];
+        $routerModel = Yii::createObject($modelArr);
+        $routerModel->save();
+        return $routerModel;
+    }
+
+    /**
+     * @param $permId
+     * @return int
+     */
+    static function deletePermRouters($permId)
+    {
+        return AuthPermsRoutesModel::deleteAll(['perm_id' => $permId]);
+    }
+}
diff --git a/domain/system/AuthPermRepository.php b/domain/system/AuthPermRepository.php
new file mode 100644
index 0000000..d8276ac
--- /dev/null
+++ b/domain/system/AuthPermRepository.php
@@ -0,0 +1,148 @@
+<?php
+namespace domain\system;
+
+use Yii;
+use domain\system\models\AuthPerm  as AuthPermModel;
+use domain\system\models\AuthPermsRoutes as AuthPermsRoutesModel;
+
+use function count;
+use function explode;
+use function implode;
+
+class AuthPermRepository
+{
+    /**
+     * @param $condition
+     * @return null|static[]
+     */
+    static function findAll($condition)
+    {
+        if (empty($condition)) {
+            return null;
+        }
+        return AuthPermModel::findAll($condition);
+    }
+
+    /**
+     * @param $condition
+     * @return array|\yii\db\ActiveRecord[]
+     */
+    static function getAllItems($condition, $limit = null)
+    {
+        if (empty($condition)) {
+            return null;
+        }
+        $findModel = AuthPermModel::find();
+        $findModel->where($condition);
+        if ($limit) {
+            $findModel->limit($limit);
+        }
+        $rows = $findModel->all();
+        return $rows;
+    }
+
+    /**
+     * @param $condition
+     * @return null|static
+     */
+    static function findOne($condition)
+    {
+        if (empty($condition)) {
+            return null;
+        }
+
+        return AuthPermModel::findOne($condition);
+    }
+
+    /**
+     * 根据扫描的route 返回他对应的级别
+     * @param $route
+     * @return int
+     */
+    static function routeLevel($route)
+    {
+        $items = explode('/',$route);
+        $len = count($items);
+
+        if (2 == $len) {
+            if ('*' == $items[1]) {
+                return AuthPerm::LEVEL_MODULE;
+            } else {
+                return 0;
+            }
+        } else if(3 == $len){
+            if ('*' == $items[2]) {
+                return AuthPerm::LEVEL_CONTROLLER;
+            } else {
+                return AuthPerm::LEVEL_ACTION;
+            }
+        }
+    }
+
+    /**
+     * @param $where
+     * @param $asArr
+     * @return array|\yii\db\ActiveRecord[]
+     */
+    static function getPermsRouters($where, $asArr = false)
+    {
+        $routersModel = AuthPermsRoutesModel::find();
+        $routersModel->where($where);
+        if ($asArr) {
+            $routersModel->asArray();
+        }
+        $return = $routersModel->all();
+
+        return $return;
+    }
+
+    /**
+     * @param $confirmRouters
+     * @return array
+     */
+    static function getGroupPermsRouters($confirmRouters)
+    {
+        $routers = $confirmRouters;
+        $modulesArr = [];
+        $controllerArr = [];
+        $actionArr = [];
+        $groupRouter = [];
+
+        $permModel = AuthPermModel::find();
+        $permModel->where('perm_id >0');
+        $permModel->asArray();
+        $confirmPerms = $permModel->all();
+
+        foreach ($routers as $rk => $rv) {
+            $groupRouter[$rv['perm_id']][] = $rv['route'];
+        }
+
+        foreach ($confirmPerms as $k => $v) {
+            if (AuthPerm::LEVEL_MODULE == $v['level']) {
+                $modulesArr[$v['perm_id']] = ['id' => $v['perm_id'], 'label' => $v['name'],'items' => [],'routes' => '', 'parent_id' => $v['parent_id']];
+            } else if (AuthPerm::LEVEL_CONTROLLER == $v['level']) {
+                $controllerArr[$v['perm_id']] = ['id' => $v['perm_id'], 'label' => $v['name'],'items' => [],'routes' => '', 'parent_id' => $v['parent_id']];
+            } else if (AuthPerm::LEVEL_ACTION == $v['level']) {
+                $myRouters = isset($groupRouter[$v['perm_id']])? implode(',', $groupRouter[$v['perm_id']]): '';
+                $actionArr[$v['perm_id']] = ['id' => $v['perm_id'], 'label' => $v['name'], 'items' => [], 'routes' => $myRouters, 'parent_id' => $v['parent_id']];
+            }
+        }
+
+        foreach ($actionArr as $ak => $av) {
+            if (isset($controllerArr[$av['parent_id']])) {
+                $controllerArr[$av['parent_id']]['items'][] = $av;
+            }
+
+        }
+
+        foreach ($controllerArr as $ck => $cv) {
+            if (isset($modulesArr[$cv['parent_id']])) {
+                $modulesArr[$cv['parent_id']]['items'][] = $cv;
+            }
+        }
+
+        return $modulesArr;
+
+    }
+
+}
diff --git a/domain/system/Route.php b/domain/system/Route.php
new file mode 100644
index 0000000..9d08e01
--- /dev/null
+++ b/domain/system/Route.php
@@ -0,0 +1,307 @@
+<?php
+namespace domain\system;
+
+use Yii;
+use yii\base\Object;
+use yii\caching\TagDependency;
+use yii\helpers\VarDumper;
+use yii\helpers\ArrayHelper;
+use yii\web\Application;
+use Exception;
+
+
+class Route extends Object
+{
+    const CACHE_TAG = 'jiwork.admin.route';
+
+    const PREFIX_ADVANCED = '@';
+    const PREFIX_BASIC = '/';
+
+    private $_routePrefix;
+
+
+    /**
+     * Returns route prefix depending on the configuration.
+     * @return string Route prefix
+     */
+    public function getRoutePrefix()
+    {
+        if (!$this->_routePrefix) {
+            $this->_routePrefix =  self::PREFIX_BASIC;
+        }
+        return $this->_routePrefix;
+    }
+
+    /**
+     * Returns the correct permission name depending on the configuration.
+     * @param  string $route Route
+     * @return string        Permission name
+     */
+    public function getPermissionName($route)
+    {
+        if (self::PREFIX_BASIC == $this->routePrefix) {
+            return self::PREFIX_BASIC . trim($route, self::PREFIX_BASIC);
+        } else {
+            return self::PREFIX_ADVANCED . ltrim(trim($route, self::PREFIX_BASIC), self::PREFIX_ADVANCED);
+        }
+    }
+
+    /**
+     * Get available and assigned routes
+     * @return array
+     */
+    public function getRoutes()
+    {
+        //$manager = Configs::authManager();
+        // Get advanced configuration
+        //$advanced = Configs::instance()->advanced;
+        $advanced = null;
+        if ($advanced) {
+            // Use advanced route scheme.
+            // Set advanced route prefix.
+            $this->_routePrefix = self::PREFIX_ADVANCED;
+            // Create empty routes array.
+            $routes = [];
+            // Save original app.
+            $yiiApp = Yii::$app;
+            // Step through each configured application
+            foreach ($advanced as $id => $configPaths) {
+                // Force correct id string.
+                $id = $this->routePrefix . ltrim(trim($id), $this->routePrefix);
+                // Create empty config array.
+                $config = [];
+                // Assemble configuration for current app.
+                foreach ($configPaths as $configPath) {
+                    // Merge every new configuration with the old config array.
+                    $config = ArrayHelper::merge($config, require (Yii::getAlias($configPath)));
+                }
+                // Create new app using the config array.
+                unset($config['bootstrap']);
+                $app = new Application($config);
+                // Get all the routes of the newly created app.
+                $r = $this->getAppRoutes($app);
+                // Dump new app
+                unset($app);
+                // Prepend the app id to all routes.
+                foreach ($r as $route) {
+                    $routes[$id . $route] = $id . $route;
+                }
+            }
+            // Switch back to original app.
+            Yii::$app = $yiiApp;
+            unset($yiiApp);
+        } else {
+            // Use basic route scheme.
+            // Set basic route prefix
+            $this->_routePrefix = self::PREFIX_BASIC;
+            // Get basic app routes.
+            $routes = $this->getAppRoutes();
+        }
+        $exists = [];
+        /*
+        foreach (array_keys($manager->getPermissions()) as $name) {
+            if ($name[0] !== $this->routePrefix) {
+                continue;
+            }
+            $exists[] = $name;
+            unset($routes[$name]);
+        }*/
+        return [
+            'available' => array_keys($routes),
+            'assigned' => $exists,
+        ];
+    }
+
+    /**
+     * Get list of application routes
+     * @return array
+     */
+    public function getAppRoutes($module = null)
+    {
+        if ($module === null) {
+            $module = Yii::$app;
+        } elseif (is_string($module)) {
+            $module = Yii::$app->getModule($module);
+        }
+        $key = [__METHOD__, Yii::$app->id, $module->getUniqueId()];
+
+        $cache = Yii::$app->cache;
+        if ($cache === null || ($result = $cache->get($key)) === false) {
+            $result = [];
+            $this->getRouteRecursive($module, $result);
+            if ($cache !== null) {
+                $cache->set($key, $result, $cache->cacheDuration, new TagDependency([
+                    'tags' => self::CACHE_TAG,
+                ]));
+
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * 后台路由
+     * @param null $module
+     * @return array|mixed
+     */
+    public function getHtAppRoutes($module = null)
+    {
+        if ($module === null) {
+            $module = Yii::$app;
+        } elseif (is_string($module)) {
+            $module = Yii::$app->getModule($module);
+        }
+
+        $result = [];
+        $this->getRouteRecursive($module, $result);
+        $result = $this->ltrimRouter($result);
+
+        return $result;
+    }
+
+    /**
+     * delete router left /
+     * @param $routers
+     * @return array
+     */
+    public function ltrimRouter($routers)
+    {
+        $returnRouters = [];
+        foreach ($routers as $k => $v) {
+            $returnRouters[] = ltrim($v, '/');
+        }
+
+        return $returnRouters;
+    }
+
+    /**
+     * Get route(s) recursive
+     * @param \yii\base\Module $module
+     * @param array $result
+     */
+    protected function getRouteRecursive($module, &$result)
+    {
+        $token = "Get Route of '" . get_class($module) . "' with id '" . $module->uniqueId . "'";
+        Yii::beginProfile($token, __METHOD__);
+        try {
+            foreach ($module->getModules() as $id => $child) {
+                if (($child = $module->getModule($id)) !== null) {
+                    $this->getRouteRecursive($child, $result);
+                }
+            }
+
+            foreach ($module->controllerMap as $id => $type) {
+                $this->getControllerActions($type, $id, $module, $result);
+            }
+
+            $namespace = trim($module->controllerNamespace, '\\') . '\\';
+            $this->getControllerFiles($module, $namespace, '', $result);
+            $all = '/' . ltrim($module->uniqueId . '/*', '/');
+            $result[$all] = $all;
+        } catch (Exception $exc) {
+            Yii::error($exc->getMessage(), __METHOD__);
+        }
+        Yii::endProfile($token, __METHOD__);
+    }
+
+    /**
+     * Get list controller under module
+     * @param \yii\base\Module $module
+     * @param string $namespace
+     * @param string $prefix
+     * @param mixed $result
+     * @return mixed
+     */
+    protected function getControllerFiles($module, $namespace, $prefix, &$result)
+    {
+        $path = Yii::getAlias('@' . str_replace('\\', '/', $namespace), false);
+        $token = "Get controllers from '$path'";
+        Yii::beginProfile($token, __METHOD__);
+        try {
+            if (!is_dir($path)) {
+                return;
+            }
+            foreach (scandir($path) as $file) {
+                if ($file == '.' || $file == '..') {
+                    continue;
+                }
+                if (is_dir($path . '/' . $file) && preg_match('%^[a-z0-9_/]+$%i', $file . '/')) {
+                    $this->getControllerFiles($module, $namespace . $file . '\\', $prefix . $file . '/', $result);
+                } elseif (strcmp(substr($file, -14), 'Controller.php') === 0) {
+                    $baseName = substr(basename($file), 0, -14);
+                    $name = strtolower(preg_replace('/(?<![A-Z])[A-Z]/', ' \0', $baseName));
+                    $id = ltrim(str_replace(' ', '-', $name), '-');
+                    $className = $namespace . $baseName . 'Controller';
+                    if (strpos($className, '-') === false && class_exists($className) && is_subclass_of($className, 'yii\base\Controller')) {
+                        $this->getControllerActions($className, $prefix . $id, $module, $result);
+                    }
+                }
+            }
+        } catch (Exception $exc) {
+            Yii::error($exc->getMessage(), __METHOD__);
+        }
+        Yii::endProfile($token, __METHOD__);
+    }
+
+    /**
+     * Get list action of controller
+     * @param mixed $type
+     * @param string $id
+     * @param \yii\base\Module $module
+     * @param string $result
+     */
+    protected function getControllerActions($type, $id, $module, &$result)
+    {
+        $token = "Create controller with cofig=" . VarDumper::dumpAsString($type) . " and id='$id'";
+        Yii::beginProfile($token, __METHOD__);
+        try {
+            /* @var $controller \yii\base\Controller */
+            $controller = Yii::createObject($type, [$id, $module]);
+            $this->getActionRoutes($controller, $result);
+            $all = "/{$controller->uniqueId}/*";
+            $result[$all] = $all;
+        } catch (Exception $exc) {
+            Yii::error($exc->getMessage(), __METHOD__);
+        }
+        Yii::endProfile($token, __METHOD__);
+    }
+
+    /**
+     * Get route of action
+     * @param \yii\base\Controller $controller
+     * @param array $result all controller action.
+     */
+    protected function getActionRoutes($controller, &$result)
+    {
+        $token = "Get actions of controller '" . $controller->uniqueId . "'";
+        Yii::beginProfile($token, __METHOD__);
+        try {
+            $prefix = '/' . $controller->uniqueId . '/';
+            foreach ($controller->actions() as $id => $value) {
+                $result[$prefix . $id] = $prefix . $id;
+            }
+            $class = new \ReflectionClass($controller);
+            foreach ($class->getMethods() as $method) {
+                $name = $method->getName();
+                if ($method->isPublic() && !$method->isStatic() && strpos($name, 'action') === 0 && $name !== 'actions') {
+                    $name = strtolower(preg_replace('/(?<![A-Z])[A-Z]/', ' \0', substr($name, 6)));
+                    $id = $prefix . ltrim(str_replace(' ', '-', $name), '-');
+                    $result[$id] = $id;
+                }
+            }
+        } catch (Exception $exc) {
+            Yii::error($exc->getMessage(), __METHOD__);
+        }
+        Yii::endProfile($token, __METHOD__);
+    }
+
+    /**
+     * Ivalidate cache
+     */
+    public static function invalidate()
+    {
+
+    }
+
+}
diff --git a/domain/system/models/AuthPerm.php b/domain/system/models/AuthPerm.php
new file mode 100644
index 0000000..0c74031
--- /dev/null
+++ b/domain/system/models/AuthPerm.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace domain\system\models;
+
+use yii\db\ActiveRecord;
+use yii\behaviors\TimestampBehavior;
+
+/**
+ * 路由权限
+ * This is the model class for table "{{%auth_perm.}}".
+ */
+class AuthPerm extends ActiveRecord
+{
+    /**
+     * @inheritdoc
+     */
+    public static function tableName()
+    {
+        return '{{%auth_perm}}';
+    }
+
+    /**
+     * @return array
+     */
+    public function behaviors()
+    {
+        return [
+            'time' => [
+                'class' => TimestampBehavior::className(),
+                'createdAtAttribute' => 'created_at',
+                'updatedAtAttribute' => 'updated_at',
+            ]
+        ];
+    }
+}
\ No newline at end of file
diff --git a/domain/system/models/AuthPermsRoutes.php b/domain/system/models/AuthPermsRoutes.php
new file mode 100644
index 0000000..4491e2c
--- /dev/null
+++ b/domain/system/models/AuthPermsRoutes.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace domain\system\models;
+
+use yii\db\ActiveRecord;
+
+/**
+ * 路由权限
+ * This is the model class for table "{{%auth_perms_routes.}}".
+ */
+class AuthPermsRoutes extends ActiveRecord
+{
+    /**
+     * @inheritdoc
+     */
+    public static function tableName()
+    {
+        return '{{%auth_perms_routes}}';
+    }
+
+}
\ No newline at end of file
--
libgit2 0.21.0