Merge branch 'develop' of http://47.244.231.31:8099/zhl/globalso-v6 into bate

张关杰
app/Console/Commands/Domain/DomainInfo.php
app/Console/Commands/KeywordInVideo/VideoTask.php
app/Console/Commands/MonthlyCount/UpgradeProjectCount.php
app/Console/Commands/SyncProject.php
app/Console/Commands/Update/ProjectUpdate.php
app/Helper/QuanqiusouApi.php
app/Http/Controllers/Aside/Com/IndexController.php
app/Http/Controllers/Aside/Com/KeywordVideoController.php
app/Http/Controllers/Bside/Product/KeywordController.php
app/Http/Logic/Aside/User/UserLogic.php
app/Http/Logic/Bside/HomeCount/CountLogic.php
app/Http/Logic/Bside/HomeCount/MonthCountLogic.php
app/Http/Logic/Bside/RankData/RankDataLogic.php
app/Http/Logic/Bside/Scoring/RatingLogic.php
app/Http/Logic/Bside/Setting/TranslateLogic.php
app/Jobs/CopyProjectJob.php
app/Models/Collect/CollectTask.php
app/Models/Com/KeywordVideoTask.php
app/Models/Com/KeywordVideoTaskLog.php
app/Models/Com/UpdateLog.php
--- a/app/Console/Commands/Domain/DomainInfo.php
查看文件 @591136a
+++ b/app/Console/Commands/Domain/DomainInfo.php
查看文件 @591136a
@@ -11,7 +11,6 @@ namespace App\Console\Commands\Domain;
 use Illuminate\Console\Command;
 use App\Models\Domain\DomainInfo as DomainInfoModel;
