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

@@ -33,7 +33,7 @@ class UpgradeProjectCount extends Command
     protected $description = '升级项目统计';
     protected $description = '升级项目统计';
 
 
     public function handle(){
     public function handle(){
-        $project_id = 632;
+        $project_id = 769;
         ProjectServer::useProject($project_id);
         ProjectServer::useProject($project_id);
         $this->count($project_id);
         $this->count($project_id);
         DB::disconnect('custom_mysql');
         DB::disconnect('custom_mysql');

@@ -36,7 +36,7 @@ class UpgradeProjectCount extends Command
     protected $description = '升级项目统计';
     protected $description = '升级项目统计';
 
 
     public function handle(){
     public function handle(){
-        $project_id = 632;
+        $project_id = 769;
         $oldModel = new UpdateOldInfo();
         $oldModel = new UpdateOldInfo();
         $info = $oldModel->read(['project_id'=>$project_id]);
         $info = $oldModel->read(['project_id'=>$project_id]);
         $url = $info['old_domain_online'];
         $url = $info['old_domain_online'];

@@ -55,7 +55,7 @@ class UpdateRoute extends Command
      */
      */
     public function handle(){
     public function handle(){
         $projectModel = new Project();
         $projectModel = new Project();
-        $list = $projectModel->list(['is_upgrade'=>0]);
+        $list = $projectModel->list(['id'=>206]);
         $data = [];
         $data = [];
         foreach ($list as $v){
         foreach ($list as $v){
             echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;
             echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;
@@ -114,23 +114,25 @@ class UpdateRoute extends Command
         if(!empty($lists)){
         if(!empty($lists)){
             foreach ($lists as $v){
             foreach ($lists as $v){
                 if(!empty($v['route'])){
                 if(!empty($v['route'])){
-                    $tag = "-tag";
-                    if ((substr($v['route'], -strlen($tag)) === $tag)) {
-                        echo date('Y-m-d H:i:s') . '拼接 :'.$v['id'] . PHP_EOL;
-//                        $route = Translate::tran($v['route'], 'en').$tag;
-                        // 如果不是以 '-tag' 结尾，则拼接上 '-tag'
-                        $route = trim($v['route'],'-tag');
-                        $route = RouteMap::setRoute($route, RouteMap::SOURCE_PRODUCT_KEYWORD, $v['id'], $v['project_id']);
-                        $keywordModel->edit(['route'=>$route],['id'=>$v['id']]);
-//                    }else{
-//                        $route = Translate::tran($v['title'], 'en').$tag;
+//                    $tag = "-tag";
+//                    if ((substr($v['route'], -strlen($tag)) === $tag)) {
+//                        echo date('Y-m-d H:i:s') . '拼接 :'.$v['id'] . PHP_EOL;
+////                        $route = Translate::tran($v['route'], 'en').$tag;
+//                        // 如果不是以 '-tag' 结尾，则拼接上 '-tag'
+//                        $route = trim($v['route'],'-tag');
 //                        $route = RouteMap::setRoute($route, RouteMap::SOURCE_PRODUCT_KEYWORD, $v['id'], $v['project_id']);
 //                        $route = RouteMap::setRoute($route, RouteMap::SOURCE_PRODUCT_KEYWORD, $v['id'], $v['project_id']);
 //                        $keywordModel->edit(['route'=>$route],['id'=>$v['id']]);
 //                        $keywordModel->edit(['route'=>$route],['id'=>$v['id']]);
-                    }
 //                    }else{
 //                    }else{
-//                    echo date('Y-m-d H:i:s') . 'id :'.$v['id'] . PHP_EOL;
-//                    $route = RouteMap::setRoute($v['title'], RouteMap::SOURCE_PRODUCT_KEYWORD, $v['id'], $v['project_id']);
+//                        $route = Translate::tran($v['title'], 'en').$tag;
+//                        $route = RouteMap::setRoute($route, RouteMap::SOURCE_PRODUCT_KEYWORD, $v['id'], $v['project_id']);
 //                        $keywordModel->edit(['route'=>$route],['id'=>$v['id']]);
 //                        $keywordModel->edit(['route'=>$route],['id'=>$v['id']]);
+//                    }
+                }else{
+                    echo date('Y-m-d H:i:s') . 'id :'.$v['id'] . PHP_EOL;
+                    $route = Translate::tran($v['title'], 'en');
+                    echo date('Y-m-d H:i:s') . 'route :'.$route . PHP_EOL;
+                    $route = RouteMap::setRoute($route, RouteMap::SOURCE_PRODUCT_KEYWORD, $v['id'], $v['project_id']);
+                    $keywordModel->edit(['route'=>$route],['id'=>$v['id']]);
                 }
                 }
                 echo date('Y-m-d H:i:s') . 'end :' . PHP_EOL;
                 echo date('Y-m-d H:i:s') . 'end :' . PHP_EOL;
             }
             }

@@ -282,7 +282,9 @@ class WebTraffic extends Command
         ProjectServer::useProject($project_id);
         ProjectServer::useProject($project_id);
         //已发布产品分类页面
         //已发布产品分类页面
         $data['urls_cats'] = DB::connection('custom_mysql')->table('gl_product_category')
         $data['urls_cats'] = DB::connection('custom_mysql')->table('gl_product_category')
-            ->where('project_id', $project_id)->where('status',  Category::STATUS_ACTIVE)->pluck('route','id')->toArray();
+            ->where('project_id', $project_id)->where('status',  Category::STATUS_ACTIVE)
+            ->whereNull('deleted_at')
+            ->pluck('route','id')->toArray();
 
 
         //已发布单页面
         //已发布单页面
         $data['urls_page'] = [];
         $data['urls_page'] = [];
@@ -291,7 +293,9 @@ class WebTraffic extends Command
 
 
         //已发布产品详情页
         //已发布产品详情页
         $data['urls_details'] =  DB::connection('custom_mysql')->table('gl_product')
         $data['urls_details'] =  DB::connection('custom_mysql')->table('gl_product')
-            ->where('project_id', $project_id)->where('status', Product::STATUS_ON)->pluck('route', 'id')->toArray();
+            ->where('project_id', $project_id)->where('status', Product::STATUS_ON)
+            ->whereNull('deleted_at')
+            ->pluck('route', 'id')->toArray();
 
 
         $data['urls_cats'] = array_merge($data['urls_cats'], $data['urls_page']);
         $data['urls_cats'] = array_merge($data['urls_cats'], $data['urls_page']);
         if(empty($data['urls_cats'])){
         if(empty($data['urls_cats'])){

-<?php
-/**
- * @remark :
- * @name   :CopyProject.php
- * @author :lyh
- * @method :post
- * @time   :2024/1/9 16:01
- */
-
-namespace App\Events;
-
-use Illuminate\Broadcasting\InteractsWithSockets;
-use Illuminate\Foundation\Events\Dispatchable;
-use Illuminate\Queue\SerializesModels;
-class CopyProject
-{
-    use Dispatchable, InteractsWithSockets, SerializesModels;
-    public $data;
-    /**
-     * 监听更新HTML静态页
-     */
-    public function __construct($data)
-    {
-        $this->data = $data;
-    }
-}

@@ -7,6 +7,7 @@ use App\Events\CopyImageFile;
 use App\Events\CopyProject;
 use App\Events\CopyProject;
 use App\Exceptions\AsideGlobalException;
 use App\Exceptions\AsideGlobalException;
 use App\Jobs\CopyImageFileJob;
 use App\Jobs\CopyImageFileJob;
+use App\Jobs\CopyProjectJob;
 use App\Models\Com\NoticeLog;
 use App\Models\Com\NoticeLog;
 use App\Models\Com\UpdateLog;
 use App\Models\Com\UpdateLog;
 use App\Models\Devops\ServerConfig;
 use App\Models\Devops\ServerConfig;
@@ -612,7 +613,7 @@ class ProjectLogic extends BaseLogic
      * @time   :2023/11/8 14:23
      * @time   :2023/11/8 14:23
      */
      */
     public function copyProject(){
     public function copyProject(){
-        CopyProject::dispatch(['project_id'=>$this->param['project_id']]);
+        CopyProjectJob::dispatch(['project_id'=>$this->param['project_id']]);
         return $this->success();
         return $this->success();
     }
     }
 
 

 <?php
 <?php
 
 
-namespace App\Listeners;
+namespace App\Jobs;
 
 
 use App\Events\CopyProject;
 use App\Events\CopyProject;
 use App\Events\UpdateHtml;
 use App\Events\UpdateHtml;
@@ -14,17 +14,33 @@ use App\Models\Template\Setting;
 use App\Models\User\User as UserModel;
 use App\Models\User\User as UserModel;
 use App\Services\ProjectServer;
 use App\Services\ProjectServer;
 use Hashids\Hashids;
 use Hashids\Hashids;
+use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Schema;
 use Illuminate\Support\Facades\Schema;
 
 
-class CopyProjectListener implements ShouldQueue
+class CopyProjectJob implements ShouldQueue
 {
 {
-    public function __construct()
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+    public $tries = 3; // 可配置任务重试次数
+
+    protected $param;
+
+    /**
+     * Create a new job instance.
+     *
+     * @param  CopyImageFile  $event
+     * @return void
+     */
+    public function __construct($data)
     {
     {
-        //
+        $this->param = $data;
     }
     }
 
 
+
     /**
     /**
      * Handle the event.
      * Handle the event.
      *
      *

@@ -25,7 +25,6 @@ class EventServiceProvider extends ServiceProvider
         'Illuminate\Database\Events\QueryExecuted' => [
         'Illuminate\Database\Events\QueryExecuted' => [
             'App\Listeners\QueryListener',
             'App\Listeners\QueryListener',
         ],
         ],
-        CopyProject::class => [CopyProjectListener::class],
     ];
     ];
 
 
     /**
     /**