Merge branch 'liuzj-permission-dev' into test

# Conflicts:
#	modules/Channel/Http/Controllers/AdvertiserController.php
#	modules/CpManage/Http/Controllers/UserTrait.php
#	modules/Video/Http/Controllers/VideoController.php

modules/Channel/Http/Controllers/AdvertiserController.php

@@ -78,7 +78,6 @@ class AdvertiserController extends CatchController
             ->where([
                 'user_has_miniprograms.is_enabled' => 1,
                 'users.deleted_at' => 0,
-
             ])->when($userContext['loginUserRoles']->contains('company'), function ($query) use($userContext){
                 return $query->where('users.pid' , $userContext['loginUser']->id);
             })

modules/ContentManage/Http/Controllers/CpSubscribeStatisticDataController.php

@@ -10,7 +10,8 @@ use Illuminate\Support\Facades\DB;
 
 class CpSubscribeStatisticDataController extends CatchController
 {
-    use ValidatesRequests, UserTrait;
+    use ValidatesRequests;
+    use \Modules\User\Http\Controllers\UserTrait;
 
 
     /**

modules/ContentManage/Http/Controllers/UserTrait.php

@@ -1,56 +0,0 @@
-<?php
-
-namespace Modules\ContentManage\Http\Controllers;
-
-use Catch\Base\CatchController;
-use Illuminate\Support\Collection;
-use Illuminate\Support\Facades\DB;
-use Modules\User\Models\User;
-
-trait UserTrait
-{
-    // 当前登录用户
-    protected $currentUser;
-
-    /**
-     * 获取当前登录用户
-     * @return User
-     */
-    protected function getCurrentUser(): User {
-        if(!$this->currentUser) {
-            $this->currentUser = $this->getLoginUser();
-        }
-        return $this->currentUser;
-    }
-    /**
-     * 当前用户的所有的角色标识的结合
-     * @return Collection
-     */
-    protected function listUserRoles():Collection {
-        return $this->getCurrentUser()->roles->pluck('identify');
-    }
-
-    /**
-     * 当前用户是否是cp角色
-     * @return bool
-     */
-    public function userIsCp():bool {
-        return $this->listUserRoles()->contains('cp');
-    }
-
-    /**
-     * 如果当前用户是cp角色,返回cp_name,否则返回null
-     * @return string
-     */
-    public function getUserCpName():string|null {
-        if($this->userIsCp()) {
-            return DB::table('user_belong_to_cp')
-                ->where([
-                    'is_enabled' => 1,
-                    'user_id' => $this->getCurrentUser()->id,
-                ])->value('cp_name');
-        } else {
-            return null;
-        }
-    }
-}

modules/System/Http/Controllers/UserTrait.php

@@ -1,56 +0,0 @@
-<?php
-
-namespace Modules\ContentManage\Http\Controllers;
-
-use Catch\Base\CatchController;
-use Illuminate\Support\Collection;
-use Illuminate\Support\Facades\DB;
-use Modules\User\Models\User;
-
-trait UserTrait
-{
-    // 当前登录用户
-    protected $currentUser;
-
-    /**
-     * 获取当前登录用户
-     * @return User
-     */
-    protected function getCurrentUser(): User {
-        if(!$this->currentUser) {
-            $this->currentUser = $this->getLoginUser();
-        }
-        return $this->currentUser;
-    }
-    /**
-     * 当前用户的所有的角色标识的结合
-     * @return Collection
-     */
-    protected function listUserRoles():Collection {
-        return $this->getCurrentUser()->roles->pluck('identify');
-    }
-
-    /**
-     * 当前用户是否是cp角色
-     * @return bool
-     */
-    public function userIsCp():bool {
-        return $this->listUserRoles()->contains('cp');
-    }
-
-    /**
-     * 如果当前用户是cp角色,返回cp_name,否则返回null
-     * @return string
-     */
-    public function getUserCpName():string|null {
-        if($this->userIsCp()) {
-            return DB::table('user_belong_to_cp')
-                ->where([
-                    'is_enabled' => 1,
-                    'user_id' => $this->getCurrentUser()->id,
-                ])->value('cp_name');
-        } else {
-            return null;
-        }
-    }
-}

modules/Video/Http/Controllers/VideoController.php

@@ -9,6 +9,7 @@ use Illuminate\Support\Facades\DB;
 use Modules\Common\Errors\Errors;
 use Modules\Common\Exceptions\CommonBusinessException;
 use Modules\User\Http\Controllers\UserTrait;
+use Modules\User\Models\User;
 use Modules\Video\Services\VideoService;
 
 class VideoController extends CatchController