Merge remote-tracking branch 'origin/lyh-server' into workorder

@@ -63,7 +63,7 @@ class AiVideoAutoPublish extends Command
     }
     }
 
 
     /**
     /**
-     * @remark :普通项目--自动发布
+     * @remark :自动发布aiVideo组装数据（写入一条记录）
      * @name   :auto_six_publish
      * @name   :auto_six_publish
      * @author :lyh
      * @author :lyh
      * @method :post
      * @method :post
@@ -73,7 +73,7 @@ class AiVideoAutoPublish extends Command
         $this->output('开始自动发布Video文章');
         $this->output('开始自动发布Video文章');
         $projectModel = new Project();
         $projectModel = new Project();
         $optimizeModel = new DeployOptimize();
         $optimizeModel = new DeployOptimize();
-        $projectList = $projectModel->list(['is_ai_video'=>1,'id'=>1,'delete_status'=>0,'site_status'=>0,'extend_type'=>0],'id',['id','project_type']);
+        $projectList = $projectModel->list(['is_ai_video'=>1,'delete_status'=>0,'site_status'=>0,'extend_type'=>0],'id',['id','project_type']);
         foreach ($projectList as $item){
         foreach ($projectList as $item){
             $this->output("项目{$item['id']}开始自动发布");
             $this->output("项目{$item['id']}开始自动发布");
             //获取当前是否开启自动发布aiVideo
             //获取当前是否开启自动发布aiVideo
@@ -129,10 +129,7 @@ class AiVideoAutoPublish extends Command
                 return $data;
                 return $data;
             }
             }
             $data['title'] = $info['title'];
             $data['title'] = $info['title'];
-            $data['remark'] = strip_tags($info['intro']);
-            if(empty($data['remark'])){
-                $data['remark'] = $data['title'];
-            }
+            $data['remark'] = $info['intro'];
             $data['images'] = array_filter(array_map(function ($item) use ($data) {
             $data['images'] = array_filter(array_map(function ($item) use ($data) {
                 if (!empty($item['url'])) {
                 if (!empty($item['url'])) {
                     return [
                     return [
@@ -193,7 +190,6 @@ class AiVideoAutoPublish extends Command
             }
             }
             $item = $aiVideoAutoLogModel->read(['status'=>0,'trigger_id'=>null]);
             $item = $aiVideoAutoLogModel->read(['status'=>0,'trigger_id'=>null]);
             if($item === false){
             if($item === false){
-                echo date('Y-m-d H:i:s').':无生成图片的数据。'.PHP_EOL;
                 sleep(60);
                 sleep(60);
                 continue;
                 continue;
             }
             }
@@ -204,7 +200,7 @@ class AiVideoAutoPublish extends Command
                 $midJourneyService = new MidJourneyService();
                 $midJourneyService = new MidJourneyService();
                 $result = $midJourneyService->imagine($content);
                 $result = $midJourneyService->imagine($content);
                 if($result && !empty($result['trigger_id'])){
                 if($result && !empty($result['trigger_id'])){
-                    echo '提交的数据详情。'.json_encode($result,true).$item['project_id'].PHP_EOL;
+                    echo '提交的数据详情。'.json_encode($result, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES).$item['project_id'].PHP_EOL;
                     Redis::incr('ai_video_image');
                     Redis::incr('ai_video_image');
                     $aiVideoAutoLogModel->edit(['trigger_id'=>$result['trigger_id']],['id'=>$item['id']]);
                     $aiVideoAutoLogModel->edit(['trigger_id'=>$result['trigger_id']],['id'=>$item['id']]);
                 }
                 }
@@ -241,14 +237,17 @@ class AiVideoAutoPublish extends Command
                 $aiVideoService = new AiVideoService($info['project_id']);
                 $aiVideoService = new AiVideoService($info['project_id']);
                 $projectModel = new DeployOptimize();
                 $projectModel = new DeployOptimize();
                 $video_setting = $projectModel->getValue(['project_id'=>$info['project_id']],'video_setting');
                 $video_setting = $projectModel->getValue(['project_id'=>$info['project_id']],'video_setting');
+                $frequency_setting = $projectModel->getValue(['project_id'=>$info['project_id']],'send_ai_video_frequency');
                 $storage = $aiVideoTaskModel->videoSetting()[$video_setting ?? 1];
                 $storage = $aiVideoTaskModel->videoSetting()[$video_setting ?? 1];
+                $frequency = $aiVideoTaskModel->videoFrequency()[$frequency_setting ?? 1];
+                $frequencyArr = explode('-',$frequency);
                 $result = $aiVideoService->createTask($info['title'],$info['remark'],$info['images'],[],$storage);
                 $result = $aiVideoService->createTask($info['title'],$info['remark'],$info['images'],[],$storage);
                 if($result['status'] == 200){
                 if($result['status'] == 200){
-                    $aiVideoTaskModel->addReturnId(['task_id'=>$result['data']['task_id'],'project_id'=>$info['project_id'],'storage'=>$storage]);
+                    $next_auto_date = date('Y-m-d', strtotime('+' . mt_rand($frequencyArr[0] ?? 5,$frequencyArr[1] ?? 7) . 'days')); //每5-7天自动发布
+                    $aiVideoTaskModel->addReturnId(['next_auto_date'=>$next_auto_date,'task_id'=>$result['data']['task_id'],'project_id'=>$info['project_id'],'storage'=>$storage]);
                     ProjectServer::useProject($info['project_id']);
                     ProjectServer::useProject($info['project_id']);
                     $aiVideoModel = new AiVideo();
                     $aiVideoModel = new AiVideo();
-                    $next_auto_date = date('Y-m-d', strtotime('+' . mt_rand(5,7) . 'days')); //每5-7天自动发布
-                    $aiVideoModel->addReturnId(['next_auto_date'=>$next_auto_date,'title'=>$info['title'],'task_id'=>$result['data']['task_id'],'description'=>$info['remark'],'project_id'=>$info['project_id'],'images'=>json_encode($info['images'],true),'anchor'=>json_encode([],true)]);
+                    $aiVideoModel->addReturnId(['title'=>$info['title'],'task_id'=>$result['data']['task_id'],'description'=>$info['remark'],'project_id'=>$info['project_id'],'images'=>json_encode($info['images'],true),'anchor'=>json_encode([],true)]);
                     DB::disconnect('custom_mysql');
                     DB::disconnect('custom_mysql');
                     $aiVideoAutoLogModel->edit(['status'=>2],['id'=>$info['id']]);
                     $aiVideoAutoLogModel->edit(['status'=>2],['id'=>$info['id']]);
                 }
                 }
@@ -289,7 +288,7 @@ class AiVideoAutoPublish extends Command
      * @method :post
      * @method :post
      * @time   :2025/8/1 16:25
      * @time   :2025/8/1 16:25
      */
      */
