合并分支 'develop' 到 'master'

Develop



查看合并请求 !509

@@ -129,7 +129,7 @@ class VideoTask extends Command
      */
     public function sendSubTask()
     {
-        $subTask = KeywordVideoTaskLog::where(['status' => KeywordVideoTaskLog::STATUS_INIT])->orderBy('id', 'asc')->limit($this->max_sub_task)->get();
+        $subTask = KeywordVideoTaskLog::where(['status' => KeywordVideoTaskLog::STATUS_INIT])->orderBy('id', 'asc')->get();
         if ($subTask->isEmpty()){
             return true;
         }

@@ -46,7 +46,7 @@ class Kernel extends ConsoleKernel
         $schedule->command('update_keyword_route')->dailyAt('01:00')->withoutOverlapping(1); //升级项目--清除路由相同的关键字
         $schedule->command('recommended_suppliers')->dailyAt('03:00')->withoutOverlapping(1); //每天凌晨1点执行一次生成推荐商
         // 每日推送视频任务
-        $schedule->command('video_task')->dailyAt('02:30')->withoutOverlapping(1);
+        $schedule->command('video_task')->hourly()->withoutOverlapping(1);
         // 每日推送已完成视频任务项目生成对应界面
         $schedule->command('notice_c')->dailyAt('04:00')->withoutOverlapping(1);
     }

@@ -27,6 +27,7 @@ use App\Models\User\User;
 use App\Utils\EncryptUtils;
 use http\Client\Response;
 use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\DB;
 use Mrgoon\AliSms\AliSms;
 
 class LoginController extends BaseController
@@ -312,4 +313,13 @@ class LoginController extends BaseController
         }
         return $data;
     }
+
+    public function ceshi(){
+        $result = [];
+        $data = DB::select("SELECT project_id, COUNT(*) as project_count FROM gl_file GROUP BY project_id;");
+        foreach ($data as $v){
+            array_push($result,$v['project_id']);
+        }
+        $this->response('success',Code::SUCCESS,$result);
+    }
 }