Merge branch 'master' of qk:zy_duanju/duanju_manage into test

modules/Channel/Http/Controllers/UserMiniprogramController.php

@@ -6,6 +6,7 @@ use Catch\Base\CatchController;
 use Illuminate\Http\Request;
 use Modules\User\Models\User;
 use Modules\Channel\Models\UserHasMiniprograms;
+use Log;
 
 class UserMiniprogramController extends CatchController
 {
@@ -17,10 +18,12 @@ class UserMiniprogramController extends CatchController
 
     public function index(Request $request)
     {
-          return $this->userHasMiniprograms->join('miniprogram','miniprogram.id','=','user_has_miniprograms.miniprogram_id')
-          ->where('user_has_miniprograms.is_enabled',1)
-          ->where('uid',$this->user->id)
-          ->select('user_has_miniprograms.miniprogram_id','miniprogram.name','miniprogram.play_name')
-          ->get();
+        $uid = $this->getLoginUser()->id;
+        Log::ifno('channel',['c'=>'UserMiniprogramController','uid'=>$uid]);
+        return $this->userHasMiniprograms->join('miniprogram','miniprogram.id','=','user_has_miniprograms.miniprogram_id')
+        ->where('user_has_miniprograms.is_enabled',1)
+        ->where('uid',$uid)
+        ->select('user_has_miniprograms.miniprogram_id','miniprogram.name','miniprogram.play_name')
+        ->get();
     }
 }

modules/Channel/routes/route.php

@@ -13,7 +13,7 @@ Route::prefix('channel')->group(function () {
     Route::get('advertiser/listAdvertiser', [AdvertiserController::class, 'listAdvertiser']);
     Route::get('advertiser/getAdvertiser', [AdvertiserController::class, 'getAdvertiser']);
 
-    Route::get('miniprogram/list', [UserMiniprogramController::class, 'index'])->withoutMiddleware(config('catch.route.middlewares'));;
+    Route::get('miniprogram/list', [UserMiniprogramController::class, 'index']);
 
 });