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

+<?php
+
+namespace App\Console\Commands\Test;
+
+use App\Models\SyncSubmitTask\SyncSubmitTask;
+use App\Models\Visit\Visit;
+use App\Services\ProjectServer;
+use Illuminate\Console\Command;
+
+class InquiryVisit extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'temp_inquiry_visit';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = '临时脚本(akun)';
+
+    public function handle()
+    {
+        $list = SyncSubmitTask::select(['id', 'project_id', 'data', 'created_at'])->where('project_id', '>', 0)->where('type', 'inquiry')->where('status', 1)->get();
+
+        foreach ($list as $item) {
+            $project_id = $item->project_id;
+            $data = $item->data;
+            $day_time = substr($item->created_at, 0, 10);
+            ProjectServer::useProject($project_id);
+
+            $visit = Visit::where("ip", $data['ip'])->where("created_at", ">=", $day_time . ' 00:00:00')
+                ->where("created_at", "<=", $day_time . ' 23:59:59')
+                ->first();
+            if ($visit) {
+                $visit->is_inquiry = 1;
+                $visit->save();
+                dump($item->id);
+            }
+        }
+    }
+}

@@ -379,6 +379,12 @@ class Project extends Base
             //是否正式域名
             //是否正式域名
             if (!$project_id) {
             if (!$project_id) {
                 $domainModel = new DomainInfoModel();
                 $domainModel = new DomainInfoModel();
+
+                //M站特殊域名处理
+                if($domain == 'm.sinophorus.com'){
+                    $domain = 'en.sinophorus.com';
+                }
+
                 $project_id = $domainModel->formatQuery(['domain'=>$domain,'status'=>1])->value('project_id');
                 $project_id = $domainModel->formatQuery(['domain'=>$domain,'status'=>1])->value('project_id');
                 if (empty($project_id)) {
                 if (empty($project_id)) {
                     //是否小语种域名或amp站域名
                     //是否小语种域名或amp站域名