Wesmiler 拾光销售 初始化

app/Http/Kernel.php

@@ -41,11 +41,6 @@ class Kernel extends HttpKernel
             \Illuminate\Routing\Middleware\SubstituteBindings::class,
         ],
 
-        'api' => [
-//            'throttle:api',
-            \Illuminate\Routing\Middleware\SubstituteBindings::class,
-            \Illuminate\Session\Middleware\StartSession::class,
-        ],
     ];
 
     /**
@@ -66,6 +61,5 @@ class Kernel extends HttpKernel
         'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
         'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,
         'user.login' => \App\Http\Middleware\UserLogin::class,
-        'web.login' => \App\Http\Middleware\WebLogin::class,
     ];
 }

app/Services/Common/MenuService.php

@@ -14,6 +14,7 @@ namespace App\Services\Common;
 
 use App\Models\MenuModel;
 use App\Services\BaseService;
+use App\Services\RedisService;
 
 /**
  * 菜单管理-服务类
@@ -218,7 +219,8 @@ class MenuService extends BaseService
         $list = [];
         if ($userId == 1) {
             // 管理员拥有全部权限
-            $list = $this->model->getChilds(0);
+//            $list = $this->model->getChilds(0);
+            $list = $this->getPermissionMenu($userId, 0);
         } else {
             // 其他角色
             $list = $this->getPermissionMenu($userId, 0);
@@ -236,6 +238,12 @@ class MenuService extends BaseService
      */
     public function getPermissionMenu($userId, $pid = 0)
     {
+        $cacheKey = "caches:menus:{$userId}_{$pid}";
+        $menuList = RedisService::get($cacheKey);
+        if($menuList){
+            return $menuList;
+        }
+
         $menuModel = new MenuModel();
         $menuList = $menuModel::from("menu as m")
             ->select('m.*')
@@ -257,6 +265,8 @@ class MenuService extends BaseService
                     $val['children'] = $childList;
                 }
             }
+
+            RedisService::set($cacheKey, $menuList, rand(10, 20));
         }
         return $menuList;
     }

app/Services/Common/RoleService.php

@@ -70,7 +70,10 @@ class RoleService extends BaseService
         $menuList = $menuModel->where([
             ['status', '=', 1],
             ['mark', '=', 1],
-        ])->orderBy("sort", "asc")->get()->toArray();
+        ])->where(function($query) use($menuModel){
+            $pids = $menuModel->where(['status'=>1,'mark'=>1,'type'=>0])->select('id')->get();
+            $query->where('pid',0)->orWhereIn('pid', $pids);
+        })->orderBy("sort", "asc")->get()->toArray();
         if (!empty($menuList)) {
             $roleMenuModel = new RoleMenuModel();
             $roleMenuList = $roleMenuModel->where("role_id", $roleId)->get("menu_id")->toArray();

routes/web.php

@@ -81,12 +81,6 @@ Route::get('/menu/info', [MenuController::class, 'info']);
 Route::post('/menu/edit', [MenuController::class, 'edit']);
 Route::post('/menu/delete', [MenuController::class, 'delete']);
 
-// 部门管理
-Route::get('/city/index', [CityController::class, 'index']);
-Route::get('/city/info', [CityController::class, 'info']);
-Route::post('/city/edit', [CityController::class, 'edit']);
-Route::post('/city/delete', [CityController::class, 'delete']);
-
 // 配置分组管理
 Route::get('/configgroup/index', [ConfigGroupController::class, 'index']);
 Route::get('/configgroup/info', [ConfigGroupController::class, 'info']);
@@ -99,34 +93,6 @@ Route::get('/config/info', [ConfigController::class, 'info']);
 Route::post('/config/edit', [ConfigController::class, 'edit']);
 Route::post('/config/delete', [ConfigController::class, 'delete']);
 
-// 通知公告管理
-Route::get('/notice/index', [NoticeController::class, 'index']);
-Route::get('/notice/info', [NoticeController::class, 'info']);
-Route::post('/notice/edit', [NoticeController::class, 'edit']);
-Route::post('/notice/delete', [NoticeController::class, 'delete']);
-Route::post('/notice/status', [NoticeController::class, 'status']);
-Route::post('/notice/setIsTop', [NoticeController::class, 'setIsTop']);
-
-// 广告位管理
-Route::get('/adsort/index', [AdSortController::class, 'index']);
-Route::get('/adsort/info', [AdSortController::class, 'info']);
-Route::post('/adsort/edit', [AdSortController::class, 'edit']);
-Route::post('/adsort/delete', [AdSortController::class, 'delete']);
-Route::get('/adsort/getAdSortList', [AdSortController::class, 'getAdSortList']);
-
-// 广告管理
-Route::get('/ad/index', [AdController::class, 'index']);
-Route::get('/ad/info', [AdController::class, 'info']);
-Route::post('/ad/edit', [AdController::class, 'edit']);
-Route::post('/ad/delete', [AdController::class, 'delete']);
-
-// 会员等级
-Route::get('/memberlevel/index', [MemberLevelController::class, 'index']);
-Route::get('/memberlevel/info', [MemberLevelController::class, 'info']);
-Route::post('/memberlevel/edit', [MemberLevelController::class, 'edit']);
-Route::post('/memberlevel/delete', [MemberLevelController::class, 'delete']);
-Route::get('/memberlevel/getMemberLevelList', [MemberLevelController::class, 'getMemberLevelList']);
-
 // 会员管理
 Route::get('/member/index', [MemberController::class, 'index']);
 Route::get('/member/info', [MemberController::class, 'info']);
@@ -137,7 +103,3 @@ Route::post('/member/status', [MemberController::class, 'status']);
 // 登录日志
 Route::get('/loginlog/index', [LoginLogController::class, 'index']);
 Route::post('/loginlog/delete', [LoginLogController::class, 'delete']);
-
-// 操作日志
-Route::get('/actionlog/index', [ActionLogController::class, 'index']);
-Route::post('/actionlog/delete', [ActionLogController::class, 'delete']);