Merge branch 'master' of http://git.bjzxtw.org.cn:3000/zxt/admin_consumer

app/Controller/ClientController.php

@@ -7,6 +7,7 @@ namespace App\Controller;
 use App\JsonRpc\ChatServiceInterface;
 use App\JsonRpc\UserServiceInterface;
 use App\JsonRpc\ClientServiceInterface;
+use Hyperf\HttpServer\Contract\RequestInterface;
 
 use App\Tools\PublicData;
 use App\Tools\Result;
@@ -39,12 +40,14 @@ class ClientController extends AbstractController
         ClientServiceInterface $clientServiceClient,
         ValidatorFactoryInterface $validationFactory,
         ChatServiceInterface $chatServiceClient,
+        RequestInterface $request,
         UserServiceInterface $userServiceClient
     ) {
         $this->clientServiceClient = $clientServiceClient;
         $this->validationFactory = $validationFactory;
         $this->chatServiceClient = $chatServiceClient;
         $this->userServiceClient = $userServiceClient;
+        $this->request = $request;
     }
     public function test()
     {
@@ -52,4 +55,120 @@ class ClientController extends AbstractController
         $test = $this->clientServiceClient->test(['name' => 'test']);
         return Result::success($test);
     }
+
+    public function indexData()
+    {
+        $request_data = $this->request->all();
+        var_dump($request_data, '---------------');
+        $data = $this->clientServiceClient->indexData($request_data);
+        var_dump($data, '-----1----------');
+        return Result::success($data);
+    }
+    public function addWeb()
+    {
+        $request_data = $this->request->all();
+        //校验数据
+        var_dump($request_data, '---------------');
+        $validator = $this->validationFactory->make(
+            $request_data,
+            [
+                'website_id' => 'required'
+            ],
+            [
+                'website_id.required' => 'website_id is required'
+            ]
+        );
+        if ($validator->fails()) {
+            return Result::error($validator->errors()->first());
+        }
+        $request_data['user_id'] =  Context::get("UserId");
+        // $request_data['website_id'] = Context::get("SiteId");
+        $result = $this->clientServiceClient->addWeb($request_data);
+        return $result ? Result::success($result['data']) : Result::error($result['message']);
+    }
+    public function deleteWeb()
+    {
+        $request_data = $this->request->all();
+        $result = $this->clientServiceClient->deleteWeb($request_data);
+        return $result ? Result::success($result['data']) : Result::error($result['message']);
+    }
+    public function getWebInfo()
+    {
+        $request_data = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $request_data,
+            [
+                'id' => 'required',
+            ],
+            [
+                'id.required' => 'ID必填',
+            ]
+        );
+        if ($validator->fails()) {
+            return Result::error($validator->errors()->first());
+        }
+        $result = $this->clientServiceClient->getWebInfo($request_data);
+        return $result ? Result::success($result['data']) : Result::error($result['message']);
+    }
+    public function updateWeb()
+    {
+        $request_data = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $request_data,
+            [
+                'id' => 'required',
+                'port' => 'required',
+                'dir' => 'required',
+            ],
+            [
+                'id.required' => 'ID必填',
+                'port.required' => 'Port必填',
+                'dir.required' => '路径必填'
+            ]
+        );
+        $result = $this->clientServiceClient->updateWeb($request_data);
+        return $result ? Result::success($result['data']) : Result::error($result['message']);
+    }
+    public function getWebList()
+    {
+        $request_data = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $request_data,
+            [
+                'page' => 'required',
+                'pageSize' => 'required'
+            ],
+            [
+                'page.required' => 'Page is required',
+                'pageSize.required' => 'Page size is required'
+            ]
+        );
+
+        if ($validator->fails()) {
+            return Result::error($validator->errors()->first());
+        }
+        $result = $this->clientServiceClient->getWebList($request_data);
+        return $result ? Result::success($result['data']) : Result::error($result['message']);
+    }
+    public function updateWebConfig()
+    {
+        $request_data = $this->request->all();
+        $data = $this->clientServiceClient->updateWebConfig($request_data);
+        return $data ? Result::success($data['data']) : Result::error($data['message']);
+    }
+    public function updateWebOutput()
+    {
+        $request_data = $this->request->all();
+        $data = $this->clientServiceClient->updateWebOutput($request_data);
+    }
+    public function updateWebMove()
+    {
+        $request_data = $this->request->all();
+        $data = $this->clientServiceClient->updateWebMove($request_data);
+    }
+    public function runWeb()
+    {
+        $request_data = $this->request->all();
+        $data = $this->clientServiceClient->runWeb($request_data);
+    }
 }

