Merge branch 'project-jmga-2.2.0' into project-jmga-dev

src/main/java/com/fdkankan/contro/mq/listener/UploadSceneListener.java

@@ -2,6 +2,7 @@ package com.fdkankan.contro.mq.listener;
 
 import cn.hutool.core.codec.Base64;
 import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.util.CharsetUtil;
 import cn.hutool.core.util.ZipUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
@@ -85,7 +86,7 @@ public class UploadSceneListener {
                 zipFile.setPassword(ZipConstant.zipPassword.toCharArray());
                 zipFile.extractAll(zipDir + uuid);
             } else {
-                ZipUtil.unzip(zipPath, zipDir + uuid);
+                ZipUtil.unzip(zipPath, zipDir + uuid, CharsetUtil.CHARSET_GBK);
             }
             //资源包类型 orig-原始数据  offline 离线包
             if(UploadSceneSourceType.ORIG.getCode().equalsIgnoreCase(sourceType)){
@@ -105,6 +106,7 @@ public class UploadSceneListener {
         log.info("结束处理管理后台上传场景,content:{}", msg);
     }
 
+
     private void uploadSceneOirg(String num, String sourcePath) throws Exception {
         ScenePlus scenePlus = scenePlusService.getScenePlusByNum(num);
         NameFileFilter fileFilter = new NameFileFilter("data.fdage");