-    public function getAiVideoParam($project_id = 3751)
+    public function getAiVideoParam($project_id)
     {
     {
         //获取当前网站域名
         //获取当前网站域名
         $domainModel = new DomainInfo();
         $domainModel = new DomainInfo();

@@ -81,69 +81,86 @@ class DomainInfo extends Command
                 continue;
                 continue;
             }
             }
 
 
-            //除自建站项目外，记录已解析到别的ip的域名
-            if ($servers_ip_info['servers_id'] != ServerConfig::SELF_SITE_ID) {
-                //过滤已解析到别的ip的域名
+            if ($servers_ip_info['servers_id'] == ServerConfig::SELF_SITE_ID) {
+                //自建站项目，直接获取主站证书有效期并更新
+                $ssl_time = $this->getDomainSslTime($v['domain']);
+                if ($ssl_time['from'] && $ssl_time['to']) {
+                    $v->certificate_start_time = $ssl_time['from'];
+                    $v->certificate_end_time = $ssl_time['to'];
+                    $v->save();
+                }
+
+                if (empty($v['domain_end_time']) || $v['domain_end_time'] < date('Y-m-d H:i:s')) {
+                    //获取主站域名有效期并更新
+                    $valid_time = $this->getDomainValidTime($v['domain']);
+                    if ($valid_time['start'] && $valid_time['end']) {
+                        $v->domain_start_time = $valid_time['start'];
+                        $v->domain_end_time = $valid_time['end'];
+                        $v->save();
+                    }
+                }
+            } else {
+                //除自建站项目外，记录已解析到别的ip的域名
                 if (!check_domain_record($v['domain'], $servers_ip_info)) {
                 if (!check_domain_record($v['domain'], $servers_ip_info)) {
                     Log::channel('analyze_other')->error('域名 [' . $v['domain'] . '] 已解析到别的IP');
                     Log::channel('analyze_other')->error('域名 [' . $v['domain'] . '] 已解析到别的IP');
                     continue;
                     continue;
                 }
                 }
-            }
 
 
-            //判断是否已经建站
-            if ($project_info['project_type'] == Project::PROJECT_TYPE_SEO) {
-                $type = DomainCreateTask::TYPE_BLOG;
-            } else {
-                $type = DomainCreateTask::TYPE_MAIN;
-            }
-            $task_info = $domainCreateTaskModel->read(['type' => $type, 'domain_id' => $v['id'], 'status' => DomainCreateTask::STATUS_SUC], ['id']);
-            if (!$task_info) {
-                continue;
-            }
-
-            //获取主站证书有效期并更新
-            $ssl_time = $this->getDomainSslTime($v['domain']);
-            if ($ssl_time['from'] && $ssl_time['to']) {
-                $v->certificate_start_time = $ssl_time['from'];
-                $v->certificate_end_time = $ssl_time['to'];
-                $v->save();
-            }
+                //判断是否已经建站
+                if ($project_info['project_type'] == Project::PROJECT_TYPE_SEO) {
+                    $type = DomainCreateTask::TYPE_BLOG;
+                } else {
+                    $type = DomainCreateTask::TYPE_MAIN;
+                }
+                $task_info = $domainCreateTaskModel->read(['type' => $type, 'domain_id' => $v['id'], 'status' => DomainCreateTask::STATUS_SUC], ['id']);
+                if (!$task_info) {
+                    continue;
+                }
 
 
-            if (empty($v['domain_end_time']) || $v['domain_end_time'] < date('Y-m-d H:i:s')) {
-                //获取主站域名有效期并更新
-                $valid_time = $this->getDomainValidTime($v['domain']);
-                if ($valid_time['start'] && $valid_time['end']) {
-                    $v->domain_start_time = $valid_time['start'];
-                    $v->domain_end_time = $valid_time['end'];
+                //获取主站证书有效期并更新
+                $ssl_time = $this->getDomainSslTime($v['domain']);
+                if ($ssl_time['from'] && $ssl_time['to']) {
+                    $v->certificate_start_time = $ssl_time['from'];
+                    $v->certificate_end_time = $ssl_time['to'];
                     $v->save();
                     $v->save();
                 }
                 }
-            }
 
 
-            if ($v['amp_status'] == 1) {
-                $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';
+                if (empty($v['domain_end_time']) || $v['domain_end_time'] < date('Y-m-d H:i:s')) {
+                    //获取主站域名有效期并更新
+                    $valid_time = $this->getDomainValidTime($v['domain']);
+                    if ($valid_time['start'] && $valid_time['end']) {
+                        $v->domain_start_time = $valid_time['start'];
+                        $v->domain_end_time = $valid_time['end'];
+                        $v->save();
+                    }
                 }
                 }
-                $amp_domain = implode('.', $host_array);
 
 
-                if ($servers_ip_info['servers_id'] != ServerConfig::SELF_SITE_ID) {
-                    //过滤已解析到别的ip的AMP域名
-                    if (!check_domain_record($amp_domain, $servers_ip_info)) {
-                        Log::channel('analyze_other')->error('AMP域名 [' . $amp_domain . '] 已解析到别的IP');
-                        continue;
+                if ($v['amp_status'] == 1) {
+                    $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);
+
+                    if ($servers_ip_info['servers_id'] != ServerConfig::SELF_SITE_ID) {
+                        //过滤已解析到别的ip的AMP域名
+                        if (!check_domain_record($amp_domain, $servers_ip_info)) {
+                            Log::channel('analyze_other')->error('AMP域名 [' . $amp_domain . '] 已解析到别的IP');
+                            continue;
+                        }
                     }
                     }
-                }
 
 
-                //获取AMP站证书有效期并更新
-                $amp_ssl_time = $this->getDomainSslTime($amp_domain);
-                if ($amp_ssl_time['from'] && $amp_ssl_time['to']) {
-                    $v->amp_certificate_start_time = $amp_ssl_time['from'];
-                    $v->amp_certificate_end_time = $amp_ssl_time['to'];
-                    $v->save();
+                    //获取AMP站证书有效期并更新
+                    $amp_ssl_time = $this->getDomainSslTime($amp_domain);
+                    if ($amp_ssl_time['from'] && $amp_ssl_time['to']) {
+                        $v->amp_certificate_start_time = $amp_ssl_time['from'];
+                        $v->amp_certificate_end_time = $amp_ssl_time['to'];
+                        $v->save();
+                    }
                 }
                 }
             }
             }
         }
         }