app/Controller/OrderController.php

@@ -191,7 +191,7 @@ class OrderController extends AbstractController
             return Result::error($errorMessage);
         }
         $requireData['user_id'] = Context::get("UserId");
-        $requireData['website_id'] = Context::get("SiteId")??'2';
+        $requireData['website_id'] = Context::get("SiteId") ?? '2';
         $result = $this->orderServiceClient->addAD($requireData);
         // return $requireData;
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
@@ -548,4 +548,40 @@ class OrderController extends AbstractController
         $result = $this->orderServiceClient->getAdSize();
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
+    /**
+     * 检测站点是否有订单
+     */
+    public function checkWebsiteOrder()
+    {
+        $requireData['website_id'] = Context::get("SiteId");
+        $result = $this->orderServiceClient->checkWebsiteOrder($requireData);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
+    }
+    /**
+     * 批量删除订单
+     */
+    public function batchDelWebsiteOrder()
+    {
+
+
+        $requireData = $this->request->all();
+        var_dump($requireData);
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'ids' => 'required|array',
+            ],
+            [
+                'ids.required' => '订单id不能为空',
+                'ids.array' => '订单id格式不正确',
+            ]
+        );
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $requireData['website_id'] = Context::get("SiteId");
+        $result = $this->orderServiceClient->batchDelWebsiteOrder($requireData);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
+    }
 }

app/JsonRpc/ClientService.php

@@ -32,8 +32,50 @@ class ClientService extends AbstractServiceClient implements ClientServiceInterf
      */
     public function test(array $data): array
     {
-        var_dump($data, $this->serviceName, $this->protocol);
-        $this->logger->info('请求数据: ' . json_encode($data));
+        return $this->__request(__FUNCTION__, $data);
+    }
+    public function indexData(array $data): array
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    public function addWeb(array $data): array
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    public function deleteWeb(array $data): array
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    public function updateWeb(array $data): array
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    public function getWebList(array $data): array
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    public function getWebInfo(array $data): array
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    public function updateWebConfig(array $data): array
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    public function updateWebOutput(array $data): array
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    public function updateWebMove(array $data): array
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    public function runWeb(array $data): array
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    public function stopWeb(array $data): array
+    {
         return $this->__request(__FUNCTION__, $data);
     }
 }

app/JsonRpc/ClientServiceInterface.php

@@ -8,4 +8,15 @@ interface ClientServiceInterface
      * @param array $data
      */
     public function test(array $data);
+    public function indexData(array $data);
+    public function addWeb(array $data);
+    public function deleteWeb(array $data);
+    public function updateWeb(array $data);
+    public function getWebList(array $data);
+    public function updateWebConfig(array $data);
+    public function updateWebOutput(array $data);
+    public function updateWebMove(array $data);
+    public function runWeb(array $data);
+    public function stopWeb(array $data);
+    public function getWebInfo(array $data);
 }

app/JsonRpc/OrderService.php

@@ -16,7 +16,7 @@ class OrderService extends AbstractServiceClient implements OrderServiceInterfac
      * @var string
      */
     protected string $protocol = 'jsonrpc-http';
-   
+
     /**
      * @param array $data
      * @return mixed
@@ -65,7 +65,7 @@ class OrderService extends AbstractServiceClient implements OrderServiceInterfac
     {
         return $this->__request(__FUNCTION__, $data);
     }
-     /**
+    /**
      * @param array $data
      * @return mixed
      */
