15313670163 há 4 meses atrás
pai
commit
83f27608fc

+ 11 - 11
.env

@@ -11,21 +11,21 @@ DB_CHARSET=utf8mb4
 DB_COLLATION=utf8mb4_unicode_ci
 DB_PREFIX=
 
-#REDIS_HOST=101.254.114.211
-#REDIS_AUTH=YPWWnFnNebc7427B
-#REDIS_PORT=26739
-#REDIS_DB=0
+REDIS_HOST=101.254.114.211
+REDIS_AUTH=YPWWnFnNebc7427B
+REDIS_PORT=26739
+REDIS_DB=0
 
 
-REDIS_HOST=192.168.1.201
-REDIS_AUTH=
-REDIS_PORT=6379
-REDIS_DB=0
+# REDIS_HOST=192.168.1.201
+# REDIS_AUTH=
+# REDIS_PORT=6379
+# REDIS_DB=0
 
-AMQP_HOST=103.105.201.2
-AMQP_PORT=5673
+AMQP_HOST=183.131.25.186
+AMQP_PORT=5672
 AMQP_USER=rabbitmq
-AMQP_PASSWORD=H8eDTAk6LY7EjJ8y
+AMQP_PASSWORD=LEjDKfDcBmBHEmKN
 
 
 #小程序获取openid

+ 37 - 37
app/Controller/FooterController.php

@@ -1,41 +1,37 @@
 <?php
+
 declare(strict_types=1);
 namespace App\Controller;
 
 use App\JsonRpc\FooterServiceInterface;
 use App\Tools\PublicData;
 use Hyperf\Di\Annotation\Inject;
+use Hyperf\HttpServer\Annotation\AutoController;
 use App\Tools\Result;
 use Hyperf\Validation\Contract\ValidatorFactoryInterface;
 use App\Constants\ErrorCode;
-use Hyperf\Context\Context;
-use Hyperf\HttpServer\Contract\RequestInterface;
-use Hyperf\HttpServer\Contract\ResponseInterface;
 /**
  * Class FooterController
  * @package App\Controller
  */
+
 class FooterController extends AbstractController
 {
-
     #[Inject]
     protected ValidatorFactoryInterface $validationFactory;
 
     /**
      * @var FooterServiceInterface
-     */
-    #[Inject]
-    private $FooterServiceClient;
-
+    */
 
-
-    /**
-     * 获取栏目导航
+    #[Inject]
+    private $footerServiceClient;
+     /**
+     * 获取底部导航
      * @return array
      */
     public function getFooterCategory()
     {
-
         $requireData = $this->request->all();
         if(isset($requireData['id'])){
             $validator = $this->validationFactory->make(
@@ -48,7 +44,8 @@ class FooterController extends AbstractController
                 ]
             );
             $data[] = ['id',$requireData['id']];
-        }elseif(isset($requireData['web_name'])){
+        }else{
+            if(isset($requireData['web_name'])){
             $validator = $this->validationFactory->make(
                 $requireData,
                 [
@@ -59,21 +56,21 @@ class FooterController extends AbstractController
                 ]
             );
             $data[] = ['web_name',$requireData['web_name']];
-        }elseif(isset($requireData['footer_category'])){
+            }elseif(isset($requireData['footer_category'])){
+                $validator = $this->validationFactory->make(
+                    $requireData,
+                    [
+                        'footer_category' =>'required'
+                    ],
+                    [
+                        'footer_category.required' => '底部导航名称不能为空'
+                    ]
+                );
+                $data[] = ['footer_category',$requireData['footer_category']];
+            }else{
+                $data = null;
+            }
             $validator = $this->validationFactory->make(
-                $requireData,
-                [
-                    'footer_category' =>'required'
-                ],
-                [
-                    'footer_category.required' => '底部导航名称不能为空'
-                ]
-            );
-            $data[] = ['footer_category',$requireData['footer_category']];
-        }else{
-            $data = null;
-        }
-        $validator = $this->validationFactory->make(
                 $requireData,
                 [
                     'page' =>'required',
@@ -83,19 +80,22 @@ class FooterController extends AbstractController
                     'page.required' => '第几页不能为空',
                     'pageSize.required' => '每页显示数量不能为空'
                 ]
-        );
-        $data[] = ['page',$requireData['page']];
-        $data[] = ['pageSize',$requireData['pageSize']];
+            );
+            $data[] = ['page',$requireData['page']];
+            $data[] = ['pageSize',$requireData['pageSize']];
+        }
         if ($validator->fails()){
-            $errorMessage = $validator->errors()->first();
+            $errorMessage = $validator->errors()->all();
             return Result::error($errorMessage);
         }
