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

修改视频任务Master server



查看合并请求 !660

@@ -44,7 +44,7 @@ class Kernel extends ConsoleKernel
         $schedule->command('recommended_suppliers')->dailyAt('03:00')->withoutOverlapping(1); //每天凌晨1点执行一次生成推荐商
         $schedule->command('recommended_suppliers')->dailyAt('03:00')->withoutOverlapping(1); //每天凌晨1点执行一次生成推荐商
         $schedule->command('update_keyword_content')->hourly()->withoutOverlapping(1);
         $schedule->command('update_keyword_content')->hourly()->withoutOverlapping(1);
         // 每日推送视频任务
         // 每日推送视频任务
-        $schedule->command('video_task')->hourly()->withoutOverlapping(1);
+//        $schedule->command('video_task')->hourly()->withoutOverlapping(1);
         // 每日推送已完成视频任务项目生成对应界面
         // 每日推送已完成视频任务项目生成对应界面
         $schedule->command('notice_c')->dailyAt('04:00')->withoutOverlapping(1);
         $schedule->command('notice_c')->dailyAt('04:00')->withoutOverlapping(1);
     }
     }

@@ -709,7 +709,7 @@ class BTemplateLogic extends BaseLogic
         }
         }
         $route = RouteMap::getRoute($type,$source_id,$this->user['project_id']);
         $route = RouteMap::getRoute($type,$source_id,$this->user['project_id']);
         $this->addUpdateNotify($type,$route);
         $this->addUpdateNotify($type,$route);
-        return $this->curlDelRoute(['route'=>$route,'new_route'=>$route]);
+        return $this->curlDelRoute(['old_route'=>$route,'new_route'=>$route]);
     }
     }
 
 
     /**
     /**