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

@@ -336,6 +336,20 @@ class TranslateLogic extends BaseLogic
             $page = $arr[1];
             $page = $arr[1];
             $route = $arr[0];
             $route = $arr[0];
         }
         }
+        if(in_array($route,['products','news','blog'])){
+            //固定路由
+            $data['page'] = $page;
+            $data['is_list'] = 1;
+            if($route == 'products'){
+                $data['source'] = 2;
+            }elseif ($route == 'news'){
+                $data['source'] = 4;
+            }else{
+                $data['source'] = 3;
+            }
+            return $this->success($data);
+        }
+
         $routeModel = new RouteMap();
         $routeModel = new RouteMap();
         $routeInfo = $routeModel->read(['route'=>$route]);
         $routeInfo = $routeModel->read(['route'=>$route]);
         if($routeInfo === false){
         if($routeInfo === false){

@@ -50,6 +50,15 @@ class SyncSubmitTaskService
             return false;
             return false;
         }
         }
 
 
+        //过滤url参数 清除全部参数
+        if($project['id'] == 1442 && !empty($data['data']['url'])){
+            $query = parse_url($data['data']['url'], PHP_URL_QUERY);
+            if($query){
+                $data['data']['url'] = str_replace('?'.$query, '', $data['data']['url']);
+            }
+        }
+
+
         if(!ProjectServer::useProject($project['id'])){
         if(!ProjectServer::useProject($project['id'])){
             return false;
             return false;
         }
         }