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

@@ -291,7 +291,7 @@ class WebTraffic extends Command
            }else{
            }else{
                //大于9个月项目
                //大于9个月项目
                $startTime = Carbon::now()->addMonths(-9)->startOfDay()->toDateTimeString();
                $startTime = Carbon::now()->addMonths(-9)->startOfDay()->toDateTimeString();
-               $query->whereBetween('pdo.start_date', '<', $startTime);
+               $query->where('pdo.start_date', '<', $startTime);
            }
            }
         })->select('pdo.project_id')->forPage($page, 500)->get();
         })->select('pdo.project_id')->forPage($page, 500)->get();
         //其他地方在引流的域名
         //其他地方在引流的域名

@@ -213,7 +213,7 @@ class OptimizeController extends BaseController
         if(isset($this->map['level']) && !empty($this->map['level'])){
         if(isset($this->map['level']) && !empty($this->map['level'])){
             $query = $query->whereRaw("FIND_IN_SET(?, gl_project.level) > 0", [$this->map['level']]);
             $query = $query->whereRaw("FIND_IN_SET(?, gl_project.level) > 0", [$this->map['level']]);
         }
         }
-        if(isset($this->map['online_updated_at']) && !empty($this->map['online_updated_at'])){
+        if(isset($this->map['online_updated_at']) && !empty($this->map['online_updated_at']) && is_array($this->map['online_updated_at'])){
             $query = $query->whereBetween('gl_project_deploy_optimize.updated_at', $this->map['online_updated_at']);
             $query = $query->whereBetween('gl_project_deploy_optimize.updated_at', $this->map['online_updated_at']);
         }
         }
         if(isset($this->map['special'])){
         if(isset($this->map['special'])){

@@ -55,6 +55,8 @@ class RouteMap extends Base
     public static function generateRoute($title, $source, $source_id, $project_id){
     public static function generateRoute($title, $source, $source_id, $project_id){
         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');
+        }elseif (preg_match('/[а-яА-Я]/u', $title)) {
+            $title = Translate::tran($title, 'en');
         }
         }
         $i=1;
         $i=1;
         $sign = generateRoute($title);
         $sign = generateRoute($title);