rkljw 1 month ago
parent
commit
a86ab79df2

+ 43 - 7
app/Controller/AdController.php

@@ -54,7 +54,7 @@ class AdController extends AbstractController
             return Result::error($errorMessage);
         }
         $result = $this->adServiceClient->createAd($requireData);
-        return $result?Result::success($result['data']):Result::error($result['message']);
+        return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
     }
 
     /**
@@ -127,7 +127,7 @@ class AdController extends AbstractController
 
             }
         }
-        return $result?Result::success($result['data']):Result::error($result['message']);
+        return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
     }
 
     public function updateAd()
@@ -150,7 +150,7 @@ class AdController extends AbstractController
         }
         $requireData = $this->request->all();
         $result = $this->adServiceClient->updateAd($requireData);
-        return $result?Result::success($result['data']):Result::error($result['message']);
+        return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
     }
 
     public function delAd()
@@ -171,7 +171,7 @@ class AdController extends AbstractController
         }
         $result = $this->adServiceClient->delAd($requireData);
         var_dump($result);
-        return $result?Result::success($result['data']):Result::error($result['message']);
+        return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
     }
 
     /**
@@ -206,7 +206,7 @@ class AdController extends AbstractController
                 $result['data']['rows'][$k]['status_name'] = $statusName[$v['status']];
             }
         }
-        return $result?Result::success($result['data']):Result::error($result['message']);
+        return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
     }
 
     /**
@@ -242,7 +242,7 @@ class AdController extends AbstractController
             return Result::error($errorMessage);
         }
         $result = $this->adServiceClient->createAdPlace($requireData);
-        return $result?Result::success($result['data']):Result::error($result['message']);
+        return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
     }
 
     public function updateAdPlace()
@@ -276,7 +276,7 @@ class AdController extends AbstractController
             return Result::error($errorMessage);
         }
         $result = $this->adServiceClient->updateAdPlace($requireData);
-        return $result?Result::success($result['data']):Result::error($result['message']);
+        return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
     }
 
     /**
@@ -326,4 +326,40 @@ class AdController extends AbstractController
         $result = $this->adServiceClient->getAdPlaceInfo(intval($requireData['id']));
         return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
     }
+
+    /**
+     * 孪生站添加广告位
+     * @return array
+     */
+    public function addTwinAdPlace()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'name' => 'required', //广告位名称
+                'website_id' => 'required',//关联的网站id
+                'thumb'=>'required', //广告示意图
+                'typeid'=>'required', //广告类型
+                'width'=>'required', //宽度
+                'height'=>'required', //高度
+                'ad_tag'=>'required', //高度
+            ],
+            [
+                'name.required' => '名称不能为空',
+                'website_id.required' => '站点id不能为空',
+                'thumb.required'=>'广告示意图必传', //广告示意图
+                'typeid.required'=>'广告类型必选', //广告类型
+                'width.required'=>'宽度必填',
+                'height.required'=>'高度必填',
+                'ad_tag.required'=>'唯一标识必填',
+            ]
+        );
+        if ($validator->fails()){
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $result = $this->adServiceClient->addTwinAdPlace($requireData);
+        return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
+    }
 }

+ 9 - 0
app/JsonRpc/AdService.php

@@ -107,5 +107,14 @@ class AdService extends AbstractServiceClient implements AdServiceInterface
         return $this->__request(__FUNCTION__, compact('id'));
     }
 
+    /**
+     * @param int $id
+     * @return mixed
+     */
+    public function addTwinAdPlace(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+
 
 }

+ 6 - 0
app/JsonRpc/AdServiceInterface.php

@@ -63,4 +63,10 @@ interface AdServiceInterface
      * @return mixed
      */
     public function getAdPlaceInfo(int $id);
+
+    /**
+     * @param int $id
+     * @return mixed
+     */
+    public function addTwinAdPlace(array $data);
 }

+ 40 - 0
app/Task/TsbbTask.php

@@ -0,0 +1,40 @@
+<?php
+
+declare (strict_types = 1);
+
+namespace App\Task;
+use App\JsonRpc\NewsServiceInterface;
+use Hyperf\Contract\StdoutLoggerInterface;
+use Hyperf\Di\Annotation\Inject;
+use Psr\Log\LoggerInterface;
+
+class TsbbTask
+{
+    /**
+     * @var NewsServiceInterface
+     */
+    #[Inject]
+    private $newsServiceClient;
+    /**
+     * @Inject
+     * @var StdoutLoggerInterface
+     */
+    private $logger;
+    public function __construct(LoggerInterface $logger)
+    {
+        date_default_timezone_set('Asia/Shanghai');
+        $this->logger = $logger;
+    }
+    public function __invoke()
+    {
+        var_dump("TsbbTask================");
+        $this->logger->info('TsbbTask================');
+        $requireData = [
+            'website_id' => 50,
+        ];
+        var_dump("#############");
+        $this->newsServiceClient->getWebsiteTsbb($requireData);;
+
+    }
+
+}

+ 2 - 0
config/api/ad.php

@@ -23,6 +23,8 @@ Router::addGroup(
         Router::post('/updateAdPlace', [AdController::class, 'updateAdPlace']);
         //删除广告位
         Router::post('/delAdPlace', [AdController::class, 'delAdPlace']);
+        //孪生站广告位
+        Router::post('/addTwinAdPlace', [AdController::class, 'addTwinAdPlace']); 
     },
     ['middleware' => [FooMiddleware::class]]
 );

+ 1 - 1
config/autoload/amqp.php

@@ -16,7 +16,7 @@ return [
         'pool' => [
             'min_connections' => 1,
             'max_connections' => 1, // 限制最大连接数为1
-            'connect_timeout' => 10.0,
+            'connect_timeout' => 1000.0,
             'wait_timeout' => 3.0,
             'heartbeat' => -1,
             

+ 10 - 4
config/autoload/crontab.php

@@ -8,11 +8,17 @@ return [
     // 是否开启定时任务
     'enable' => true,
     'crontab' => [
+//        (new Crontab())
+//            ->setName('HistoryTodayTask')
+//            ->setRule('0 0 0  * * *') // 每天凌晨执行一次
+//            ->setCallback([App\Task\HistoryTodayTask::class, '__invoke'])
+//            ->setMemo('获取历史上的今天')
+//            ->setTimezone('Asia/Shanghai'),
         (new Crontab())
-            ->setName('HistoryTodayTask')
-            ->setRule('0 0 0  * * *') // 每天凌晨执行一次
-            ->setCallback([App\Task\HistoryTodayTask::class, '__invoke'])
-            ->setMemo('获取历史上的今天')
+            ->setName('tsbbTask') // 任务名称
+            ->setRule('* * 1 * * *') // 每天凌晨1点执行
+            ->setCallback([App\Task\TsbbTask::class, '__invoke']) // 替换为你的任务类
+            ->setMemo('贴身宝贝') // 描述
             ->setTimezone('Asia/Shanghai'),
     ],
 ];

+ 1 - 1
config/autoload/services.php

@@ -85,7 +85,7 @@ return [
                 'package_length_field' => 'length',
             ],
             'options' => [
-                'connect_timeout' => 50.0, // 连接超时时间,单位为秒
+                'connect_timeout' => 500.0, // 连接超时时间,单位为秒
                 'read_timeout' => 100.0, // 读取超时时间,单位为秒
                 'write_timeout' => 100.0, // 写入超时时间,单位为秒
             ],