@@ -717,7 +717,7 @@ class RelayInquiry extends Command
             $project = Project::getProjectByDomain($domain);
             $project = Project::getProjectByDomain($domain);
             if (empty($project)) {
             if (empty($project)) {
                 $this->logChannel()->info('广告任务ID：' . $task['id'] . ', 转发对象：' . $re_website . '非v6链接，转发失败；', ['广告任务ID：' . $task['id'], '询盘ID：' . $form->id]);
                 $this->logChannel()->info('广告任务ID：' . $task['id'] . ', 转发对象：' . $re_website . '非v6链接，转发失败；', ['广告任务ID：' . $task['id'], '询盘ID：' . $form->id]);
-                return [[], $lang];
+                return [[], $lang, ''];
             }
             }
             $lang = WebLanguage::getLangById($project->main_lang_id ?? 1)['short'];
             $lang = WebLanguage::getLangById($project->main_lang_id ?? 1)['short'];
 
 

@@ -23,6 +23,7 @@ use App\Models\Project\ProjectWhiteHatAffix;
 use App\Models\Template\BTemplateMain;
 use App\Models\Template\BTemplateMain;
 use App\Models\Template\TemplateTypeMain;
 use App\Models\Template\TemplateTypeMain;
 use App\Models\WebSetting\WebSetting;
 use App\Models\WebSetting\WebSetting;
+use App\Models\WorkOrder\Tickets;
 use App\Services\AiBlogService;
 use App\Services\AiBlogService;
 use App\Services\CosService;
 use App\Services\CosService;
 use App\Services\Geo\GeoService;
 use App\Services\Geo\GeoService;
