Merge branch 'master' of http://47.244.231.31:8099/zhl/globalso-v6 into lyh-server

@@ -771,7 +771,7 @@ class RelayInquiry extends Command
      */
      */
     public function getInquiry($num = 10)
     public function getInquiry($num = 10)
     {
     {
-        $result = ReInquiryForm::where(['status' => ReInquiryForm::STATUS_INIT])->orderBy('id', 'asc')->limit($num)->get();
+        $result = ReInquiryForm::where(['status' => ReInquiryForm::STATUS_INIT])->where('created_at', '>', '2025-04-27 00:00:00')->orderBy('id', 'asc')->limit($num)->get();
         return $result;
         return $result;
     }
     }
 
 

@@ -9,6 +9,7 @@ namespace App\Console\Commands\Monitor;
 
 
 use App\Models\Domain\DomainInfo;
 use App\Models\Domain\DomainInfo;
 use App\Models\Product\Keyword;
 use App\Models\Product\Keyword;
+use App\Models\Project\DeployOptimize;
 use App\Models\Project\OnlineCheck;
 use App\Models\Project\OnlineCheck;
 use App\Models\Project\Project;
 use App\Models\Project\Project;
 use App\Repositories\ToolRepository;
 use App\Repositories\ToolRepository;
@@ -259,9 +260,29 @@ class Supervisory extends Command
         file_put_contents(storage_path('data/robots/' . date('Ymd'). 'log.json'), json_encode($tmp, 256));
         file_put_contents(storage_path('data/robots/' . date('Ymd'). 'log.json'), json_encode($tmp, 256));
         unset($tmp);
         unset($tmp);
 
 
+        // 所有路由
         $domain = array_column($spot_projects, 'domain');
         $domain = array_column($spot_projects, 'domain');
         $domain = array_unique(array_filter($domain));
         $domain = array_unique(array_filter($domain));
 
 
+        // 通知对应优化师
+        $tmp = [];
+        foreach ($spot_projects as $item) {
+            $tmp[$item['domain']] = $item['project_id'];
+        }
+        $project_ids = array_column($spot_projects, 'project_id');
+        $optimist = DeployOptimize::leftJoin('gl_manage', 'gl_project_deploy_optimize.optimist_mid', '=', 'gl_manage.id')
+            ->whereIn('project_id', $project_ids)
+            ->pluck('mobile', 'project_id')
+            ->toArray();
+
+        $notice = [];
+        $all_url = array_merge($error_url, $error, $page_404, $tdk_error);
+        foreach ($all_url as $url) {
+            if (FALSE == empty($optimist[$tmp[parse_url($url, PHP_URL_HOST)]]))
+                $notice[] = '86' . $optimist[$tmp[parse_url($url, PHP_URL_HOST)]];
+        }
+        $notice = array_filter(array_unique($notice));
+
         $message[] = '开启robots项目数：' . count($robots_ids);
         $message[] = '开启robots项目数：' . count($robots_ids);
         $message[] = '关闭robots项目：' . ($close_ids ? implode(',', $close_ids) : '无');
         $message[] = '关闭robots项目：' . ($close_ids ? implode(',', $close_ids) : '无');
         $message[] = '抽查项目数量: ' . count($domain);
         $message[] = '抽查项目数量: ' . count($domain);
@@ -282,6 +303,7 @@ class Supervisory extends Command
             'keyword' => '项目数据推送',
             'keyword' => '项目数据推送',
             'msg' => $msg,
             'msg' => $msg,
             'isAtAll' => false, // 是否@所有人
             'isAtAll' => false, // 是否@所有人
+            'atMobiles' => $notice
         ];
         ];
         $dingService->handle($body, $link);
         $dingService->handle($body, $link);
     }
     }

@@ -143,7 +143,8 @@ class FormGlobalsoApi
      */
      */
     public function submitInquiry($ip, $referer, $submit_at, $data, $traffic = 0)
     public function submitInquiry($ip, $referer, $submit_at, $data, $traffic = 0)
     {
     {
-        $api_url = $this->url . '/api/external-interface/add/fa043f9cbec6b38f';
+//        $api_url = $this->url;
+        $api_url = 'https://form.globalso.com/api/external-interface/add/fa043f9cbec6b38f';
 
 
         $data['ip'] = $ip;
         $data['ip'] = $ip;
         $data['token'] = md5($referer . $data['name'] . $ip . date("Y-m-d"));
         $data['token'] = md5($referer . $data['name'] . $ip . date("Y-m-d"));

@@ -10,6 +10,7 @@ use App\Models\RouteMap\RouteMap;
 use App\Services\ProjectServer;
 use App\Services\ProjectServer;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Str;
 
 
 class Keyword extends Base
 class Keyword extends Base
 {
 {
@@ -136,6 +137,18 @@ class Keyword extends Base
                 foreach ($suffix_array as $suffix) {
                 foreach ($suffix_array as $suffix) {
                     array_push($result, trim($keyword . $suffix));
                     array_push($result, trim($keyword . $suffix));
                     array_push($result, trim($prefix . $keyword . $suffix));
                     array_push($result, trim($prefix . $keyword . $suffix));
+
+                    // 复数形式， 需要将单数的词也拼接上
+                    if (Str::contains($suffix, ['Products', 'Exporters', 'Suppliers', 'Manufacturers'])) {
+                        $suffix = trim($suffix, 's');
+                        array_push($result, trim($keyword . $suffix));
+                        array_push($result, trim($prefix . $keyword . $suffix));
+                    }
+                    if (Str::contains($suffix, [ 'Companies', 'Factories'])) {
+                        $suffix = trim($suffix, 'ies');
+                        array_push($result, trim($keyword . $suffix . 'y'));
+                        array_push($result, trim($prefix . $keyword . $suffix . 'y'));
+                    }
                 }
                 }
             } catch (\Exception $e) {
             } catch (\Exception $e) {
                 continue;
                 continue;

@@ -39,7 +39,7 @@ class DingService
                     'content' => $body['keyword'] . PHP_EOL . $body['msg']
                     'content' => $body['keyword'] . PHP_EOL . $body['msg']
                 ],
                 ],
                 'at' => [
                 'at' => [
-                    'atMobiles' => [],
+                    'atMobiles' => $body['atMobiles'],
                     'atUserIds' => [],
                     'atUserIds' => [],
                     'isAtAll' => $body['isAtAll'],
                     'isAtAll' => $body['isAtAll'],
                 ]
                 ]