合并分支 'akun' 到 'master'

Akun



查看合并请求 !169

@@ -418,8 +418,9 @@ class HtmlCollect extends Command
                         }
                         }
                     }
                     }
                 }
                 }
-            } elseif(substr($vs['url_complete'], -2, 2) == 'js') {
-
+            } else {
+                $html = str_replace($vs['url'], getImageUrl($vs['url_complete']), $html);
+                if(substr($vs['url_complete'], -2, 2) == 'js'){
                     $js_html = curl_c(getImageUrl($vs['url_complete']), false);
                     $js_html = curl_c(getImageUrl($vs['url_complete']), false);
                     preg_match_all("/[large|thumb]+URL:['\"]+(\s*[^>]+?)['\"]+,/i", $js_html, $result_js_source);
                     preg_match_all("/[large|thumb]+URL:['\"]+(\s*[^>]+?)['\"]+,/i", $js_html, $result_js_source);
                     $js_source = $result_js_source[1] ?? [];
                     $js_source = $result_js_source[1] ?? [];
@@ -449,8 +450,7 @@ class HtmlCollect extends Command
 
 
                         CosService::uploadRemote($project_id, 'source', $vs['url_complete'], $vs['url_complete'], $js_html);
                         CosService::uploadRemote($project_id, 'source', $vs['url_complete'], $vs['url_complete'], $js_html);
                     }
                     }
-            }else{
-                $html = str_replace($vs['url'], getImageUrl($vs['url_complete']), $html);
+                }
             }
             }
         }
         }