@@ -48,13 +49,15 @@ class lyhDemo extends Command
     protected $description = '更新路由';
     protected $description = '更新路由';
 
 
     public function handle(){
     public function handle(){
-//        $content = "{Introducing the cutting-edge product from Zhejiang Yuexiang Gas Technology Co., Ltd., the Bracket Gas Flowmeter. This innovative gas flowmeter is designed to provide accurate and reliable measurements for a wide range of industrial applications,Equipped with advanced technology and precision components, the Bracket Gas Flowmeter ensures exceptional performance and durability. It offers highly accurate gas flow readings, allowing users to closely monitor and control gas consumption in various processes. The meter's user-friendly interface displays real-time flow rates and totalized flow data, facilitating efficient and convenient data management,With its robust construction and corrosion-resistant materials, the Bracket Gas Flowmeter guarantees long-term reliability, even in harsh operating conditions. It is compatible with various gases such as natural gas, propane, and hydrogen, making it a versatile choice for multiple industries including oil and gas, chemical, and manufacturing,Furthermore, the Bracket Gas Flowmeter is engineered with ease of installation and maintenance in mind. Its compact and space-saving design allows for flexible mounting options, while its modular construction enables quick and hassle-free maintenance. Additionally, it meets international standards for accuracy and safety, ensuring compliance with industry regulations,Choose the Bracket Gas Flowmeter for precise and efficient gas flow measurement, backed by the expertise and commitment of Zhejiang Yuexiang Gas Technology Co., Ltd}，{Shop Quality Brackets: Top China Products & Services for Your Needs}，4K，高清 --no logo --ar 16:9";
-//        $midJourneyService = new MidJourneyService();
-//        $result = $midJourneyService->imagine($content);
-        $url = 'https://ecdn6-nc.globalso.com/upload/p/1/png/2025-08/688dcebc26a7a59911.png';
-        $cosService = new CosService();
-        $data = $cosService->cropAndUploadToCOS($url);
-        dd($data);
+        echo 'start.'. PHP_EOL;
+        $ticketModel = new Tickets();
+        $list = $ticketModel->list(['end_at'=>['!=',null]],'id',['id','created_at','end_at']);
+        foreach ($list as $item){
+            echo '执行的任务id:'.$item['id'].PHP_EOL;
+            $end_time = diffInHours($item['created_at'],$item['end_at']);
+            $ticketModel->edit(['end_time'=>$end_time],['id'=>$item['id']]);
+        }
+        return true;
     }
     }
 
 
     /**
     /**

@@ -151,13 +151,12 @@ class SyncProject extends Command
             'contract' => json_encode($param['files']),
             'contract' => json_encode($param['files']),
             'bill' => json_encode($param['images']),
             'bill' => json_encode($param['images']),
         ];
         ];
-        $seoPlan = Project::seoMap();
-        if (in_array($param['plan_marketing'], $seoPlan)) {
-            $data['deploy_build']['seo_service_duration'] =  $param['years'] ?? 0;
-            $data['deploy_build']['seo_plan'] = $this->versionSeoData($param['plan_marketing'],$seoPlan);
-        } else {
+        $data['deploy_build']['plan'] = $this->versionData($param['plan_marketing'] ?? '');
+        $data['deploy_build']['seo_plan'] = $this->versionSeoData($param['geo_plan'] ?? '');
+        if(!empty($data['deploy_build']['plan'])){
             $data['deploy_build']['service_duration'] =  $param['years'] ?? 0;
             $data['deploy_build']['service_duration'] =  $param['years'] ?? 0;
-            $data['deploy_build']['plan'] = $this->versionData($param['plan_marketing']);
+        }else{
+            $data['deploy_build']['seo_service_duration'] =  $param['years'] ?? 0;
         }
         }
         $renewModel = new ProjectRenew();
         $renewModel = new ProjectRenew();
         $rs = $renewModel->add($data);
         $rs = $renewModel->add($data);
@@ -184,7 +183,8 @@ class SyncProject extends Command
         }
         }
     }
     }
 
 
-    public function versionSeoData($param,$data){
+    public function versionSeoData($param){
+        $data = Project::seoMap();
         $data = array_flip($data);
         $data = array_flip($data);
         if(isset($data[$param])){
         if(isset($data[$param])){
             return $data[$param];
             return $data[$param];
@@ -242,13 +242,12 @@ class SyncProject extends Command
                 'bill'=>$param['images']
                 'bill'=>$param['images']
             ],
             ],
         ];
         ];
-        $seoPlan = Project::seoMap();
-        if (in_array($param['plan_marketing'], $seoPlan)) {
-            $data['deploy_build']['seo_service_duration'] =  $param['years'] ?? 0;
-            $data['deploy_build']['seo_plan'] = $this->versionSeoData($param['plan_marketing'],$seoPlan);
-        } else {
+        $data['deploy_build']['plan'] = $this->versionData($param['plan_marketing'] ?? '');
+        $data['deploy_build']['seo_plan'] = $this->versionSeoData($param['geo_plan'] ?? '');
+        if(!empty($data['deploy_build']['plan'])){
             $data['deploy_build']['service_duration'] =  $param['years'] ?? 0;
             $data['deploy_build']['service_duration'] =  $param['years'] ?? 0;
-            $data['deploy_build']['plan'] = $this->versionData($param['plan_marketing']);
+        }else{
+            $data['deploy_build']['seo_service_duration'] =  $param['years'] ?? 0;
         }
         }
         DB::beginTransaction();
         DB::beginTransaction();
         try {
         try {

@@ -46,16 +46,17 @@ class RankDataLog extends BaseCommands
     {
     {
         while (true) {
         while (true) {
             $log_id = Redis::rpop('rank_data_task');
             $log_id = Redis::rpop('rank_data_task');
-            echo $log_id . PHP_EOL;
+
             if (!$log_id) {
             if (!$log_id) {
-                sleep(10);
-                continue;
+                $log = RankDataLogModel::where('status', 0)->first();
+            }else{
+                $log = RankDataLogModel::where('id', $log_id)->where('status', 0)->first();
             }
             }
-
-            $log = RankDataLogModel::where('id', $log_id)->where('status', 0)->first();
             if(!$log){
             if(!$log){
+                sleep(10);
                 continue;
                 continue;
             }
             }
+
             try {
             try {
                 $this->output('项目开始:ID'.$log->project_id . ',APINO' . $log->api_no);
                 $this->output('项目开始:ID'.$log->project_id . ',APINO' . $log->api_no);
                 $project = Project::find($log->project_id);
                 $project = Project::find($log->project_id);

@@ -5,6 +5,7 @@ namespace App\Console\Commands\Tdk;
 use App\Exceptions\ValidateException;
 use App\Exceptions\ValidateException;
 use App\Helper\Arr;
 use App\Helper\Arr;
 use App\Helper\Gpt;
 use App\Helper\Gpt;
+use App\Helper\Translate;
 use App\Models\Ai\AiCommand;
 use App\Models\Ai\AiCommand;
 use App\Models\Com\NoticeLog;
 use App\Models\Com\NoticeLog;
 use App\Models\Com\UpdateNotify;
 use App\Models\Com\UpdateNotify;
@@ -14,6 +15,7 @@ use App\Models\Project\AggregateKeywordAffix;
 use App\Models\Project\DeployBuild;
 use App\Models\Project\DeployBuild;
 use App\Models\Project\DeployOptimize;
 use App\Models\Project\DeployOptimize;
 use App\Models\Project\ProjectKeywordAiTask;
 use App\Models\Project\ProjectKeywordAiTask;
+use App\Models\WebSetting\WebLanguage;
 use App\Services\ProjectServer;
 use App\Services\ProjectServer;
 use Illuminate\Console\Command;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\DB;
@@ -51,6 +53,8 @@ class KeywordPageAiContent extends Command
         '折线图',
         '折线图',
     ];
     ];
 
 
+    protected $project;
+
     /**
     /**
      * @return bool
      * @return bool
      */
      */
