合并分支 'master-server' 到 'master'

gx



查看合并请求 !874

@@ -11,6 +11,7 @@ namespace App\Console\Commands\DeleteTemplate;
 
 
 use App\Models\Project\Project;
 use App\Models\Project\Project;
 use App\Models\Template\BTemplateLog;
 use App\Models\Template\BTemplateLog;
+use App\Models\User\UserLog;
 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;
@@ -48,6 +49,7 @@ class TemplateLog extends Command
             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;
             ProjectServer::useProject($v['id']);
             ProjectServer::useProject($v['id']);
             $this->deleteTemplate();
             $this->deleteTemplate();
+            $this->deleteUserLog();
             DB::disconnect('custom_mysql');
             DB::disconnect('custom_mysql');
         }
         }
         echo date('Y-m-d H:i:s') . 'end' . PHP_EOL;
         echo date('Y-m-d H:i:s') . 'end' . PHP_EOL;
@@ -65,4 +67,17 @@ class TemplateLog extends Command
         $templateLogModel = new BTemplateLog();
         $templateLogModel = new BTemplateLog();
         return $templateLogModel->del(['created_at'=>['<=',$date]]);
         return $templateLogModel->del(['created_at'=>['<=',$date]]);
     }
     }
+
+    /**
+     * @remark :清除用户日志
+     * @name   :deleteUserLog
+     * @author :lyh
+     * @method :post
+     * @time   :2024/11/13 16:19
+     */
+    public function deleteUserLog(){
+        $date = date('Y-m-d H:i:s', strtotime('-60 days'));
+        $userLogModel = new UserLog();
+        return $userLogModel->del(['created_at'=>['<=',$date]]);
+    }
 }
 }

@@ -223,6 +223,9 @@ class OptimizeController extends BaseController
         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']);
         }
         }
+        if(isset($this->map['main_lang_id'])){
+            $query = $query->where('gl_project.main_lang_id',$this->map['main_lang_id']);
+        }
         if(isset($this->map['ai_video']) && !empty($this->map['ai_video'])){
         if(isset($this->map['ai_video']) && !empty($this->map['ai_video'])){
             $query = $query->where('gl_project_deploy_optimize.ai_video',$this->map['ai_video']);
             $query = $query->where('gl_project_deploy_optimize.ai_video',$this->map['ai_video']);
         }
         }