Merge branch 'liuzj-permission-dev' into test

modules/Tuiguang/Http/Controllers/PromotionController.php

@@ -20,6 +20,10 @@ class PromotionController extends CatchController
             '0' => '无',
             '1' => '巨量账户级回传',
         ];
+        $linkSourceMap = [
+            '0' => '',
+            '1' => 'tiktok'
+        ];
         $name = $request->input('name');
         $isConfig = $request->input('is_config', 1);
         $id = $request->input('id');
@@ -48,13 +52,17 @@ class PromotionController extends CatchController
             })->when($endTime, function ($query, $endTime){
                 return $query->where('promotions.created_at', '<=', $endTime);
             })->select('promotions.id', 'promotions.name', 'promotions.created_at',
-            'videos.name as video_name', 'promotions.series_sequence', 'promotions.callback_type', 'promotions.callback_config_id')
+            'videos.name as video_name', 'promotions.series_sequence', 'promotions.callback_type',
+                'promotions.callback_config_id', 'promotions.video_id')
             ->paginate($request->input('limit', 15));
         foreach ($result as $item) {
+            $item->series_sequence_name = '第'. $item->series_sequence . '集';
             $item->callback_type_str = $callbackTypeMap[$item->callback_type] ?? '';
-            // todo: 待完善
-            $item->promotion_path = '';
-            $item->track_url = '';
+            $item->promotion_path = config('tuiguang.tuiguang.url') . DIRECTORY_SEPARATOR . 'api/promotion/index?ranse_id='. $item->id;
+            $item->track_url = config('tuiguang.tuiguang.trackUrl') .
+                '/track?dycallback=1&connection_id='.$item->id.
+                '&link_source=' .( $linkSourceMap[$item->callback_type] ?? '') .
+                '&adid=__AID__&cid=__CID__&imei=__IMEI__&oaid=__OAID__&mac=__MAC__&os=__OS__&ip=__IP__&androidid=__ANDROIDID__&ua=__UA__&timestamp=__TS__&callback_url=__CALLBACK_URL__&projectid=__PROJECT_ID__&promotionid=__PROMOTION_ID__&advertiser_id=__ADVERTISER_ID__';
         }
 
         return $result;

modules/Tuiguang/config/tuiguang.php

@@ -0,0 +1,12 @@
+<?php
+
+return [
+    /**
+     * 推广链接地址
+     */
+    'url' => env('TUIGUAGN_URL', 'https://api.duanju.dududus.com'),
+    /**
+     * 监测链接地址
+     */
+    'trackUrl' => env('TUIGUAGN_TRACK_URL', 'http://track.dududus.com')
+];

tests/Tuiguang/Http/Controllers/PromotionControllerTest.php

@@ -56,8 +56,8 @@ class PromotionControllerTest extends UsedTestCase
 //            'name' => 'kkk'
         ]);
 
-//        $res->dump();
-        $this->dumpJson($res);
+        $res->dump();
+//        $this->dumpJson($res);
     }
 
     public function testupdateCallbackConfig() {