浏览代码

上传matterpro数据

dengsixing 2 年之前
父节点
当前提交
756228880c
共有 1 个文件被更改,包括 3 次插入2 次删除
  1. 3 2
      src/main/java/com/fdkankan/scene/service/impl/InnerApiServiceImpl.java

+ 3 - 2
src/main/java/com/fdkankan/scene/service/impl/InnerApiServiceImpl.java

@@ -92,7 +92,7 @@ public class InnerApiServiceImpl implements IInnerApiService {
         if(file.getOriginalFilename().toLowerCase().endsWith(".rar")){
         if(file.getOriginalFilename().toLowerCase().endsWith(".rar")){
 //            CreateObjUtil.unRar(dataSource + file.getOriginalFilename(), dataSource);
 //            CreateObjUtil.unRar(dataSource + file.getOriginalFilename(), dataSource);
             log.info("解压rar开始");
             log.info("解压rar开始");
-            String command = "unrar x " + dataSource + file.getOriginalFilename() + " " + dataSource;
+            String command = "unrar e " + dataSource + file.getOriginalFilename() + " " + dataSource;
             RuntimeUtil.exec(command);
             RuntimeUtil.exec(command);
             log.info("解压rar完毕:" + command);
             log.info("解压rar完毕:" + command);
 
 
@@ -101,8 +101,9 @@ public class InnerApiServiceImpl implements IInnerApiService {
         //删除压缩包
         //删除压缩包
 //        new File(dataSource + file.getOriginalFilename()).delete();
 //        new File(dataSource + file.getOriginalFilename()).delete();
 
 
+//        String dataPath = dataSource + FileUtil.getPrefix(file.getOriginalFilename()) + File.separator;
         List<String> fileList = new ArrayList<>();
         List<String> fileList = new ArrayList<>();
-        FileUtils.readfilePath(dataSource + FileUtil.getPrefix(file.getOriginalFilename()), fileList);
+        FileUtils.readfilePath(dataSource, fileList);
         String ossPath = "";
         String ossPath = "";
         for (String filePath : fileList) {
         for (String filePath : fileList) {
             ossPath = filePath.replace(dataSource, "images/images" + sceneNum + "/");
             ossPath = filePath.replace(dataSource, "images/images" + sceneNum + "/");