解决冲突

app/Controller/AdController.php

@@ -14,6 +14,7 @@ use Hyperf\Logger;
 use Hyperf\Validation\Contract\ValidatorFactoryInterface;
 use Hyperf\Context\Context;
 
+
 /**
  * Class AdController
  * @package App\Controller

app/Controller/IndexController.php

@@ -15,6 +15,7 @@ use App\Tools\Result;
 use ZipArchive;
 
 
+
 class IndexController extends AbstractController
 {
     #[Inject]

app/Controller/LinkController.php

@@ -13,6 +13,7 @@ use Hyperf\Context\Context;
 use Hyperf\Logger;
 use Hyperf\Validation\Contract\ValidatorFactoryInterface;
 
+
 /**
  * Class LinkController
  * @package App\Controller

app/Controller/NewsController.php

@@ -457,5 +457,29 @@ class NewsController extends AbstractController
         return $result['code']==200 ? Result::success($result['data']) : Result::error($result['message']);
     }
 
+    /**
+     * 检测导航池名称是否存在
+     * @return array
+     */
+    public function  checkCategoryName()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'name'=> 'required',
+            ],
+            [
+                'name.required' => 'name不能为空',
+            ]
+        );
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+
+        $result = $this->newsServiceClient->checkCategoryName($requireData);
+        return $result['code']==200 ? Result::success($result['data']) : Result::error($result['message']);
+    }
 
 }

app/JsonRpc/NewsService.php

@@ -150,6 +150,15 @@ class NewsService extends AbstractServiceClient implements NewsServiceInterface
     {
         return $this->__request(__FUNCTION__, $data);
     }
+
+    /**
+     * @param array $data
+     * @return array|mixed
+     */
+    public function checkCategoryName(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
     
     /**
      * @param array $data

app/JsonRpc/NewsServiceInterface.php

@@ -83,4 +83,11 @@ interface NewsServiceInterface
      */
     public function getWebsiteArticleList(array $data);
 
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function checkCategoryName(array $data);
+
 }
+

app/Middleware/Auth/FooMiddleware.php

@@ -1,81 +1,81 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Middleware\Auth;
-
-use Hyperf\HttpServer\Contract\RequestInterface;
-use Hyperf\HttpServer\Contract\ResponseInterface as HttpResponse;
-use Psr\Container\ContainerInterface;
-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\ServerRequestInterface;
-use Psr\Http\Server\MiddlewareInterface;
-use Psr\Http\Server\RequestHandlerInterface;
-use Hyperf\Context\Context;
-
-use Phper666\JWTAuth\JWT;
-class FooMiddleware implements MiddlewareInterface
-{
-    protected ContainerInterface $container;
-
-    protected RequestInterface $request;
-
-    protected HttpResponse $response;
-    protected JWT $JWT;
-
-    public function __construct(ContainerInterface $container, HttpResponse $response, RequestInterface $request,Jwt $JWT)
-    {
-        $this->container = $container;
-        $this->response = $response;
-        $this->request = $request;
-        $this->JWT = $JWT;
-
-    }
-
-    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
-    {
-
-        $header = $request->getHeaders();
-        try {
-            if($header &&  isset($header['token']) && $header['token'][0]!='null' && $header['token'][0]!='' && isset($header['token'][0])){
-                var_dump("token类型：",$header['token'][0]);
-                $ver = $this->JWT->getClaimsByToken($header['token'][0]);
-                $tokenTime =  $this->JWT->getTokenDynamicCacheTime($header['token'][0]);
-                if($tokenTime==0){
-                   return $this->response->json(
-                       [
-                           'code' => -1,
-                           'data' => [],
-                           'message' => 'token无效,请重新登录',
-                       ]
-                   );
-                }
-//                var_dump("中间件：",$ver);
-                Context::set("UserId",$ver['uid']);
-                Context::set("TypeId",$ver['type_id']);
-                if ($ver) {
-                    return $handler->handle($request);
-                }
-            }else{
-                return $this->response->json(
-                    [
-                        'code' => -1,
-                        'data' => [],
-                        'message' => 'token无效,请重新登录',
-                    ]
-                );
-            }
-
-        }catch (\Exception $e){
-            var_dump("错误消息1：",$e->getMessage(),$e->getCode());
-            return $this->response->json(
-                [
-                    'code' => $e->getCode(),
-                    'data' => [],
-                    'message' => $e->getMessage(),
-                ]
-            );
-        }
-        return false;
-    }
-}
+<?php
+
+declare(strict_types=1);
+
+namespace App\Middleware\Auth;
+
+use Hyperf\HttpServer\Contract\RequestInterface;
+use Hyperf\HttpServer\Contract\ResponseInterface as HttpResponse;
+use Psr\Container\ContainerInterface;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Server\MiddlewareInterface;
+use Psr\Http\Server\RequestHandlerInterface;
+use Hyperf\Context\Context;
+
+use Phper666\JWTAuth\JWT;
+class FooMiddleware implements MiddlewareInterface
+{
+    protected ContainerInterface $container;
+
+    protected RequestInterface $request;
+
+    protected HttpResponse $response;
+    protected JWT $JWT;
+
+    public function __construct(ContainerInterface $container, HttpResponse $response, RequestInterface $request,Jwt $JWT)
+    {
+        $this->container = $container;
+        $this->response = $response;
+        $this->request = $request;
+        $this->JWT = $JWT;
+
+    }
+
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
+    {
+
+        $header = $request->getHeaders();
+        try {
+            if($header &&  isset($header['token']) && $header['token'][0]!='null' && $header['token'][0]!='' && isset($header['token'][0])){
+                var_dump("token类型：",$header['token'][0]);
+                $ver = $this->JWT->getClaimsByToken($header['token'][0]);
+                $tokenTime =  $this->JWT->getTokenDynamicCacheTime($header['token'][0]);
+                if($tokenTime==0){
+                   return $this->response->json(
+                       [
+                           'code' => -1,
+                           'data' => [],
+                           'message' => 'token无效,请重新登录',
+                       ]
+                   );
+                }
+//                var_dump("中间件：",$ver);
+                Context::set("UserId",$ver['uid']);
+                Context::set("TypeId",$ver['type_id']);
+                if ($ver) {
+                    return $handler->handle($request);
+                }
+            }else{
+                return $this->response->json(
+                    [
+                        'code' => -1,
+                        'data' => [],
+                        'message' => 'token无效,请重新登录',
+                    ]
+                );
+            }
+
+        }catch (\Exception $e){
+            var_dump("错误消息1：",$e->getMessage(),$e->getCode());
+            return $this->response->json(
+                [
+                    'code' => $e->getCode(),
+                    'data' => [],
+                    'message' => $e->getMessage(),
+                ]
+            );
+        }
+        return false;
+    }
+}

config/api/news.php

@@ -34,6 +34,8 @@ Router::addGroup(
         Router::get('/getArticleInfo', [NewsController::class, 'getArticleInfo']);
         //获取导航池信息
         Router::get('/getCategoryInfo', [NewsController::class, 'getCategoryInfo']);
+        //检测导航池名称是否存在
+        Router::post('/checkCategoryName', [NewsController::class, 'checkCategoryName']);
          //前端-获取资讯列表
          Router::get('/getWebsiteArticleList', [NewsController::class, 'getWebsiteArticleList']);