@@ -66,7 +70,7 @@ class KeywordPageAiContent extends Command
 
 
             echo getmypid() . ' ' . date('Y-m-d H:i:s') . ' start project_id: ' . $project_id . PHP_EOL;
             echo getmypid() . ' ' . date('Y-m-d H:i:s') . ' start project_id: ' . $project_id . PHP_EOL;
             try {
             try {
-                ProjectServer::useProject($project_id);
+                $this->project = ProjectServer::useProject($project_id);
 
 
                 $update_rows = $this->ai_content($task);
                 $update_rows = $this->ai_content($task);
 
 
@@ -109,6 +113,10 @@ class KeywordPageAiContent extends Command
         $prefix = empty($affix['prefix']) ? explode("\n", $default_affix['prefix']) : explode("\n", $affix['prefix']);
         $prefix = empty($affix['prefix']) ? explode("\n", $default_affix['prefix']) : explode("\n", $affix['prefix']);
         $suffix = empty($affix['suffix']) ? explode("\n", $default_affix['suffix']) : explode("\n", $affix['suffix']);
         $suffix = empty($affix['suffix']) ? explode("\n", $default_affix['suffix']) : explode("\n", $affix['suffix']);
 
 
+        $lang = WebLanguage::getLangById($this->project['main_lang_id']??1);
+        $prefix = Translate::tran($prefix, $lang['short']);
+        $suffix = Translate::tran($suffix, $lang['short']);
+
         if (!$prefix || !$suffix) {
         if (!$prefix || !$suffix) {
             throw new ValidateException('扩展标题前后缀不存在');
             throw new ValidateException('扩展标题前后缀不存在');
         }
         }
@@ -193,8 +201,8 @@ class KeywordPageAiContent extends Command
         //打乱顺序
         //打乱顺序
         shuffle($prefix);
         shuffle($prefix);
         shuffle($suffix);
         shuffle($suffix);
-        //标题(title):{聚合页扩展标题前缀} keywords {聚合页扩展标题后缀} {聚合页扩展标题后缀}
 
 
+        //标题(title):{聚合页扩展标题前缀} keywords {聚合页扩展标题后缀} {聚合页扩展标题后缀}
         return sprintf('%s %s %s %s', $prefix[0], $title, $suffix[0], $suffix[1]);
         return sprintf('%s %s %s %s', $prefix[0], $title, $suffix[0], $suffix[1]);
     }
     }
 
 
