采集器相关验证器代码合并及获取验证码

app/Controller/CollectorController.php

@@ -485,7 +485,7 @@ class CollectorController extends AbstractController
                 
         }
 
-        if(isset($requireData['writer_class']) && $requireData['type'] != 3){
+        if(isset($requireData['writer_class']) && $requireData['type'] == 2){
             $validator = $this->validationFactory->make(
                 $requireData,
                 [
@@ -606,54 +606,6 @@ class CollectorController extends AbstractController
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
-        if(isset($requireData['title'])){
-            $validator = $this->validationFactory->make(
-                $requireData,
-                [
-                    'title' => 'required'
-                ],
-                [
-                    'title.required' => '资讯题目不能为空'
-                ]
-            ); 
-            if ($validator->fails()) {
-                $errorMessage = $validator->errors()->first();
-                return Result::error($errorMessage);
-            }
-        }
-        if(isset($requireData['source'])){
-            $validator = $this->validationFactory->make(
-                $requireData,
-                [
-                    'source' => 'required'
-                ],
-                [
-                    'source.required' => '资讯来源不能为空'
-                ]
-            ); 
-            if ($validator->fails()) {
-                $errorMessage = $validator->errors()->first();
-                return Result::error($errorMessage);
-            }
-
-
-
-        }
-        if(isset($requireData['state'])){
-            $validator = $this->validationFactory->make(
-                $requireData,
-                [
-                    'state' => 'required'
-                ],
-                [
-                    'state.required' => '资讯状态不能为空'
-                ]
-            ); 
-            if ($validator->fails()) {
-                $errorMessage = $validator->errors()->first();
-                return Result::error($errorMessage);
-            }
-        }
         $result = $this->collectorServiceClient->getInfo($requireData);        
         return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
     }
@@ -693,7 +645,6 @@ class CollectorController extends AbstractController
             [
                 'art_id' => 'required',
                 'title' => 'required',
-                'level' => 'required',
                 'keyword' => 'required',
                 'content' => 'required',
                 'hits' => 'required',
@@ -703,7 +654,6 @@ class CollectorController extends AbstractController
             [
                 'art_id.required' => '资讯id不能为空',
                 'title.required' => '资讯标题不能为空',
-                'level.required' => '推荐级别不能为空',
                 'keyword.required' => '资讯关键词不能为空',
                 'content.required' => '资讯内容不能为空',
                 'hits.required' => '浏览量不能为空',

app/Controller/IndexController.php

@@ -1,68 +1,90 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Controller;
-
-use App\Tools\CommonService;
-use App\Tools\PublicData;
-use Hyperf\Di\Annotation\Inject;
-use Hyperf\HttpServer\Contract\RequestInterface;
-use Hyperf\Validation\Contract\ValidatorFactoryInterface;
-use App\Request\FooRequest;
-use App\Request\SceneRequest;
-use App\Tools\Result;
-use ZipArchive;
-
-
-class IndexController extends AbstractController
-{
-    #[Inject]
-    protected ValidatorFactoryInterface $validationFactory;
-
-    public function index(RequestInterface $request){
-        $validator = $this->validationFactory->make(
-            $request->all(),
-            [
-                'foo' => 'required',
-                'bar' => 'required',
-            ],
-            [
-                'foo.required' => 'foo必填',
-                'bar.required' => 'bar必填',
-            ]
-        );
-
-        if ($validator->fails()){
-            // Handle exception
-            $errorMessage = $validator->errors()->first();
-            var_dump($errorMessage);
-        }
-    }
-
-    public function verifyCode()
-    {
-        $comm = new CommonService();
-        $ip = $comm->userIp();
-        $redis = $this->container->get(\Hyperf\Redis\Redis::class);
-
-        $config = new \EasySwoole\VerifyCode\Config();
-        $code = new \EasySwoole\VerifyCode\VerifyCode($config);
-        $img_code = '';
-        $characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
-        $charLength = strlen($characters);
-        for ($i = 0; $i < 4; $i++) {
-            $img_code .= $characters[rand(0, $charLength - 1)];
-        }
-        //重写验证码
-        $result = $code->DrawCode((string)$img_code);
-        $img_code = $result->getImageCode();
-        //写入缓存 用于其他方法验证 并且设置过期时间
-        $redis->set('code'.$ip,$img_code,60000);
-        return $result?Result::success($result->getImageBase64()):Result::error('失败');
-//        return $result->getImageBase64();
-
-    }
-    // 1
-
-}
+<?php
+
+declare(strict_types=1);
+
+namespace App\Controller;
+
+use App\Tools\CommonService;
+use App\Tools\PublicData;
+use Hyperf\Di\Annotation\Inject;
+use Hyperf\HttpServer\Contract\RequestInterface;
+use Hyperf\Validation\Contract\ValidatorFactoryInterface;
+use App\Request\FooRequest;
+use App\Request\SceneRequest;
+use App\Tools\Result;
+use ZipArchive;
+
+
+class IndexController extends AbstractController
+{
+    #[Inject]
+    protected ValidatorFactoryInterface $validationFactory;
+
+    public function index(RequestInterface $request){
+        $validator = $this->validationFactory->make(
+            $request->all(),
+            [
+                'foo' => 'required',
+                'bar' => 'required',
+            ],
+            [
+                'foo.required' => 'foo必填',
+                'bar.required' => 'bar必填',
+            ]
+        );
+
+        if ($validator->fails()){
+            // Handle exception
+            $errorMessage = $validator->errors()->first();
+            var_dump($errorMessage);
+        }
+    }
+
+    public function verifyCode()
+    {
+        $comm = new CommonService();
+        $ip = $comm->userIp();
+        $redis = $this->container->get(\Hyperf\Redis\Redis::class);
+
+        $config = new \EasySwoole\VerifyCode\Config();
+        $code = new \EasySwoole\VerifyCode\VerifyCode($config);
+        $img_code = '';
+        $characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+        $charLength = strlen($characters);
+        for ($i = 0; $i < 4; $i++) {
+            $img_code .= $characters[rand(0, $charLength - 1)];
+        }
+        //重写验证码
+        $result = $code->DrawCode((string)$img_code);
+        $img_code = $result->getImageCode();
+        //写入缓存 用于其他方法验证 并且设置过期时间
+        $redis->set('code'.$ip,$img_code,60000);
+        return $result?Result::success($result->getImageBase64()):Result::error('失败');
+//        return $result->getImageBase64();
+
+    }
+    // 1
+    /**
+     * 获取验证码
+     */
+    public function getverifyCode(){
+        $comm = new CommonService();
+        $ip = $comm->userIp();
+        $redis = $this->container->get(\Hyperf\Redis\Redis::class);
+
+        $config = new \EasySwoole\VerifyCode\Config();
+        $code = new \EasySwoole\VerifyCode\VerifyCode($config);
+        $img_code = '';
+        $characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+        $charLength = strlen($characters);
+        for ($i = 0; $i < 4; $i++) {
+            $img_code .= $characters[rand(0, $charLength - 1)];
+        }
+        //重写验证码
+        $result = $code->DrawCode((string)$img_code);
+        $img_code = $result->getImageCode();
+        //写入缓存 用于其他方法验证 并且设置过期时间
+        $redis->set('code'.$ip,$img_code,60000);
+        return $result?Result::success($img_code):Result::error('失败');
+    }
+}

config/api/public.php

@@ -6,7 +6,7 @@ use App\Middleware\Auth\FooMiddleware;
 use Hyperf\HttpServer\Router\Router;
 
 Router::addRoute(['GET', 'POST'], '/verifyCode', 'App\Controller\IndexController@verifyCode');
-
+Router::addRoute(['GET', 'POST'], '/getverifyCode', 'App\Controller\IndexController@getverifyCode');
 Router::addGroup(
     '/public', function () {
         Router::get('/getDistrictList', [PublicController::class, 'getDistrictList']);