Merge branch '20250919_testproducer_fr'添加缺少的更改

app/Controller/PublicController.php

@@ -1747,10 +1747,19 @@ class PublicController extends AbstractController
                 ]
             );
         }
-
-        $arr_catid = explode(',', $requireData['catid']);
-        $arr_web_site_id = explode(',', $requireData['web_site_id']);
-        if (count($arr_catid) != count($arr_web_site_id)) {
+        if (isset($requireData['content']) && is_string($requireData['content']) && stripos($requireData['content'], '<iframe') !== false) {
+            return $this->response->json(
+                [
+                    'id'    => uniqid(),
+                    'target'=> '采集失败',
+                    'desc'  => '内容包含iframe标签',
+                    'error' => '内容包含iframe标签'
+                ]
+            );
+        }
+        $arr_catid = explode(',',$requireData['catid']);
+        $arr_web_site_id = explode(',',$requireData['web_site_id']);
+        if(count($arr_catid) != count($arr_web_site_id)){
             return $this->response->json(
                 [
                     'id' => uniqid(),
@@ -1782,7 +1791,7 @@ class PublicController extends AbstractController
                 }
                 $loginIp = $this->request->getHeader('x-forwarded-for')[0] ?? $this->request->getHeader('x-real-ip')[0] ?? $this->request->getServerParams()['remote_addr'] ?? '0.0.0.0';
                 $requireData['ip'] = $loginIp;
-                $requireData['admin_user_id'] = 0;
+                $requireData['admin_user_id'] = 32;  
                 $requireData['level'] = isset($requireData['level']) &&  $requireData['level'] ? $requireData['level'] : 0;
                 $requireData['hits'] = isset($requireData['hits']) &&  $requireData['hits'] ? $requireData['hits'] : 0;
                 $requireData['is_original'] = isset($requireData['is_original']) &&  $requireData['is_original'] ? $requireData['is_original'] : 0;
@@ -3073,11 +3082,11 @@ class PublicController extends AbstractController
         $validator = $this->validationFactory->make(
             $requireData,
             [
-                'keyword' => 'required',
+                // 'keyword' => 'required',
                 'type' => 'required'
             ],
             [
-                'keyword.required' => '关键词不能为空',
+                // 'keyword.required' => '关键词不能为空',
                 'type.required' => '类型不能为空'
             ]
         );

app/Controller/TestController.php

@@ -202,7 +202,7 @@ class TestController extends AbstractController
      */
     public function testCollectorProducer()
     {
-        $data['web_id'] = 49;
+        $data['web_id'] = 2;
         $data['pageSize'] = 1;
         $data['page'] = 1;
         $result =  $this->collectorServiceClient->getRule($data);