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

@@ -3,20 +3,12 @@
 namespace App\Console\Commands\Test;
 namespace App\Console\Commands\Test;
 
 
 use App\Helper\Arr;
 use App\Helper\Arr;
-use App\Models\Collect\CollectTask;
 use App\Models\Com\Notify;
 use App\Models\Com\Notify;
-use App\Models\Com\UpdateLog;
-use App\Models\Com\UpdateVisit;
 use App\Models\Devops\ServerConfig;
 use App\Models\Devops\ServerConfig;
+use App\Models\Devops\ServersIp;
 use App\Models\Domain\DomainInfo;
 use App\Models\Domain\DomainInfo;
-use App\Models\Product\Product;
 use App\Models\Project\Project;
 use App\Models\Project\Project;
-use App\Services\ProjectServer;
-use App\Utils\HttpUtils;
-use GuzzleHttp\Exception\GuzzleException;
 use Illuminate\Console\Command;
 use Illuminate\Console\Command;
-use Illuminate\Support\Facades\DB;
-use Symfony\Component\Process\Process;
 
 
 class Temp extends Command
 class Temp extends Command
 {
 {
@@ -34,55 +26,72 @@ class Temp extends Command
      */
      */
     protected $description = '临时脚本';
     protected $description = '临时脚本';
 
 
-    public function handle(){
-        ProjectServer::useProject(1515);
-
-        $products = Product::select(['id','content'])->get();
+    public function handle()
+    {
+        $notify_model = new Notify();
 
 
-        foreach ($products as $product){
-            $content = $product->content;
-            $content = str_replace('<h1','<h2', $content);
-            $content = str_replace('</h1','</h2', $content);
+        $domain_list = DomainInfo::where('status', 1)->where('amp_status', 1)->get();
 
 
-            $product->content = $content;
-            $product->save();
+        foreach ($domain_list as $domain) {
+            $project_id = $domain->project_id;
+            $domain = $domain->domain;
 
 
-            $this->output('productID:'.$product->id.',success');
-        }
+            $this->output('项目id:' . $project_id . ',start');
 
 
-        $this->output('end');
-    }
+            //获取项目所在服务器
+            $project_model = new Project();
+            $project_info = $project_model->read(['id' => $project_id], ['serve_id']);
+            if (!$project_info) {
+                $this->output('未查询到项目数据');
+            }
+            $serve_ip_model = new ServersIp();
+            $serve_ip_info = $serve_ip_model->read(['id' => $project_info['serve_id']], ['servers_id']);
+            if (!$serve_ip_info) {
+                $this->output('未查询到服务器数据');
+            }
+            $servers_id = $serve_ip_info['servers_id'];
 
 
-    public function check_cname($domain, $server_info)
-    {
-        $checkA = false;
-        $checkCname = false;
+            if ($servers_id == ServerConfig::SELF_SITE_ID) {
+                //自建站服务器：如果项目已经上线，不请求C端接口，数据直接入库
+                //判断是否已有更新进行中
+                $data = [
+                    'project_id' => $project_id,
+                    'type' => 3,
+                    'route' => 1,
+                    'server_id' => ServerConfig::SELF_SITE_ID,
+                    'status' => ['!=', Notify::STATUS_FINISH_SITEMAP]
+                ];
+                $notify = $notify_model->read($data, ['id']);
 
 
-        $process = new Process(['nslookup', '-qt=a', $domain]);
-        $process->run();
-        $output = explode(PHP_EOL, $process->getOutput());
-        foreach ($output as $line) {
-            if ($line) {
-                $checkA = strpos($line, $server_info['ip']) !== false;
-                if ($checkA) {
-                    return $domain;
-                }
-            }
-        }
+                if (!$notify) {
+                    $domain_array = parse_url($domain);
+                    $host = $domain_array['host'] ?? $domain_array['path'];
+                    $host_array = explode('.', $host);
+                    if (count($host_array) <= 2) {
+                        array_unshift($host_array, 'm');
+                    } else {
+                        $host_array[0] = 'm';
+                    }
+                    $domain = implode('.', $host_array);
 
 
-        //是否cname
-        $process = new Process(['nslookup', '-qt=cname', $domain]);
-        $process->run();
-        $output = explode(PHP_EOL, $process->getOutput());
-        foreach ($output as $line) {
-            if ($line) {
-                $checkCname = (strpos($line, $server_info['domain']) !== false);
-                if ($checkCname) {
-                    return $domain;
+                    $data['data'] = Arr::a2s(['domain' => $domain, 'url' => [], 'language' => []]);
+                    $data['status'] = Notify::STATUS_INIT;
+                    $notify_model->add($data);
                 }
                 }
+            } else {
+                //其他服务器：请求对应C端接口
+                $c_url = $domain . '/api/update_page/';
+                $param = [
+                    'project_id' => $project_id,
+                    'type' => 3,
+                    'route' => 1,
+                    'url' => [],
+                    'language' => []
+                ];
+                http_post($c_url, json_encode($param));
             }
             }
+            $this->output('项目id:' . $project_id . ',end');
         }
         }
-        return false;
     }
     }
 
 
     public function output($msg)
     public function output($msg)

@@ -196,7 +196,7 @@ class PrivateController extends BaseController
             return $this->error('未找到当前域名对应的项目！');
             return $this->error('未找到当前域名对应的项目！');
         }
         }
         ProjectServer::useProject($project->id);
         ProjectServer::useProject($project->id);
-        $feature_category = Category::whereIn('title', ['Featured','featured'])->pluck('id');
+        $feature_category = Category::whereIn('title', ['Featured','featured', 'Featured Products'])->pluck('id');
         $feature_product = CategoryRelated::whereIn('cate_id',$feature_category)->pluck('product_id')->unique()->toArray();
         $feature_product = CategoryRelated::whereIn('cate_id',$feature_category)->pluck('product_id')->unique()->toArray();
         $product_route = Product::where(['status' => Product::STATUS_ON])->whereNotIn('id', $feature_product)->pluck('route')->toArray();
         $product_route = Product::where(['status' => Product::STATUS_ON])->whereNotIn('id', $feature_product)->pluck('route')->toArray();
         return $this->success($product_route);
         return $this->success($product_route);