Merge branch 'hotfix-30056-20220811' into test

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

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

@@ -244,6 +244,7 @@ public class SceneDownloadHandlerServiceImpl {
 
         }catch (Exception e){
             log.error("下载失败,num={}", num);
+            Thread.sleep(30000);
             //更新进度为下载失败
             this.updateProgress( null, num, SceneDownloadProgressStatus.DOWNLOAD_FAILED.code(), null);
             //更新下载log状态为成功
@@ -254,7 +255,7 @@ public class SceneDownloadHandlerServiceImpl {
         }finally {
             if(StrUtil.isNotBlank(zipPath)){
                 //删除本地zip包
-//                FileUtils.deleteFile(zipPath);
+                FileUtils.deleteFile(zipPath);
             }
         }
     }