@@ -211,6 +219,11 @@ class KeywordPageAiContent extends Command
             shuffle($this->chart_types);
             shuffle($this->chart_types);
             $prompt = str_replace('{chart_type}', $this->chart_types[0], $prompt);
             $prompt = str_replace('{chart_type}', $this->chart_types[0], $prompt);
         }
         }
+        if (strpos($prompt, '{lang}') !== false) {
+            $lang = WebLanguage::getLangById($this->project['main_lang_id']??1);
+            $lang = $lang['english'] ?? 'English';
+            $prompt = str_replace('{lang}', $lang, $prompt);
+        }
 
 
         $text = Gpt::instance()->openai_chat_qqs($prompt);
         $text = Gpt::instance()->openai_chat_qqs($prompt);
         if (!$text) {
         if (!$text) {
@@ -243,7 +256,7 @@ class KeywordPageAiContent extends Command
         foreach ($body->childNodes as $child) {
         foreach ($body->childNodes as $child) {
             $modifiedHtml .= $dom->saveHTML($child);
             $modifiedHtml .= $dom->saveHTML($child);
         }
         }
-        return $modifiedHtml;
+        return html_entity_decode($modifiedHtml, ENT_QUOTES | ENT_HTML5, 'UTF-8');
     }
     }
 
 
     public function sendNotify($project_id)
     public function sendNotify($project_id)

+<?php
+/**
+ * @remark :
+ * @name   :TicketCount.php
+ * @author :lyh
+ * @method :post
+ * @time   :2025/8/7 17:42
+ */
+
+namespace App\Console\Commands\Ticket;
+
+use App\Models\Manage\ManageHr;
+use App\Models\Ticket\TicketDailyManageCount;
+use App\Models\WorkOrder\TicketLog;
+use App\Models\WorkOrder\TicketProject;
+use App\Models\WorkOrder\Tickets;
+use Illuminate\Console\Command;
+
+class TicketCount extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'ticket_count {action}';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = '日统计工单';
+
+    /**
+     * @remark :统计脚本
+     * @name   :handle
+     * @author :lyh
+     * @method :post
+     * @time   :2025/8/7 17:45
+     */
+    public function handle(){
+
+    }
+
+    /**
+     * @remark :按管理员统计（只统计技术组）
+     * @name   :manage_action
+     * @author :lyh
+     * @method :post
+     * @time   :2025/8/7 17:45
+     */
+    public function manage_action(){
+        $manageHrModel = new ManageHr();
+        $manageList = $manageHrModel->list(['status'=>1,'dept_id'=>['in',[1,2]]],'id',['id','manage_id','name','nickname']);
+        $date = date('Y-m-d');
+        $ticketManageCountModel = new TicketDailyManageCount();
+        foreach ($manageList as $item){
+            $ticketLogModel = new TicketLog();
+            $ticket_num = $ticketLogModel->counts(['engineer_id'=>$item['manage_id'],'is_engineer'=>1]);
+            $data = [
+                'date'=>$date,
+                'manage_id'=>$item['id'],
+                'manage_name'=>$item['name'],
+                'ticket_num'=>$ticket_num,//工单总数量
+                'average_time'=>'',//平均完成工单时长
+                'fastest_time'=>'',//最快完成工单时间
+                'timeout_num'=>'',//超时工单数量
+                'complete_num'=>'',//完成工单数量
+            ];
+            //查询当前用户是否当日已有记录
+            $ticketManageInfo = $ticketManageCountModel->read(['date'=>$date,'manage_id'=>$item['id']],['id']);
+            if($ticketManageInfo === false){
+                //TODO::执行新增
+
+            }else{
+                //TODO::执行编辑
+            }
+        }
+    }
+}

@@ -1421,3 +1421,22 @@ function getTopDomain ($url) {
     return $host;
     return $host;
 }
 }
 
 
+/**
+ * @remark :两个时间的差值
+ * @name   :diffInHours
+ * @author :lyh
+ * @method :post
+ * @time   :2025/8/8 9:10
+ */
+function diffInHours($startTime, $endTime)
+{
+    $start = new DateTime($startTime);
+    $end = new DateTime($endTime);
+    // 计算时间差
+    $interval = $start->diff($end);
+    // 总小时数 = 天数 * 24 + 小时数 + 分钟数换算成小数小时
+    $hours = $interval->days * 24 + $interval->h + ($interval->i / 60);
+    // 四舍五入保留1位小数
+    return round($hours, 1);
+}
+

