gx

Your Name
app/Http/Controllers/Bside/BaseController.php
app/Http/Controllers/Bside/ComController.php
app/Http/Controllers/Bside/ProjectRoleController.php
app/Http/Logic/Bside/UserLogic.php
routes/bside.php
--- a/app/Http/Controllers/Bside/BaseController.php
查看文件 @92cd046
+++ b/app/Http/Controllers/Bside/BaseController.php
查看文件 @92cd046
@@ -46,6 +46,8 @@ class BaseController extends Controller
         if(!empty($info)){
             $this->user = $info;
             $this->uid = $info['id'];
+        }else{
+            $this->response('当前用户未登录',Code::USER_ERROR);
         }
     }
@@ -132,7 +134,23 @@ class BaseController extends Controller
     }
-
+    /**
+     * 菜单权限->得到子级数组
+     * @param int
+     * @return array
+     */
+    public function _get_child($my_id, $arr)
+    {
+        $new_arr = array();
+        foreach ($arr as $k => $v) {
+            $v = (array)$v;
+            if ($v['pid'] == $my_id) {
+                $v['sub'] = $this->_get_child($v['id'],$arr);
+                $new_arr[] = $v;
+            }
+        }
+        return $new_arr ? $new_arr : false;
+    }
     /**
      * @name :上传图片
--- a/app/Http/Controllers/Bside/ComController.php
查看文件 @92cd046
+++ b/app/Http/Controllers/Bside/ComController.php
查看文件 @92cd046
@@ -74,24 +74,6 @@ class ComController extends BaseController
     }
     /**
-     * 菜单权限->得到子级数组
-     * @param int
-     * @return array
-     */
-    public function _get_child($my_id, $arr)
-    {
-        $new_arr = array();
-        foreach ($arr as $k => $v) {
-            $v = (array)$v;
-            if ($v['pid'] == $my_id) {
-                $v['sub'] = $this->_get_child($v['id'],$arr);
-                $new_arr[] = $v;
-
-            }
-        }
-        return $new_arr ? $new_arr : false;
-    }
-    /**
      * @name :获取当前项目详情
      * @return void
      * @author :liyuhang
@@ -114,17 +96,11 @@ class ComController extends BaseController
      */
     public function edit_info(){
         $rules = [
-            'id'=>'required',
-            'mobile'=>'required|string|max:11',
             'password'=>'required|string|min:5',
             'name'=>'required|max:20',
         ];
         //验证的提示信息
         $message = [
-            'id.required'=>'主键不能为空',
-            'mobile.required'=>'号码必须填写',
-            'mobile.string'=>'号码中含有非法文字',
-            'mobile.max'   =>  '号码不大于11字符.',
             'password.required'=>'密码必须填写',
             'password.string'=>'密码中含有非法文字',
             'password.min'   =>  '密码不小于5字符.',
@@ -135,8 +111,13 @@ class ComController extends BaseController
         if($validate->fails()){
             return $this->response($validate->errors()->first(),Code::USER_PARAMS_ERROE,$this->param);
         }
-        $user = new UserModel();
-
+        $userModel = new UserModel();
+        $this->param['id'] = $this->uid;
+        $rs = $userModel->edits($this->param);
+        if($rs === false){
+            $this->response('参数错误或其他服务器原因,编辑失败',Code::USER_ERROR);
+        }
+        $this->response('编辑成功');
     }
     /**
@@ -146,6 +127,10 @@ class ComController extends BaseController
      * @method :post
      */
     public function logout(){
-
+        $rs = Cache::pull($this->token);
+        if($rs === false){
+            $this->response('error',Code::USER_ERROR);
+        }
+        $this->response('success');
     }
 }
--- a/app/Http/Controllers/Bside/ProjectRoleController.php
查看文件 @92cd046
+++ b/app/Http/Controllers/Bside/ProjectRoleController.php
查看文件 @92cd046
@@ -3,6 +3,7 @@
 namespace App\Http\Controllers\Bside;
 use App\Enums\Common\Code;
+use App\Models\ProjectMenu as ProjectMenuModel;
 use App\Models\ProjectRole as ProjectRoleModel;
 use App\Models\User as UserModel;
 use Illuminate\Support\Facades\Validator;
