Merge branch 'hotfix-国际版下载跳过labda切图文件-20220628' into test

4dkankan-center-scene-download/src/main/java/com/fdkankan/download/service/impl/SceneDownloadHandlerServiceImpl.java

@@ -392,12 +392,15 @@ public class SceneDownloadHandlerServiceImpl {
 
     private void processImage(String key, ZipOutputStream out, String resolution, int imagesVersion, Set<String> imgKeys) throws Exception{
 
+        if(key.contains("x-oss-process") || key.endsWith("/")){
+            return;
+        }
+
         String fileName = key.substring(key.lastIndexOf("/")+1, key.indexOf("."));
         String ext = key.substring(key.lastIndexOf("."));
         String[] arr = fileName.split("_skybox");
         String dir = arr[0];
         String num = arr[1];
-
         if(StrUtil.isEmpty(fileName)
             || StrUtil.isEmpty(ext)
             || (".jpg".equals(ext) && ".png".equals(ext))
@@ -405,7 +408,6 @@ public class SceneDownloadHandlerServiceImpl {
             || StrUtil.isEmpty(num)){
             throw new Exception("本地下载图片资源不符合规则，key：" + key);
         }
-
         for (ImageType imageType : imageTypes) {
 
             List<ImageTypeDetail> items = Lists.newArrayList();