@@ -255,7 +255,11 @@ class OptimizeController extends BaseController
             $query = $query->where('gl_project.site_status',$this->map['site_status']);
             $query = $query->where('gl_project.site_status',$this->map['site_status']);
         }
         }
         if(isset($this->map['seo_plan'])){
         if(isset($this->map['seo_plan'])){
-            $query = $query->where('gl_project_deploy_build.seo_plan',$this->map['seo_plan']);
+            if(is_array($this->map['seo_plan'])){
+                $query = $query->whereIn('gl_project_deploy_build.seo_plan',$this->map['seo_plan']);
+            }else{
+                $query = $query->where('gl_project_deploy_build.seo_plan',$this->map['seo_plan']);
+            }
         }
         }
         if(isset($this->map['main_lang_id'])){
         if(isset($this->map['main_lang_id'])){
             $query = $query->where('gl_project.main_lang_id',$this->map['main_lang_id']);
             $query = $query->where('gl_project.main_lang_id',$this->map['main_lang_id']);

@@ -23,6 +23,7 @@ use App\Models\Devops\ServersIp;
 use App\Models\Domain\DomainCreateTask;
 use App\Models\Domain\DomainCreateTask;
 use App\Models\Domain\DomainInfo;
 use App\Models\Domain\DomainInfo;
 use App\Models\Domain\DomainInfo as DomainInfoModel;
 use App\Models\Domain\DomainInfo as DomainInfoModel;
+use App\Models\Geo\GeoLink;
 use App\Models\HomeCount\Count;
 use App\Models\HomeCount\Count;
 use App\Models\Industry\ProjectIndustry;
 use App\Models\Industry\ProjectIndustry;
 use App\Models\Inquiry\InquirySet;
 use App\Models\Inquiry\InquirySet;
@@ -314,7 +315,7 @@ class ProjectController extends BaseController
             }
             }
         }
         }
         if(isset($this->map['seo_plan'])){
         if(isset($this->map['seo_plan'])){
-            $query = $query->where('gl_project_deploy_build.seo_plan',$this->map['seo_plan']);
+            $query = $query->where('gl_project_deploy_build.seo_plan','!=',0);
         }
         }
         if(isset($this->map['site_status'])){
         if(isset($this->map['site_status'])){
             $query = $query->where('gl_project.site_status',$this->map['site_status']);
             $query = $query->where('gl_project.site_status',$this->map['site_status']);
@@ -329,6 +330,15 @@ class ProjectController extends BaseController
         if(isset($this->map['project_type'])){
         if(isset($this->map['project_type'])){
             $query = $query->where('gl_project.project_type',$this->map['project_type']);
             $query = $query->where('gl_project.project_type',$this->map['project_type']);
         }
         }
+        if(isset($this->param['geo'])){
+            if($this->param['geo'] == 1){
+                $query = $query->where('gl_project.geo_status',1);
+            }else{
+                $ids = GeoLink::pluck('project_id')->unique()->values()->all();
+                $query = $query->whereIn('gl_project.id',$ids);
+            }
+
+        }
         return $query;
         return $query;
     }
     }
 
 
@@ -1297,7 +1307,8 @@ class ProjectController extends BaseController
      */
      */
     public function videoSetting(){
     public function videoSetting(){
         $videoModel = new AiVideoTask();
         $videoModel = new AiVideoTask();
-        $data = $videoModel->videoSetting();
+        $data['videoSetting'] = $videoModel->videoSetting();
+        $data['videoFrequency'] =$videoModel->videoFrequency();
         $this->response('success',Code::SUCCESS,$data);
         $this->response('success',Code::SUCCESS,$data);
     }
     }
 }
 }

@@ -239,8 +239,9 @@ class AsideTicketController extends BaseController
             {
             {
                 // 完成工单，把子任务里面未完成的工单改为完成
                 // 完成工单，把子任务里面未完成的工单改为完成
                 $ticket->end_at = now();
                 $ticket->end_at = now();
+                $ticket->end_time = diffInHours($ticket->created_at,now());
                 $ticket->logs()->where('status', '<', TicketLog::STATUS_COMPLETED)->where('is_engineer', 1)
                 $ticket->logs()->where('status', '<', TicketLog::STATUS_COMPLETED)->where('is_engineer', 1)
-                    ->update(['status' => TicketLog::STATUS_COMPLETED, 'end_at' => now()]);
+                    ->update(['status' => TicketLog::STATUS_COMPLETED, 'end_at' => now(),'end_time'=>$ticket->end_time]);
                 // 推动微信通知
                 // 推动微信通知
                 $project = $ticket->project;
                 $project = $ticket->project;
                 if ($project->wechat_switch && !$ticket->close_wechat)
                 if ($project->wechat_switch && !$ticket->close_wechat)

@@ -70,6 +70,7 @@ class AsideTicketLogController extends BaseController
                 {
                 {
                     // 我的工单标记为已完成
                     // 我的工单标记为已完成
                     $log->end_at = now();
                     $log->end_at = now();
+                    $log->end_time = diffInHours($ticket->created_at,now());
                 }
                 }
             }
             }
             if ($request->input('reply') !== null)
             if ($request->input('reply') !== null)