@@ -25,6 +26,31 @@ class ProjectRoleController extends BaseController
         $this->allCount = $projectRoleModel->allCount;
         $this->result($lists);
     }
+
+    /**
+     * @name :添加/编辑角色时获取菜单列表
+     * @return void
+     * @author :liyuhang
+     * @method
+     */
+    public function get_role_menu(){
+        //根据当前登录用户角色返回用户菜单列表
+        $projectRoleModel = new ProjectRoleModel();
+        $info = $projectRoleModel->read(['id'=>$this->user['role_id']]);
+        $projectMenuModel = new ProjectMenuModel();
+        $info['role_menu'] = trim($info['role_menu'],',');
+        $lists = $projectMenuModel->where(['status'=>0])->whereIn('id',explode(',',$info['role_menu']))->get();
+        $lists = $lists->toArray();
+        $menu = array();
+        foreach ($lists as $k => $v){
+            $v = (array)$v;
+            if ($v['pid'] == 0) {
+                $v['sub'] = $this->_get_child($v['id'], $lists);
+                $menu[]   = $v;
+            }
+        }
+        $this->response('当前用户菜单列表',Code::SUCCESS,$menu);
+    }
     /**
      * @name :添加角色
      * @return void
@@ -60,7 +86,7 @@ class ProjectRoleController extends BaseController
         if($rs === false){
             $this->response('添加失败',Code::USER_PARAMS_ERROE);
         }
-        $this->response('添加成功',Code::SUCCESS);
+        $this->response('添加成功');
     }
     /**
--- a/app/Http/Logic/Bside/UserLogic.php 0 → 100644
查看文件 @92cd046
+++ b/app/Http/Logic/Bside/UserLogic.php 0 → 100644
查看文件 @92cd046
+<?php
+
+namespace App\Http\Logic\Bside;
+
+use App\Models\User;
+
+class UserLogic extends BaseLogic
+{
+    public function __construct()
+    {
+        parent::__construct();
+
+        $this->model = new User();
+    }
+
+}
--- a/routes/bside.php
查看文件 @92cd046
+++ b/routes/bside.php
查看文件 @92cd046
@@ -6,7 +6,12 @@ use \Illuminate\Support\Facades\Route;
 //必须登录验证的路由组
 Route::middleware(['bloginauth'])->group(function () {
+    //登录用户编辑个人资料
+    Route::any('/edit_info', [\App\Http\Controllers\Bside\ComController::class, 'edit_info'])->name('edit_info');
+    Route::any('/logout', [\App\Http\Controllers\Bside\ComController::class, 'logout'])->name('logout');
+    //获取当前登录用户菜单
     Route::any('/get_menu', [\App\Http\Controllers\Bside\ComController::class, 'get_menu'])->name('get_menu');
+    //获取当前登录用户项目详情
     Route::any('/get_project', [\App\Http\Controllers\Bside\ComController::class, 'get_project'])->name('get_project');
     //用户相关路由
     Route::any('/user/add', [\App\Http\Controllers\Bside\UserController::class, 'add'])->name('user_add');
@@ -16,6 +21,7 @@ Route::middleware(['bloginauth'])->group(function () {
     Route::any('/user/del', [\App\Http\Controllers\Bside\UserController::class, 'del'])->name('user_del');
     //用户角色相关路由
     Route::any('/project_role/lists', [\App\Http\Controllers\Bside\ProjectRoleController::class, 'lists'])->name('project_role_lists');
+    Route::any('/project_role/get_role_menu', [\App\Http\Controllers\Bside\ProjectRoleController::class, 'get_role_menu'])->name('project_get_role_add');
     Route::any('/project_role/add', [\App\Http\Controllers\Bside\ProjectRoleController::class, 'add'])->name('project_role_add');
     Route::any('/project_role/edit', [\App\Http\Controllers\Bside\ProjectRoleController::class, 'edit'])->name('project_role_edit');
     Route::any('/project_role/status', [\App\Http\Controllers\Bside\ProjectRoleController::class, 'status'])->name('project_role_status');