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

@@ -55,7 +55,7 @@ class UpdateRoute extends Command
      */
      */
     public function handle(){
     public function handle(){
         $projectModel = new Project();
         $projectModel = new Project();
-        $list = $projectModel->list(['id'=>687]);
+        $list = $projectModel->list(['id'=>419]);
         $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;

@@ -16,7 +16,7 @@ class Kernel extends ConsoleKernel
     protected function schedule(Schedule $schedule)
     protected function schedule(Schedule $schedule)
     {
     {
         // $schedule->command('inspire')->hourly();
         // $schedule->command('inspire')->hourly();
-        $schedule->command('remain_day')->dailyAt('08:00')->withoutOverlapping(1); // 项目剩余服务时长
+        $schedule->command('remain_day')->dailyAt('09:00')->withoutOverlapping(1); // 项目剩余服务时长
         $schedule->command('rank_data_task')->everyMinute()->withoutOverlapping(1); // 排名数据更新任务
         $schedule->command('rank_data_task')->everyMinute()->withoutOverlapping(1); // 排名数据更新任务
         $schedule->command('rank_data')->dailyAt('07:00')->withoutOverlapping(1); // 排名数据，每天凌晨执行一次
         $schedule->command('rank_data')->dailyAt('07:00')->withoutOverlapping(1); // 排名数据，每天凌晨执行一次
         $schedule->command('rank_data')->dailyAt('08:00')->withoutOverlapping(1); // 排名数据，每天凌晨执行一次
         $schedule->command('rank_data')->dailyAt('08:00')->withoutOverlapping(1); // 排名数据，每天凌晨执行一次

@@ -594,12 +594,12 @@ if (!function_exists('getFileUrl')) {
             if(substr($path,0,2) == '//'){
             if(substr($path,0,2) == '//'){
                 return 'https:'.$path;
                 return 'https:'.$path;
             }
             }
-            $file_type = pathinfo($path, PATHINFO_EXTENSION);
-            $fileTypeArr = ['zip', 'pdf', 'mp4', 'doc', 'docx', 'm4v', 'xlsx'];
-            if(in_array(strtolower($file_type),$fileTypeArr)){
-                $cdn2 = config('filesystems.disks.cos')['cdn2'];
-                return $cdn2.$path;
-            }
+//            $file_type = pathinfo($path, PATHINFO_EXTENSION);
+//            $fileTypeArr = ['zip', 'pdf', 'mp4', 'doc', 'docx', 'm4v', 'xlsx'];
+//            if(in_array(strtolower($file_type),$fileTypeArr)){
+//                $cdn2 = config('filesystems.disks.cos')['cdn2'];
+//                return $cdn2.$path;
+//            }
             if($location == 0){
             if($location == 0){
                 //v6-file.globalso.com
                 //v6-file.globalso.com
                 $cos = config('filesystems.disks.cos');
                 $cos = config('filesystems.disks.cos');

@@ -53,12 +53,11 @@ class RouteMap extends Base
      * @date 2023/4/17
      * @date 2023/4/17
      */
      */
     public static function generateRoute($title, $source, $source_id, $project_id){
     public static function generateRoute($title, $source, $source_id, $project_id){
+        if(preg_match('/^[\x{0400}-\x{04FF}]+$/u', $title)){
+            $title = Translate::tran($title, 'en');
+        }
         if(preg_match('/[\x{4e00}-\x{9fa5}]/u', $title)){
         if(preg_match('/[\x{4e00}-\x{9fa5}]/u', $title)){
             $title = Translate::tran($title, 'en');
             $title = Translate::tran($title, 'en');
-        }else{
-            if(!preg_match('/[a-zA-Z]/', $title)){
-                $title = Translate::tran($title, 'en');
-            }
         }
         }
         $i=1;
         $i=1;
         $sign = generateRoute($title);
         $sign = generateRoute($title);