@@ -114,7 +114,7 @@ class OrderService extends AbstractServiceClient implements OrderServiceInterfac
         return $this->__request(__FUNCTION__, $data);
     }
 
-    
+
     /**
      * @param array $data
      * @return mixed
@@ -155,4 +155,12 @@ class OrderService extends AbstractServiceClient implements OrderServiceInterfac
     {
         return $this->__request(__FUNCTION__, []);
     }
+    public function batchDelWebsiteOrder(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    public function checkWebsiteOrder(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
 }

app/JsonRpc/OrderServiceInterface.php

@@ -4,7 +4,7 @@ namespace App\JsonRpc;
 
 interface OrderServiceInterface
 {
-   
+
     /**
      * @param array $data
      */
@@ -46,7 +46,7 @@ interface OrderServiceInterface
      * @param array $data
      */
     public function getPrice(array $data);
-    
+
     /**
      * @param array $data
      */
@@ -68,7 +68,7 @@ interface OrderServiceInterface
      */
     public function delOrderAD(array $data);
 
-    
+
     /**
      * @param array $data
      */
@@ -89,4 +89,6 @@ interface OrderServiceInterface
      * @return mixed
      */
     public function getAdSize();
+    public function checkWebsiteOrder(array $data);
+    public function batchDelWebsiteOrder(array $data);
 }

config/api/client.php

@@ -10,6 +10,30 @@ Router::addGroup(
     '/client',
     function () {
         Router::post('/test', [clientController::class, 'test']);
+        Router::post('/indexData', [clientController::class, 'indexData']);
+        //搭建增删改查
+        Router::post('/addWeb', [clientController::class, 'addWeb']);
+        Router::post('/deleteWeb', [clientController::class, 'deleteWeb']);
+        Router::post('/updateWeb', [clientController::class, 'updateWeb']);
+        Router::post('/getWebList', [clientController::class, 'getWebList']);
+        Router::post('/getWebInfo', [clientController::class, 'getWebInfo']);
+        //改配置
+        Router::post('/updateWebConfig', [clientController::class, 'updateWebConfig']);
+        //输出目录
+        Router::post('/updateWebOutput', [clientController::class, 'updateWebOutput']);
+        //移动目录
+        Router::post('/updateWebMove', [clientController::class, 'updateWebMove']);
+        //运行
+        Router::post('/runWeb', [clientController::class, 'runWeb']);
+        //停止
+        Router::post('/stopWeb', [clientController::class, 'stopWeb']);
+
+
+
+
+        Router::post('/getPageList', [clientController::class, 'getPageList']);
+        Router::post('/getUserInfo', [clientController::class, 'getUserInfo']);
+        Router::post('/channelData', [clientController::class, 'channelData']);
+        Router::post('/getData', [clientController::class, 'getData']);
     },
-    // ['middleware' => [WebMiddleware::class]]
 );

config/api/order.php

@@ -1,12 +1,14 @@
 <?php
 
-declare (strict_types = 1);
+declare(strict_types=1);
+
 use App\Controller\OrderController;
 use App\Middleware\Auth\FooMiddleware;
 use Hyperf\HttpServer\Router\Router;
 
 Router::addGroup(
-    '/order', function () {
+    '/order',
+    function () {
         //订单状态对应
         Router::get('/getStatus', [OrderController::class, 'getStatus']);
         //查询广告
@@ -65,6 +67,10 @@ Router::addGroup(
         //获取广告位的尺寸
         Router::post('/getAdSize', [OrderController::class, 'getAdSize']);
 
+        //检测站点是否有订单
+        Router::post('/checkWebsiteOrder', [OrderController::class, 'checkWebsiteOrder']);
+        //批量删除站点订单
+        Router::post('/batchDelWebsiteOrder', [OrderController::class, 'batchDelWebsiteOrder']);
     },
     ['middleware' => [FooMiddleware::class]]
 );