修复几个bug 增加个性化菜单 解耦websocket

api/config/main.php

@@ -50,6 +50,7 @@
                          * http://当前域名/api/site/login?group=1
                          */
                         'site',
+                        'room',
                         'file',
                         /** ------ 业务相关 ------ **/
                         'v1/default',

api/controllers/AController.php

@@ -47,7 +47,9 @@ public function actionIndex()
     public function actionCreate()
     {
         $model = new $this->modelClass();
+        $model->member_id = Yii::$app->user->identity->user_id;
         $model->attributes = Yii::$app->request->post();
+
         if (!$model->save())
         {
             // 返回数据验证失败
@@ -61,7 +63,8 @@ public function actionCreate()
      * 更新
      *
      * @param $id
-     * @return mixed
+     * @return mixed|void
+     * @throws NotFoundHttpException
      */
     public function actionUpdate($id)
     {
@@ -81,17 +84,19 @@ public function actionUpdate($id)
      *
      * @param $id
      * @return mixed
+     * @throws NotFoundHttpException
      */
     public function actionDelete($id)
     {
         return $this->findModel($id)->delete();
     }
 
     /**
-     * 显示单个
+     * 详情
      *
      * @param $id
      * @return mixed
+     * @throws NotFoundHttpException
      */
     public function actionView($id)
     {

api/controllers/MController.php

@@ -0,0 +1,132 @@
+<?php
+namespace api\controllers;
+
+use Yii;
+use yii\data\ActiveDataProvider;
+use yii\web\NotFoundHttpException;
+use common\enums\StatusEnum;
+use common\controllers\ActiveController;
+
+/**
+ * 用户信息基类
+ *
+ * Class MController
+ * @package api\controllers
+ */
+class MController extends ActiveController
+{
+    public function actions()
+    {
+        $actions = parent::actions();
+        // 注销系统自带的实现方法
+        unset($actions['index'], $actions['update'], $actions['create'], $actions['delete'], $actions['view']);
+        // 自定义数据indexDataProvider覆盖IndexAction中的prepareDataProvider()方法
+        // $actions['index']['prepareDataProvider'] = [$this, 'indexDataProvider'];
+        return $actions;
+    }
+
+    /**
+     * 首页
+     *
+     * @return ActiveDataProvider
+     */
+    public function actionIndex()
+    {
+        $modelClass = $this->modelClass;
+        $query = $modelClass::find()
+            ->where(['status' => StatusEnum::ENABLED, 'member_id' => Yii::$app->user->identity->user_id])
+            ->offset($this->_offset)
+            ->limit($this->_limit)
+            ->asArray()
+            ->all();
+
+        return $query;
+    }
+
+    /**
+     * 创建
+     *
+     * @return bool
+     */
+    public function actionCreate()
+    {
+        $model = new $this->modelClass();
+        $model->attributes = Yii::$app->request->post();
+        $model->member_id = Yii::$app->user->identity->user_id;
+        if (!$model->save())
+        {
+            // 返回数据验证失败
+            return $this->setResponse($this->analysisError($model->getFirstErrors()));
+        }
+
+        return $model;
+    }
+
+    /**
+     * 更新
+     *
+     * @param $id
+     * @return mixed
+     */
+    public function actionUpdate($id)
+    {
+        $model = $this->findModel($id);
+        $model->attributes = Yii::$app->request->post();
+        if (!$model->save())
+        {
+            // 返回数据验证失败
+            return $this->setResponse($this->analysisError($model->getFirstErrors()));
+        }
+
+        return $model;
+    }
+
+    /**
+     * 删除
+     *
+     * @param $id
+     * @return mixed
+     */
+    public function actionDelete($id)
+    {
+        $model = $this->findModel($id);
+        $model->status = StatusEnum::DELETE;
+        return $model->save();
+    }
+
+    /**
+     * 显示单个
+     *
+     * @param $id
+     * @return mixed
+     */
+    public function actionView($id)
+    {
+        return $this->findModel($id);
+    }
+
+    /**
+     * 返回模型
+     *
+     * @param $id
+     * @return mixed
+     * @throws NotFoundHttpException
+     */
+    protected function findModel($id)
+    {
+        if (empty($id))
+        {
+            throw new NotFoundHttpException('请求的数据不存在.');
+        }
+
+        $modelClass = $this->modelClass;
+        if ($model = $modelClass::find()->where(['id' => $id, 'status' => StatusEnum::ENABLED, 'member_id' => Yii::$app->user->identity->user_id])->one())
+        {
+            return $model->loadDefaultValues();
+        }
+        else
+        {
+            throw new NotFoundHttpException('请求的数据不存在.');
+        }
+    }
+}

api/controllers/RoomController.php

@@ -0,0 +1,121 @@
+<?php
+namespace api\controllers;
+
+use Yii;
+use yii\data\ActiveDataProvider;
+use yii\web\NotFoundHttpException;
+
+/**
+ * 直播间
+ *
+ * Class RoomController
+ * @package api\controllers
+ */
+class RoomController extends AController
+{
+    public $modelClass = 'common\models\live\Room';
+
+    /**
+     * 首页
+     *
+     * @return ActiveDataProvider
+     */
+    public function actionIndex()
+    {
+        $modelClass = $this->modelClass;
+        $query = $modelClass::find();
+
+        return new ActiveDataProvider([
+            'query' => $query,
+        ]);
+    }
+
+    /**
+     * 创建
+     *
+     * @return bool
+     */
+    public function actionCreate()
+    {
+        $model = new $this->modelClass();
+        $model->member_id = Yii::$app->user->identity->user_id;
+        $model->attributes = Yii::$app->request->post();
+
+        if (!$model->save())
+        {
+            // 返回数据验证失败
+            return $this->setResponse($this->analysisError($model->getFirstErrors()));
+        }
+
+        return $model;
+    }
+
+    /**
+     * 更新
+     *
+     * @param $id
+     * @return mixed|void
+     * @throws NotFoundHttpException
+     */
+    public function actionUpdate($id)
+    {
+        $model = $this->findModel($id);
+        $model->attributes = Yii::$app->request->post();
+        if (!$model->save())
+        {
+            // 返回数据验证失败
+            return $this->setResponse($this->analysisError($model->getFirstErrors()));
+        }
+
+        return $model;
+    }
+
+    /**
+     * 删除
+     *
+     * @param $id
+     * @return mixed
+     * @throws NotFoundHttpException
+     */
+    public function actionDelete($id)
+    {
+        return $this->findModel($id)->delete();
+    }
+
+    /**
+     * 详情
+     *
+     * @param $id
+     * @return mixed
+     * @throws NotFoundHttpException
+     */
+    public function actionView($id)
+    {
+        return $this->findModel($id);
+    }
+
+    /**
+     * 返回模型
+     *
+     * @param $id
+     * @return mixed
+     * @throws NotFoundHttpException
+     */
+    protected function findModel($id)
+    {
+        if (empty($id))
+        {
+            throw new NotFoundHttpException('请求的数据失败.');
+        }
+
+        $modelClass = $this->modelClass;
+        if ($model = $modelClass::findOne($id))
+        {
+            return $model->loadDefaultValues();
+        }
+        else
+        {
+            throw new NotFoundHttpException('请求的数据失败.');
+        }
+    }
+}

api/controllers/SiteController.php

@@ -50,9 +50,10 @@ public function actionLogin($group = 1)
     /**
      * 重置令牌
      *
-     * @param string$refresh_token 重置token
+     * @param $refresh_token
      * @return array
      * @throws NotFoundHttpException
+     * @throws \yii\base\Exception
      */
     public function actionRefresh($refresh_token)
     {

backend/controllers/TestController.php

@@ -142,6 +142,16 @@ public function actionUploadImg()
         ]);
     }
 
+    /**
+     * @return string
+     */
+    public function actionWebsocket()
+    {
+        return $this->render('websocket', [
+
+        ]);
+    }
+
     /**
      * 上传文件测试
      *

backend/controllers/UeditorController.php

@@ -13,7 +13,7 @@
 class UeditorController extends \crazydb\ueditor\UEditorController
 {
     public $config = [
-        //server config @see http://fex-team.github.io/ueditor/#server-config
+        // server config @see http://fex-team.github.io/ueditor/#server-config
         'imagePathFormat' => '/upload/image/{yyyy}/{mm}/{dd}/{time}_{rand:6}',
         'scrawlPathFormat' => '/upload/image/{yyyy}/{mm}/{dd}/{time}_{rand:6}',
         'snapscreenPathFormat' => '/upload/image/{yyyy}/{mm}{dd}/{time}_{rand:6}',

backend/modules/member/controllers/MemberController.php

@@ -58,7 +58,8 @@ public function actionIndex()
     /**
      * 编辑/新增
      *
-     * @return string|\yii\web\Response
+     * @return string|yii\web\Response
+     * @throws yii\base\Exception
      */
     public function actionEdit()
     {
@@ -92,6 +93,9 @@ public function actionEdit()
      *
      * @param $id
      * @return mixed
+     * @throws \Exception
+     * @throws \Throwable
+     * @throws yii\db\StaleObjectException
      */
     public function actionDelete($id)
     {
@@ -131,7 +135,7 @@ public function actionPersonal()
      * 返回模型
      *
      * @param $id
-     * @return Member|static
+     * @return Member|null|static
      */
     protected function findModel($id)
     {
@@ -140,7 +144,7 @@ protected function findModel($id)
             return new Member;
         }
 
-        if (empty(($model = Member::findOne($id))))
+        if (empty($model = Member::findOne($id)))
         {
             return new Member;
         }