@@ -91,6 +92,7 @@ class AsideTicketLogController extends BaseController
                 {
                 {
                     $ticket->status = Tickets::STATUS_COMPLETED;
                     $ticket->status = Tickets::STATUS_COMPLETED;
                     $ticket->end_at = now();
                     $ticket->end_at = now();
+                    $ticket->end_time = diffInHours($ticket->created_at,$ticket->end_at);
                     $project = $ticket->project;
                     $project = $ticket->project;
                     if ($project->wechat_switch && !$ticket->close_wechat)
                     if ($project->wechat_switch && !$ticket->close_wechat)
                         $project->pushWechatGroupMsg("工单（ID：{$ticket->id}）已全部完成，请访问查看详情！");
                         $project->pushWechatGroupMsg("工单（ID：{$ticket->id}）已全部完成，请访问查看详情！");

@@ -83,7 +83,7 @@ class LoginLogic extends BaseLogic
         $manage['special'] = $this->getSpecialMenu($manage['id']);
         $manage['special'] = $this->getSpecialMenu($manage['id']);
         //岗位
         //岗位
         $manage['entry_position'] = ManageHr::where('manage_id', $manage['id'])->value('entry_position')?:0;
         $manage['entry_position'] = ManageHr::where('manage_id', $manage['id'])->value('entry_position')?:0;
-        Cache::add(Common::MANAGE_TOKEN . $token,$manage,3600 * 6);
+        Cache::add(Common::MANAGE_TOKEN . $token,$manage,3600 * 12);
         return $this->success($manage->makeVisible('token')->toArray());
         return $this->success($manage->makeVisible('token')->toArray());
     }
     }
 
 

@@ -22,7 +22,7 @@ class AiVideoTask extends Base
     const STATUS_FINISH = 2;
     const STATUS_FINISH = 2;
 
 
     /**
     /**
-     * @remark :视频设置
+     * @remark :配置
      * @name   :videoSetting
      * @name   :videoSetting
      * @author :lyh
      * @author :lyh
      * @method :post
      * @method :post
@@ -34,4 +34,20 @@ class AiVideoTask extends Base
             2 => 'YOUTUBE'
             2 => 'YOUTUBE'
         ];
         ];
     }
     }
+
+    /**
+     * @remark :配置
+     * @name   :videoFrequency
+     * @author :lyh
+     * @method :post
+     * @time   :2025/8/1 17:17
+     */
+    public function videoFrequency(){
+        return [
+            1 => '3-4',
+            2 => '5-7',
+            3 => '7-10',
+            2 => '10-15',
+        ];
+    }
 }
 }

@@ -139,7 +139,9 @@ class Project extends Base
     {
     {
         return [
         return [
             1 => 'GEO标准版',
             1 => 'GEO标准版',
-            2 => 'GEO商务版'
+            2 => 'GEO商务版',
+            3 => '白帽SEO版',
+            9 => 'GEO体验版'
         ];
         ];
     }
     }
     /**
     /**

+<?php
+/**
+ * @remark :
+ * @name   :TicketDailyCount.php
+ * @author :lyh
+ * @method :post
+ * @time   :2025/8/7 17:50
+ */
+
+namespace App\Models\Ticket;
+
+use App\Models\Base;
+
+/**
+ * @remark :工单日统计
+ * @name   :TicketDailyCount
+ * @author :lyh
+ * @method :post
+ * @time   :2025/8/7 17:51
+ */
+class TicketDailyCount extends Base
+{
+    protected $table = 'gl_ticket_daily_count';
+}

+<?php
+/**
+ * @remark :
+ * @name   :TicketDailyDeptCount.php
+ * @author :lyh
+ * @method :post
+ * @time   :2025/8/7 17:51
+ */
+
+namespace App\Models\Ticket;
+
+use App\Models\Base;
+
+/**
+ * @remark :工单日统计：按照技术组统计
+ * @name   :TicketDailyDeptCount
+ * @author :lyh
+ * @method :post
+ * @time   :2025/8/7 17:51
+ */
+class TicketDailyDeptCount extends Base
+{
+    protected $table = 'gl_ticket_daily_dept_count';
+}

+<?php
+/**
+ * @remark :
+ * @name   :TicketDailyManageCount.php
+ * @author :lyh
+ * @method :post
+ * @time   :2025/8/7 17:52
+ */
+
+namespace App\Models\Ticket;
+
+use App\Models\Base;
+
+/**
+ * @remark :工单日统计：按照人员统计
+ * @name   :TicketDailyManageCount
+ * @author :lyh
+ * @method :post
+ * @time   :2025/8/7 17:53
+ */
+class TicketDailyManageCount extends Base
+{
+    protected $table = 'gl_ticket_daily_manage_count';
+}