-use Illuminate\Support\Facades\Log;
 class DomainInfo extends Command
 {
@@ -36,37 +35,106 @@ class DomainInfo extends Command
      * @method :post
      * @time   :2023/9/11 15:09
      */
-    public function handle(){
+    public function handle()
+    {
+        //更新域名到期时间
+        $this->startUpdateDomain();
+
+        //主站证书到期更新
+        $this->startUpdateCert();
+
+        //AMP站证书到期更新
+        $this->startUpdateAmpCert();
+
+        return true;
+    }
+
+    /**
+     * 更新域名到期时间
+     * @author Akun
+     * @date 2024/02/26 10:26
+     */
+    public function startUpdateDomain()
+    {
+        $domainModel = new DomainInfoModel();
+        $list = $domainModel->where('status', '!=', 2)->where(function ($query) {
+            $query->whereNull('domain_end_time')->orWhere('domain_end_time', '<', date('Y-m-d H:i:s'));
+        })->get()->toArray();
+        foreach ($list as $v) {
+            $time = $this->updateDomain($v['domain']);
+            $data = [
+                'domain_start_time' => $time['start'],
+                'domain_end_time' => $time['end']
+            ];
+
+            $domainModel->edit($data, ['id' => $v['id']]);
+        }
+    }
+
+    /**
+     * 主站证书到期更新
+     * @author Akun
+     * @date 2024/02/26 10:26
+     */
+    public function startUpdateCert()
+    {
         $domainModel = new DomainInfoModel();
-        $map = ['status'=>['!=',2]];
-        $list = $domainModel->list($map);
-        foreach ($list as $v){
-            if(empty($v['private_key']) || empty($v['private_cert'])){
-                //域名结束时间<2天时，重新生成
-                if(!empty($v['certificate_end_time'])){
-                    if(($v['certificate_end_time'] > date('Y-m-d H:i:s',time() + 24*3600)) || ($v['certificate_end_time'] < date('Y-m-d H:i:s',time()))){
+        $end_day = date('Y-m-d H:i:s', time() + 2 * 24 * 3600);//2天后到期
+        $list = $domainModel->where('status', '!=', 2)->where(function ($query) use ($end_day) {
+            $query->whereNull('certificate_end_time')->orWhere('certificate_end_time', '<', $end_day);
+        })->get()->toArray();
+        foreach ($list as $v) {
+            //更新证书到期时间
+            $data = [];
+            $ssl = $this->updateDomainSsl($v['domain']);
+            $ssl['from'] && $data['certificate_start_time'] = $ssl['from'];
+            $ssl['to'] && $data['certificate_end_time'] = $ssl['to'];
+
+            $domainModel->edit($data, ['id' => $v['id']]);
+
+            if ($v['type'] == 1 && ($data['certificate_end_time'] ?? '') < $end_day) {
+                //申请免费证书
                 $this->updatePrivate($v);
             }
         }
     }
-            $ssl = $this->updateDomainSsl($v['domain']);
-            $time = $this->updateDomain($v['domain']);
-            if(!empty($time['start']) && !!empty($time['end'])){
-                $data = [
-                    'certificate_start_time'=>$ssl['from'],
-                    'certificate_end_time'=>$ssl['to'],
-                    'domain_start_time'=>$time['start'],
-                    'domain_end_time'=>$time['end']
-                ];
-            }else{
-                $data = [
-                    'domain_start_time'=>$time['start'],
-                    'domain_end_time'=>$time['end']
-                ];
+
+    /**
+     * AMP站证书到期更新
+     * @author Akun
+     * @date 2024/02/26 10:26
+     */
+    public function startUpdateAmpCert()
+    {
+        $domainModel = new DomainInfoModel();
+        $end_day = date('Y-m-d H:i:s', time() + 2 * 24 * 3600);//2天后到期
+        $list = $domainModel->where('status', '!=', 2)->where('amp_status', 1)->where(function ($query) use ($end_day) {
+            $query->whereNull('amp_certificate_end_time')->orWhere('amp_certificate_end_time', '<', $end_day);
+        })->get()->toArray();
+        foreach ($list as $v) {
+            //更新amp站点证书到期时间
+            $domain_array = parse_url($v['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';
+            }
+            $amp_domain = implode('.', $host_array);
+
+            $data = [];
+            $ssl = $this->updateDomainSsl($amp_domain);
+            $ssl['from'] && $data['amp_certificate_start_time'] = $ssl['from'];
+            $ssl['to'] && $data['amp_certificate_start_time'] = $ssl['to'];
+
+            $domainModel->edit($data, ['id' => $v['id']]);
+
+            if ($v['amp_type'] == 1 && ($data['amp_certificate_start_time'] ?? '') < $end_day) {
+                //申请免费证书
+                $this->updateAmpPrivate($v['domain']);
             }
-            $domainModel->edit($data,['id'=>$v['id']]);
         }
-        return 1;
     }
     /**
@@ -78,7 +146,7 @@ class DomainInfo extends Command
      */
     public function updatePrivate($param)
     {
-        $url = 'https://' . $param['domain']. '/api/applySsl/';
+        $url = 'https://' . $param['domain'] . '/api/applySsl/';
         $top_domain = $this->getTopDomain($param['domain']);
         if ((empty($extend_config) || empty($extend_config[0]['origin'])) && $param['id'] != 3) {
             $extend_config = [
@@ -89,21 +157,40 @@ class DomainInfo extends Command
             'project_id' => $param['project_id'],
             'type' => 1,
             'route' => 1,
-            "domain" =>$param['domain'],
-            "rewrite"=> $extend_config ?? [],
+            "domain" => $param['domain'],
+            "rewrite" => $extend_config ?? [],
             'other_domain' => [$top_domain, '*.' . $top_domain],
             'private_key' => '',
             'cert' => ''
         ];
-        $result = $this->curlRequest($url, $param);
+        return $this->curlRequest($url, $param);
     }
-    public static function getTopDomain ($url) {
+    /**
+     * 更新证书
+     * @param $domain
+     * @return array
+     * @author Akun
+     * @date 2024/02/26 10:25
+     */
+    public function updateAmpPrivate($domain)
+    {
+        $url = 'https://' . $domain . '/api/createSiteAmp/';
+        $param = [
+            "domain" => $domain,
+            'private_key' => '',
+            'cert' => ''
+        ];
+        return $this->curlRequest($url, $param);
+    }
+
+    public static function getTopDomain($url)
+    {
         $url = strtolower($url);  //首先转成小写
         $url = mb_ereg_replace('^(　| )+', '', trim($url));
         $url = mb_ereg_replace('(　| )+$', '', $url);
         if (!preg_match('/^(http:\/\/|https)/', $url)) {
-            $url = "https://".$url;
+            $url = "https://" . $url;
         }
         $hosts = parse_url($url);
         $host = $hosts['host'] ?? '';
@@ -117,10 +204,10 @@ class DomainInfo extends Command
         $preg = '/[\w].+\.(com|net|org|gov|edu|co|ne)\.[\w]/';
         if (($n > 2) && preg_match($preg, $host)) {
             //双后缀取后3位
-            $host = $data[$n - 3].'.'.$data[$n - 2].'.'.$data[$n - 1];
+            $host = $data[$n - 3] . '.' . $data[$n - 2] . '.' . $data[$n - 1];
         } else {
             //非双后缀取后两位
-            $host = $data[$n - 2].'.'.$data[$n - 1];
+            $host = $data[$n - 2] . '.' . $data[$n - 1];
         }
         return $host;
     }
@@ -155,30 +242,33 @@ class DomainInfo extends Command
      * @method :post
      * @time   :2023/9/11 15:07
      */
-    public function updateDomainSsl($domain){
+    public function updateDomainSsl($domain)
+    {
         try {
             $context = stream_context_create([
                 'ssl' => [
                     'capture_peer_cert' => true,
                     'capture_peer_cert_chain' => false,
+                    'verify_peer' => false,
+                    'verify_peer_name' => false
                 ],
             ]);
-            $stream = stream_socket_client('ssl://'.$domain.':443', $errno, $errstr, 30, STREAM_CLIENT_CONNECT, $context);
-            if(!$stream) {
+            $stream = stream_socket_client('ssl://' . $domain . ':443', $errno, $errstr, 30, STREAM_CLIENT_CONNECT, $context);
+            if (!$stream) {
                 die("Failed to connect: $errno - $errstr");
             }
             $remote_cert = stream_context_get_params($stream)['options']['ssl']['peer_certificate'];
-            if(!$remote_cert) {
+            if (!$remote_cert) {
                 die("Failed to retrieve certificate");
             }
             $valid_from = date('Y-m-d H:i:s', openssl_x509_parse($remote_cert)['validFrom_time_t']);
             $valid_to = date('Y-m-d H:i:s', openssl_x509_parse($remote_cert)['validTo_time_t']);
             fclose($stream);
-        }catch (\Exception $e){
+        } catch (\Exception $e) {
             $valid_from = '';
             $valid_to = '';
         }
-        return ['from'=>$valid_from,'to'=>$valid_to];
+        return ['from' => $valid_from, 'to' => $valid_to];
     }
     /**
@@ -188,15 +278,16 @@ class DomainInfo extends Command
      * @method :post
      * @time   :2023/9/11 15:11
      */
-    public function updateDomain($domain){
-        $url = 'http://openai.waimaoq.com/v1/whois_api?domain='.$domain;
+    public function updateDomain($domain)
+    {
+        $url = 'http://openai.waimaoq.com/v1/whois_api?domain=' . $domain;
         $response = http_get($url);
         $start = date('Y-m-d H:i:s');
         $end = date('Y-m-d H:i:s');
-        if($response['code'] == 200){
+        if ($response['code'] == 200) {
             $start = $response['text']['creation_date'];
             $end = $response['text']['expiration_date'];
         }
-        return ['start'=>$start,'end'=>$end];
+        return ['start' => $start, 'end' => $end];
     }
 }
--- a/app/Console/Commands/KeywordInVideo/VideoTask.php 0 → 100644
查看文件 @591136a
+++ b/app/Console/Commands/KeywordInVideo/VideoTask.php 0 → 100644
查看文件 @591136a
+<?php
+/**
+ * Created by PhpStorm.
+ * User: zhl
+ * Date: 2024/02/26
+ * Time: 10:13
+ */
+namespace App\Console\Commands\KeywordInVideo;
+
+use App\Console\Commands\Model;
+use App\Console\Commands\TaskSub;
+use App\Enums\Common\Code;
+use App\Models\Com\KeywordVideoTask;
+use App\Models\Com\KeywordVideoTaskLog;
+use App\Models\Domain\DomainInfo;
+use App\Models\Product\Keyword;
+use App\Models\Product\Product;
+use App\Models\RouteMap\RouteMap;
+use App\Services\ProjectServer;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Http;
+use Illuminate\Support\Facades\Log;
+
+class VideoTask extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'video_task';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = '视频推广任务';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * @var int 最大子任务
+     */
+    public $max_sub_task = 800;
+
+    /**
+     * @return bool
+     */
+    public function handle()
+    {
+        Log::info('开始视频推广任务');
+        $this->createSubTask();
+        $this->sendSubTask();
+        Log::info('结束视频推广任务');
+        return true;
+    }
+
+    /**
+     * 创建子任务
+     * TODO 获取需要生成子任务的项目，获取项目中未生成视频的关键词，通过关键词生成初始化子任务
+     * @return bool
+     */
+    public function createSubTask()
+    {
+        $sub_task_num = $this->max_sub_task;
+        while (true) {
+            if ($sub_task_num <= 0){
+                break;
+            }
+            $task_project = KeywordVideoTask::where(['status' => KeywordVideoTask::STATUS_OPEN])->orderBy('sort', 'desc')->first();
+            if (empty($task_project)){
+                break;
+            }
+            ProjectServer::useProject($task_project->project_id);
+            $keyword = $this->getProjectKeyword();
+            // 已经没有需要生成视频的关键词
+            if (FALSE == $keyword->isEmpty()) {
+                $task_project->status = KeywordVideoTask::STATUS_CLOSE;
+                $task_project->save();
+                continue;
+            }
+            foreach ($keyword as $val) {
+                $log = KeywordVideoTaskLog::where(['project_id' => $task_project->project_id, 'keyword_id' => $val->id])->first();
+                if ($log){
+                    continue;
+                }
+                $keywordInfo = $this->getKeywordImage($val->id,$task_project->project_id);
+                $array = [
+                    'project_id' => $task_project->project_id,
+                    'keyword_id' => $val->id,
+                    'keyword' => $val->title,
+                    'data' => json_encode(['url' => $keywordInfo['url'],'title' => $keywordInfo['title'], 'description' => $keywordInfo['keyword_content'], 'images' => $keywordInfo['product_list'], 'keywords' => []]),
+                    'status' => KeywordVideoTaskLog::STATUS_INIT,
+                    'updated_at' => date('Y-m-d H:i:s'),
+                    'created_at' => date('Y-m-d H:i:s'),
+                ];
+                KeywordVideoTaskLog::insert($array);
+                $sub_task_num--;
+            }
+            $task_project->status = KeywordVideoTask::STATUS_CLOSE;
+            $task_project->save();
+        }
+        return true;
+    }
+
+    /**
+     * 发送子任务
+     * @return bool
+     */
+    public function sendSubTask()
+    {
+        $subTask = KeywordVideoTaskLog::where(['status' => TaskSub::STATUS_INIT])->orderBy('id', 'asc')->limit($this->max_sub_task)->get();
+        if ($subTask->isEmpty())
+            return true;
+        foreach ($subTask as $val) {
+            $valData = json_decode($val->data);
+            $task_id = 'v6-' . uniqid();
+            $data = [
+                'project_data' => [
+                    'tag_url' => $valData['url'],
+                    'title' => $valData['title'],
+                    'keywords' => [],
+                    'description' => $valData['description'],
+                    'images' => $valData['images']
+                ],
+                'task_id' => $task_id,
+                'callback_url' => url('a/getKeywordVideo?project_id='.$val->project_id.'&keyword_id='.$val->keyword_id.'&video='),
+            ];
+            $result = Http::post('http://216.250.255.116:7866/create_task', $data);
+            $val->task_id = $task_id;
+            $val->status = KeywordVideoTaskLog::STATUS_RUNING;
+            $val->request_result = $result;
+            $val->save();
+        }
+        return true;
+    }
+
+    /**
+     * 获取未生成页面的关键词
+     * @return mixed
+     */
+    public function getProjectKeyword()
+    {
+        $keyword = Keyword::where('video', null)->whereNotNull('keyword_content')->inRandomOrder()->take(100)->get();
+        return $keyword;
+    }
+
+    /**
+     * 获取需要处理的任务
+     * @return int
+     */
+    public function getTaskProject()
+    {
+//        $task_project = Model::where(['status' => Model::STATUS_OPEN])->orderBy('sort', 'desc')->first();
+        $project_id = 110;
+        return $project_id;
+    }
+
+    /**
+     * @remark :根据关键字获取产品主图
+     * @name   :getKeywordList
+     * @author :lyh
+     * @method :post
+     * @time   :2024/2/23 16:28
+     */
+    public function getKeywordImage($keyword_id,$project_id){
+        $keywordModel = new Keyword();
+        $keywordInfo = $keywordModel->read(['id'=>$keyword_id]);
+        $productModel = new Product();
+        $productList = $productModel->list(['keyword_id'=>['like','%,'.$keywordInfo['id'].',%']],['thumb','title']);
+        if(count($productList) < 5){
+            $productList = $productModel->list([],'sort',['thumb','title']);
+            //获取7个产品主图
+        }
+        $product_image = [];
+        foreach ($productList as  $v){
+            $image = [];
+            if(!empty($v['thumb']) && !empty($v['thumb']['url'])){
+                $image['image'] = getImageUrl($v['thumb']['url']);
+                $image['title'] = $v['title'];
+                $product_image[] = $image;
+            }
+            if(count($product_image) > 6){
+                break;
+            }
+        }
+        $domainModel = new DomainInfo();
+        $domainInfo = $domainModel->read(['project_id'=>$project_id]);
+        if(!empty($domainInfo)){
+            $keywordInfo['route'] = $domainInfo['domain'].'/'.$keywordInfo['route'];
+        }
+        $data = [
+            'url'=>$keywordInfo['route'],
+            'title'=>$keywordInfo['title'],
+            'keyword_title'=>$keywordInfo['keyword_title'],
+            'keyword_content'=>$keywordInfo['keyword_content'],
+            'product_list'=>$product_image
+        ];
+        return $data;
+    }
+}
--- a/app/Console/Commands/MonthlyCount/UpgradeProjectCount.php
查看文件 @591136a
+++ b/app/Console/Commands/MonthlyCount/UpgradeProjectCount.php
查看文件 @591136a
@@ -11,6 +11,7 @@ namespace App\Console\Commands\MonthlyCount;
 use App\Helper\FormGlobalsoApi;
 use App\Models\Com\UpdateOldInfo;
+use App\Models\Domain\DomainInfo;
 use App\Models\HomeCount\MonthCount;
 use App\Models\Project\Project;
 use App\Models\Visit\Visit;
@@ -39,7 +40,13 @@ class UpgradeProjectCount extends Command
         $project_id = $this->argument('project_id');
         $oldModel = new UpdateOldInfo();
         $info = $oldModel->read(['project_id'=>$project_id]);
+        if($info !== false){
             $url = $info['old_domain_online'];
+        }else{
+            $domainModel = new DomainInfo();
+            $info = $domainModel->read(['project_id'=>$project_id]);
+            $url = $info['domain'];
+        }
         ProjectServer::useProject($project_id);
         $this->count($project_id,$url);
         DB::disconnect('custom_mysql');
--- a/app/Console/Commands/SyncProject.php
查看文件 @591136a
+++ b/app/Console/Commands/SyncProject.php
查看文件 @591136a
@@ -237,7 +237,7 @@ class SyncProject extends Command
                     array_push($param['api_type'],'category_news');
                 }
                 foreach ($param['api_type'] as $v_type){
-                    if($v_type == 'category' || $v_type == 'category_news'){
+                    if($v_type == 'category' || $v_type == 'category_news' || $v_type == 'tag'){
                         UpdateLog::createLog($id,$v_type,$param['get_data_url']);
                     }else{
                         $task_list[] = $v_type;
--- a/app/Console/Commands/Update/ProjectUpdate.php
查看文件 @591136a
+++ b/app/Console/Commands/Update/ProjectUpdate.php
查看文件 @591136a
@@ -276,6 +276,7 @@ class ProjectUpdate extends Command
                             $model = new Product();
                             $category_model = new Category();
+                            $keyword_model = new Keyword();
                             $extend_model = new Extend();
                             $extend_info_model = new ExtendInfo();
                             $logic = new CategoryLogic();
@@ -297,6 +298,14 @@ class ProjectUpdate extends Command
                                         $category_arr = $category_model->list(['original_id' => ['in', array_column($item['category'], 'id')]]);
                                         $category_id = $logic->getLastCategory(array_column($category_arr, 'id'));
                                     }
+                                    //关键词
+                                    $keyword_id = '';
+                                    if ($item['tags'] ?? []) {
+                                        $keyword_arr = $keyword_model->list(['title' => ['in', array_column($item['tags'], 'name')]]);
+                                        if ($keyword_arr) {
+                                            $keyword_id = ',' . implode(',', array_column($keyword_arr, 'id')) . ',';
+                                        }
+                                    }
                                     //名称去掉特殊符号
                                     $item['ttile'] = $this->special2str($item['ttile'] ?? '');
@@ -309,6 +318,7 @@ class ProjectUpdate extends Command
                                                 'intro' => $item['short_description'] ?? '',
                                                 'content' => $item['content'] ?? '',
                                                 'category_id' => $category_id,
+                                                'keyword_id' => $keyword_id,
                                                 'thumb' => isset($gallery[0]) ? Arr::a2s($gallery[0]) : '',
                                                 'gallery' => Arr::a2s($gallery),
                                                 'seo_mate' => Arr::a2s([
@@ -333,6 +343,7 @@ class ProjectUpdate extends Command
                                                 'intro' => $item['short_description'] ?? '',
                                                 'content' => $item['content'] ?? '',
                                                 'category_id' => $category_id,
+                                                'keyword_id' => $keyword_id,
                                                 'thumb' => isset($gallery[0]) ? Arr::a2s($gallery[0]) : '',
                                                 'gallery' => Arr::a2s($gallery),
                                                 'seo_mate' => Arr::a2s([
--- a/app/Helper/QuanqiusouApi.php
查看文件 @591136a
+++ b/app/Helper/QuanqiusouApi.php
查看文件 @591136a
@@ -86,19 +86,16 @@ class QuanqiusouApi
         $key = "quanqiusou_api_rank_{$api_no}_{$lang}_{$day}_" . date('Y-m-d');
         $res = Cache::get($key);
         if (!$res || $force) {
-            $param = [
-                'key' => '289c1fc81c89d79c04ed4fd72822948e',
-                'w' => $api_no,
-                'type' => $day
-            ];
             if ($lang) {
-                $param['lang'] = $lang;
+                $api_no = $api_no . '_' . $lang;
             }
-
-            $api_url = $this->url . '/api';
-
+            $today = date('Y-m-d');
+            $startDay = date('Y-m-d', strtotime('-'.$day.' day'));
+            $endDay = date('Y-m-d', strtotime('-1 day'));
+            //8918_kr_2024-02-19_2024-02-25.json  8918_2024-02-19_2024-02-25.json
+            $api_url = "https://quanqiusou.cn/google-rank/data_json/{$today}/{$api_no}_{$startDay}_{$endDay}.json";
             try {
-                $res = HttpUtils::get($api_url, $param);
+                $res = HttpUtils::get($api_url, []);
                 if($res){
                     $res = Arr::s2a($res);
                     Cache::put($key, $res, 2 * 3600);
@@ -149,9 +146,9 @@ class QuanqiusouApi
      */
     public function getHistoryCount($api_no, $lang = '')
     {
-        $key = "quanqiusou_api_history_count_{$api_no}_{$lang}_" . date('Y-m-d');
-        $res = Cache::get($key);
-        if (!$res) {
+//        $key = "quanqiusou_api_history_count_{$api_no}_{$lang}_" . date('Y-m-d');
+//        $res = Cache::get($key);
+//        if (!$res) {
             $api_url = $this->url . '/google-rank/history_count.php';
             $param = [
                 'apino' => $api_no,
@@ -163,13 +160,13 @@ class QuanqiusouApi
                 $res = HttpUtils::get($api_url, $param);
                 if($res){
                     $res = Arr::s2a($res);
-                    Cache::put($key, $res, 2 * 3600);
+//                    Cache::put($key, $res, 2 * 3600);
                 }
             } catch (\Exception | GuzzleException $e) {
                 errorLog('获取历史排名统计数据失败', [], $e);
                 return false;
             }
-        }
+//        }
         return $res;
     }
--- a/app/Http/Controllers/Aside/Com/IndexController.php
查看文件 @591136a
+++ b/app/Http/Controllers/Aside/Com/IndexController.php
查看文件 @591136a
@@ -17,6 +17,7 @@ use App\Services\ProjectServer;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Hash;
+use Illuminate\Support\Facades\Log;
 /**
  * Class IndexController
@@ -110,48 +111,15 @@ class IndexController extends BaseController
      * @method :post
      * @time   :2024/2/23 16:28
      */
-    public function getKeywordImage(){
-        $arr = explode('/',trim(str_replace('https://', '', $this->param['url']),'/'));
-        if(empty($arr) || !is_array($arr)){
-            $this->response('当前项目不存在..',Code::SYSTEM_ERROR);
-        }
-        $domainModel = new DomainInfo();
-        $domainInfo = $domainModel->read(['domain'=>$arr[0]]);
-        if($domainInfo === false){
-            $this->response('当前项目不存在.',Code::SYSTEM_ERROR);
-        }
-        ProjectServer::useProject($domainInfo['project_id']);
-        $routeMapModel = new RouteMap();
-        $routeInfo = $routeMapModel->read(['route'=>$arr[1]]);
-        if($domainInfo === false){
-            $this->response('当前路由不存在.',Code::SYSTEM_ERROR);
-        }
+    public function getKeywordVideo(){
+        ProjectServer::useProject($this->param['project_id']);
         $keywordModel = new Keyword();
-        $keywordInfo = $keywordModel->read(['id'=>$routeInfo['source_id']]);
-        $count = Product::where('keyword_id','like' ,'%,'.$keywordInfo['id'].',%')->count();
-        $productModel = new Product();
-        if($count < 5){
-            $productList = $productModel->list([],'sort',['thumb','title'],'desc',7);
-            //获取7个产品主图
-        }else{
-            $productList = $productModel->list(['keyword_id'=>['like','%,'.$keywordInfo['id'].',%']],['thumb','title'],'desc',7);
-        }
-        $product_image = [];
-        foreach ($productList as $k => $v){
-            $product_image[]['title'] = $v['title'];
-            if(!empty($v['thumb']) && !empty($v['thumb']['url'])){
-                $product_image[]['image'] = '';
-                $product_image[]['image'] = getImageUrl($v['thumb']['url'],$this->user['storage_type'] ?? 0,$this->user['project_location']);
-            }
+        $rs = $keywordModel->edit(['video'=>$this->param['video']],['id'=>$this->param['keyword_id']]);
+        if($rs === false){
+            Log::info('回调失败.'.$this->param['project_id'].'video:'.$this->param['video']);
         }
-        $data = [
-            'title'=>$keywordInfo['title'],
-            'keyword_title'=>$keywordInfo['keyword_title'],
-            'keyword_content'=>$keywordInfo['keyword_content'],
-            'product_list'=>$product_image
-        ];
         DB::disconnect('custom_mysql');
-        $this->response('success',Code::SUCCESS,$data);
+        $this->response('success');
     }
 }
--- a/app/Http/Controllers/Aside/Com/KeywordVideoController.php 0 → 100644
查看文件 @591136a
+++ b/app/Http/Controllers/Aside/Com/KeywordVideoController.php 0 → 100644
查看文件 @591136a
+<?php
+/**
+ * @remark :
+ * @name   :KeywordVideoController.php
+ * @author :lyh
+ * @method :post
+ * @time   :2024/2/26 9:23
+ */
+
+namespace App\Http\Controllers\Aside\Com;
+
+use App\Enums\Common\Code;
+use App\Http\Controllers\Aside\BaseController;
+use App\Models\Com\KeywordVideoTask;
+
+class KeywordVideoController extends BaseController
+{
+    /**
+     * @remark :任务列表
+     * @name   :lists
+     * @author :lyh
+     * @method :post
+     * @time   :2024/2/26 11:36
+     */
+    public function lists(){
+        $keywordModel  = new KeywordVideoTask();
+        $lists = $keywordModel->lists($this->map,$this->page,$this->row);
+        $this->response('success',Code::SUCCESS,$lists);
+    }
+
+    /**
+     * @remark :创建关键字任务池子
+     * @name   :saveKeyword
+     * @author :lyh
+     * @method :post
+     * @time   :2024/2/26 9:24
+     */
+    public function createKeywordTask(){
+        $this->request->validate([
+            'project_id'=>'required',
+            'number'=>'required'
+        ], [
+            'project_id.required' => '项目唯一标识不为空',
+            'number.required' => 'number不为空',
+        ]);
+        $keywordModel  = new KeywordVideoTask();
+        $rs = $keywordModel->add($this->param);
+        if($rs === false){
+            $this->response('添加失败',Code::SYSTEM_ERROR);
+        }
+        $this->response('success');
+    }
+
+    /**
+     * @remark :修改项目
+     * @name   :editSort
+     * @author :lyh
+     * @method :post
+     * @time   :2024/2/26 11:35
+     */
+    public function edit(){
+        $this->request->validate([
+            'id'=>'required'
+        ], [
+            'id.required' => '主键标识不为空',
+        ]);
+        $keywordModel  = new KeywordVideoTask();
+        $rs = $keywordModel->edit(['sort'=>$this->param['sort']],['id'=>$this->param['id']]);
+        if($rs === false){
+            $this->response('编辑失败',Code::SYSTEM_ERROR);
+        }
+        $this->response('success');
+    }
+}
--- a/app/Http/Controllers/Bside/Product/KeywordController.php
查看文件 @591136a
+++ b/app/Http/Controllers/Bside/Product/KeywordController.php
查看文件 @591136a
@@ -15,7 +15,7 @@ use App\Rules\Ids;
 use Illuminate\Http\Request;
 /**
- * Class KeywordController
+ * Class KeywordVideoController
  * @package App\Http\Controllers\Bside
  * @author zbj
  * @date 2023/4/15
--- a/app/Http/Logic/Aside/User/UserLogic.php
查看文件 @591136a
+++ b/app/Http/Logic/Aside/User/UserLogic.php
查看文件 @591136a
@@ -52,6 +52,12 @@ class UserLogic extends BaseLogic
         //验证一个项目是否只有一个超级管理员
         $this->verifyRole($this->param);
         if (isset($this->param['id']) && !empty($this->param['id'])) {
+            $info = $this->model->read(['id'=>$this->param['id']]);
+            if($info['role_id'] == 0){
+                //更新项目信息
+                $projectModel = new Project();
+                $projectModel->edit(['lead_name'=>$this->param['name'],'mobile'=>$this->param['mobile']],['id'=>$info['project_id']]);
+            }
             $this->param = $this->editPassword($this->param);
             $rs = $this->model->edit($this->param, ['id' => $this->param['id']]);
         } else {
--- a/app/Http/Logic/Bside/HomeCount/CountLogic.php
查看文件 @591136a
+++ b/app/Http/Logic/Bside/HomeCount/CountLogic.php
查看文件 @591136a
@@ -147,7 +147,7 @@ class CountLogic extends BaseLogic
     public function referrer_count(){
         $customerVisitModel = new Visit();
         $data = $customerVisitModel->select('referrer_url', DB::raw('COUNT(*) as count'))
-            ->groupBy('referrer_url')->where(['domain'=>$this->user['domain']])
+            ->groupBy('referrer_url')->where(['domain'=>trim(str_replace('https://','',$this->user['domain']),'/')])
             ->orderByDesc('count')->limit(9)->get()->toArray();
         $total = $customerVisitModel->count();
         if(!empty($data)){
--- a/app/Http/Logic/Bside/HomeCount/MonthCountLogic.php
查看文件 @591136a
+++ b/app/Http/Logic/Bside/HomeCount/MonthCountLogic.php
查看文件 @591136a
@@ -30,6 +30,7 @@ class MonthCountLogic extends BaseLogic
      */
     public function getCountLists($map,$order = 'created_at',$filed = ['*']){
         $map['project_id'] = $this->user['project_id'];
+        $new = $this->currentMonthCount();
         $lists = $this->model->list($map,$order,$filed,'desc',10);
         if(isset($this->project['is_record_china_visit']) && ($this->project['is_record_china_visit'] == 0)){
             foreach ($lists as $k => $v){
@@ -44,10 +45,11 @@ class MonthCountLogic extends BaseLogic
                     }
                 }
                 $v['source_country'] = json_encode(array_values($source_country));
+                $v['total'] = $new['total'] ?? $v['total'];
                 $lists[$k] = $v;
             }
         }
-        $lists['new'] = $this->currentMonthCount();
+        $lists['new'] = $new;
         return $this->success($lists);
     }
@@ -151,6 +153,7 @@ class MonthCountLogic extends BaseLogic
         $source = DB::connection('custom_mysql')->table('gl_customer_visit')
             ->select('referrer_url', DB::raw('COUNT(*) as count'))
             ->groupBy('referrer_url')
+            ->where('referrer_url','!=','')
             ->whereBetween('updated_date', [$startTime,$endTime])
             ->orderByDesc('count')->limit(10)->get()->toArray();
         $arr['source'] = $source;
--- a/app/Http/Logic/Bside/RankData/RankDataLogic.php
查看文件 @591136a
+++ b/app/Http/Logic/Bside/RankData/RankDataLogic.php
查看文件 @591136a
@@ -392,7 +392,7 @@ class RankDataLogic extends BaseLogic
             if (!empty($lang_list[$api_no])) {
                 $model = RankData::where('project_id', $project_id)->where('lang', '<>', '')->first();
                 if (!$model || $model->updated_date != date('Y-m-d') || $force) {
-                    $res = $api->getGoogleRank($api_no, 1, 7, $force);
+                    $res = $api->getGoogleRank($api_no, $model->lang, 7, $force);
                     if (!$res) {
                         throw new \Exception("接口数据获取失败,api_no:{$api_no},lang");
                     }
--- a/app/Http/Logic/Bside/Scoring/RatingLogic.php
查看文件 @591136a
+++ b/app/Http/Logic/Bside/Scoring/RatingLogic.php
查看文件 @591136a
@@ -12,6 +12,7 @@ namespace App\Http\Logic\Bside\Scoring;
 use App\Http\Logic\Bside\BaseLogic;
 use App\Models\Scoring\RatingQuestion;
 use App\Models\Scoring\ScoringSystem;
+use AWS\CRT\Log;
 class RatingLogic extends BaseLogic
 {
@@ -77,6 +78,9 @@ class RatingLogic extends BaseLogic
         }
         $str = trim($str,'&');
         $url = "http://www.quanqiusou.cn/extend_api/api/service_score.php?postid=$postId&token=$token&ftype=$fType&$str";
-        return http_get($url,['charset=utf-8']);
+        $rs = http_get($url,['charset=utf-8']);
+        @file_put_contents(storage_path('logs/lyh_error.log'), var_export($url, true) . PHP_EOL, FILE_APPEND);
+        @file_put_contents(storage_path('logs/lyh_error.log'), var_export($rs, true) . PHP_EOL, FILE_APPEND);
+        return $rs;
     }
 }
--- a/app/Http/Logic/Bside/Setting/TranslateLogic.php
查看文件 @591136a
+++ b/app/Http/Logic/Bside/Setting/TranslateLogic.php
查看文件 @591136a
@@ -228,6 +228,7 @@ class TranslateLogic extends BaseLogic
      */
     public function translateSave(){
         $data = [];
+        if(!empty($this->param['data'])){
             //处理传递的data
             foreach ($this->param['data'] as $k => $v){
                 if(!empty($v) && is_array($v)){
@@ -236,6 +237,7 @@ class TranslateLogic extends BaseLogic
                     }
                 }
             }
+        }
         try {
             $info = $this->model->read(['language_id'=>$this->param['language_id'],'url'=>$this->param['url'],'type'=>$this->param['type']]);
             if($info === false){
--- a/app/Jobs/CopyProjectJob.php
查看文件 @591136a
+++ b/app/Jobs/CopyProjectJob.php
查看文件 @591136a
@@ -160,7 +160,7 @@ class CopyProjectJob implements ShouldQueue
                 $sql = DB::connection('custom_tmp_mysql_copy')->select("SHOW CREATE TABLE {$table}");
                 DB::connection('custom_mysql')->statement(get_object_vars($sql[0])['Create Table']);
             }
-            DB::connection('custom_mysql')->table($table)->truncate(); // 清空目标表数据
+//            DB::connection('custom_mysql')->table($table)->truncate(); // 清空目标表数据
             DB::connection('custom_mysql')->table($table)->insertUsing(
                 [], // 列名数组，留空表示插入所有列
                 function ($query) use ($table,$project_id) {
--- a/app/Models/Collect/CollectTask.php
查看文件 @591136a
+++ b/app/Models/Collect/CollectTask.php
查看文件 @591136a
@@ -40,7 +40,7 @@ class CollectTask extends Base
                 'project_id' => $project_id,
                 'source' => $source,
                 'source_id' => $source_id,
-                'domain' => $url_arr['host'] ?? $domain,
+                'domain' => $domain,
                 'route' => substr($url_arr['path'], 0, 1) == '/' ? $url_arr['path'] : '/' . $url_arr['path'],
                 'language' => '',
                 'created_at' => $now,
--- a/app/Models/Com/KeywordVideoTask.php 0 → 100644
查看文件 @591136a
+++ b/app/Models/Com/KeywordVideoTask.php 0 → 100644
查看文件 @591136a
+<?php
+/**
+ * @remark :
+ * @name   :KeywordVideoTask.php
+ * @author :lyh
+ * @method :post
+ * @time   :2024/2/26 9:33
+ */
+
+namespace App\Models\Com;
+
+use App\Models\Base;
+
+class KeywordVideoTask extends Base
+{
+    const STATUS_OPEN = 0;
+    const STATUS_CLOSE = 1;//停止
+
+    protected $table = 'gl_promotion_keyword_task';
+}
--- a/app/Models/Com/KeywordVideoTaskLog.php 0 → 100644
查看文件 @591136a
+++ b/app/Models/Com/KeywordVideoTaskLog.php 0 → 100644
查看文件 @591136a
+<?php
+/**
+ * @remark :
+ * @name   :KeywordVideoTask.php
+ * @author :lyh
+ * @method :post
+ * @time   :2024/2/26 9:33
+ */
+
+namespace App\Models\Com;
+
+use App\Models\Base;
+
+class KeywordVideoTaskLog extends Base
+{
+    const STATUS_INIT = 0;
+    const STATUS_RUNING = 1;
+
+    protected $table = 'gl_keyword_video_task_log';
+}
--- a/app/Models/Com/UpdateLog.php
查看文件 @591136a
+++ b/app/Models/Com/UpdateLog.php
查看文件 @591136a
@@ -33,7 +33,7 @@ class UpdateLog extends Model
             $log->project_id = $project_id;
             $log->api_type = $type;
             $log->api_url = $url;
-            $log->sort = ($type == 'category' || $type == 'category_news') ? 0 : 1;
+            $log->sort = ($type == 'category' || $type == 'category_news' || $type == 'tag') ? 0 : 1;
             $log->collect_status = ($type == 'category' || $type == 'category_news' || $type == 'website_info' || $type == 'tag') ? 1 : 0;
             return $log->save();
         }
--- a/routes/aside.php
查看文件 @591136a
+++ b/routes/aside.php
查看文件 @591136a
@@ -326,6 +326,15 @@ Route::middleware(['aloginauth'])->group(function () {
         Route::any('/del', [\App\Http\Controllers\Aside\CustomModule\CustomModuleController::class, 'del'])->name('custom_del');
     });
+    /**
+     * 生成视频的项目
+     */
+    Route::prefix('keyword_video')->group(function () {
+        Route::any('/', [Aside\Com\KeywordVideoController::class, 'lists'])->name('promotion_keyword_lists');
+        Route::any('/createKeywordTask', [Aside\Com\KeywordVideoController::class, 'createKeywordTask'])->name('promotion_keyword_createKeywordTask');
+        Route::any('/edit', [Aside\Com\KeywordVideoController::class, 'edit'])->name('promotion_keyword_edit');
+    });
+
     // 公共主题模版
     Route::prefix('template')->group(function () {
         Route::any('/', [Aside\Template\ATemplateController::class, 'lists'])->name('admin.ATemplate_lists');
@@ -380,7 +389,7 @@ Route::group([], function () {
     Route::any('/collect', [Aside\Collect\CollectController::class, 'index'])->name('admin.collect');
     //同步询盘
     Route::any('/sync_inquiry', [Aside\Com\IndexController::class, 'sync_inquiry'])->name('admin.sync_inquiry');
-    Route::any('/getKeywordImage', [Aside\Com\IndexController::class, 'getKeywordImage'])->name('admin.getKeywordImage');
+    Route::any('/getKeywordVideo', [Aside\Com\IndexController::class, 'getKeywordVideo'])->name('admin.getKeywordVideo');
 });