-        $result = $this->FooterServiceClient->getFooterCategory($data);
-        if ($result['code'] != ErrorCode::SUCCESS) {
-            return Result::error($result['message'],0,[]);
-        }
-        return Result::success($result['data']);
+        var_dump($data);
+        $result = $this->footerServiceClient->getFooterCategory($data);
+        // if ($result['code'] != ErrorCode::SUCCESS) {
+        //     return Result::error($result['message'],0,[]);
+        // }
+        // return Result::success($result['data']);
     }
 
-   
+
+
 }

+ 9 - 10
app/JsonRpc/FooterService.php

@@ -16,16 +16,15 @@ class FooterService extends AbstractServiceClient implements FooterServiceInterf
      * @var string
      */
     protected string $protocol = 'jsonrpc-http';
-    
-    /* @param array $data
-    * @return array|mixed
-    */
-   public function getFooterCategory(array $data)
-   {
-       return $this->__request(__FUNCTION__, $data);
-   }
 
-  
 
-    
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getFooterCategory(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+
 }

+ 11 - 10
config/api/footer.php

@@ -1,34 +1,35 @@
 <?php
 
 declare (strict_types = 1);
-use App\Controller\OrderController;
+use App\Controller\FooterController;
 use App\Middleware\Auth\FooMiddleware;
 use Hyperf\HttpServer\Router\Router;
 
 Router::addGroup(
     '/footer', function () {
         //测试
-        Router::get('/index', [OrderController::class, 'index']);
+        Router::get('/index', [FooterController::class, 'index']);
         //搜索并获取底部导航
-        Router::post('/getFooterCategory', [OrderController::class, 'getFooterCategory']);
+        Router::post('/getFooterCategory', [FooterController::class, 'getFooterCategory']);
         //添加底部导航
-        Router::post('/addFooterCategory', [OrderController::class, 'addFooterCategory']);
+        Router::post('/addFooterCategory', [FooterController::class, 'addFooterCategory']);
         //修改底部导航
-        Router::post('/upFooterCategory', [OrderController::class, 'upFooterCategory']);
+        Router::post('/upFooterCategory', [FooterController::class, 'upFooterCategory']);
         //删除底部导航
-        Router::post('/delFooterCategory', [OrderController::class, 'delFooterCategory']);
+        Router::post('/delFooterCategory', [FooterController::class, 'delFooterCategory']);
         
         
         //添加底部导航(列表)内容
-        Router::post('/addFooterContent', [OrderController::class, 'addFooterContent']);
+        Router::post('/addFooterContent', [FooterController::class, 'addFooterContent']);
         //搜索并获取底部导航(列表)内容
-        Router::post('/getFooterContent', [OrderController::class, 'getFooterContent']);
+        Router::post('/getFooterContent', [FooterController::class, 'getFooterContent']);
         //修改底部导航(列表)内容
-        Router::post('/upFooterContent', [OrderController::class, 'upFooterContent']);
+        Router::post('/upFooterContent', [FooterController::class, 'upFooterContent']);
         //删除底部导航(列表)内容
-        Router::post('/delFooterContent', [OrderController::class, 'delFooterContent']);
+        Router::post('/delFooterContent', [FooterController::class, 'delFooterContent']);
         
 
     },
     ['middleware' => [FooMiddleware::class]]
 );
+ 

+ 9 - 0
config/autoload/services.php

@@ -93,5 +93,14 @@ return [
                 ['host' => '127.0.0.1', 'port' => 9509],
             ],
         ],
+        [
+            //底部导航服务
+            'name' => 'FooterService',
+            'service' => \App\JsonRpc\FooterServiceInterface::class,
+            // 直接对指定的节点进行消费,通过下面的 nodes 参数来配置服务提供者的节点信息
+            'nodes' => [
+                ['host' => '127.0.0.1', 'port' => 9510],
+            ],
+        ],
     ],
 ];

+ 1 - 1
config/routes.php

@@ -36,4 +36,4 @@ require __DIR__ . '/api/website.php';
 require __DIR__ . '/api/web.php';
 require __DIR__ . '/api/order.php';
 require __DIR__ . '/api/collector.php';
-
+require __DIR__ . '/api/footer.php';