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

@@ -315,6 +315,10 @@ class HtmlCollect extends Command
                         $js_css_source = $result_source[1] ?? [];
                         $js_css_source = $result_source[1] ?? [];
                         if ($js_css_source) {
                         if ($js_css_source) {
                             foreach ($js_css_source as $vjs) {
                             foreach ($js_css_source as $vjs) {
+                                if (strpos($vjs, 'URL:"') !== false) {
+                                    $vjs = substr($vjs, strpos($vjs, 'URL:"') + 5);
+                                }
+
                                 $vjs_down = str_replace('"', '', $vjs);
                                 $vjs_down = str_replace('"', '', $vjs);
                                 if (strpos($vjs_down, 'data:') !== false) {
                                 if (strpos($vjs_down, 'data:') !== false) {
                                     //过滤二进制文件
                                     //过滤二进制文件

@@ -315,6 +315,10 @@ class HtmlLanguageCollect extends Command
                         $js_css_source = $result_source[1] ?? [];
                         $js_css_source = $result_source[1] ?? [];
                         if ($js_css_source) {
                         if ($js_css_source) {
                             foreach ($js_css_source as $vjs) {
                             foreach ($js_css_source as $vjs) {
+                                if (strpos($vjs, 'URL:"') !== false) {
+                                    $vjs = substr($vjs, strpos($vjs, 'URL:"') + 5);
+                                }
+
                                 $vjs_down = str_replace('"', '', $vjs);
                                 $vjs_down = str_replace('"', '', $vjs);
                                 if (strpos($vjs_down, 'data:') !== false) {
                                 if (strpos($vjs_down, 'data:') !== false) {
                                     //过滤二进制文件
                                     //过滤二进制文件

@@ -136,6 +136,10 @@ class BTemplateLogic extends BaseLogic
             if($customHtmlInfo === false){
             if($customHtmlInfo === false){
                 $this->fail('定制页面，请先上传代码块');
                 $this->fail('定制页面，请先上传代码块');
             }
             }
+            $commonInfo = $this->getCommonPage($type,$this->user['project_id'],0);//获取定制头部
+            if($commonInfo !== false){
+                $customHtmlInfo['main_html'] = $this->handleAllHtml($commonInfo,$customHtmlInfo['main_html']);
+            }
             return $customHtmlInfo['main_html'];
             return $customHtmlInfo['main_html'];
         }
         }
         return [];
         return [];
@@ -552,11 +556,10 @@ class BTemplateLogic extends BaseLogic
             }else{
             }else{
                 $type = 'all';
                 $type = 'all';
             }
             }
-            $route = RouteMap::getRoute($type,$source_id,$this->user['project_id']);
         }else{
         }else{
             $type = RouteMap::SOURCE_MODULE;
             $type = RouteMap::SOURCE_MODULE;
-            $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(['route'=>$route,'new_route'=>$route]);
     }
     }