多动态实例路径修改

ibzlite-core/src/main/java/cn/ibizlab/core/extensions/service/DynamicModelConfigExService.java

@@ -112,7 +112,7 @@ public class DynamicModelConfigExService extends DynamicModelConfigServiceImpl {
         List<FileItem> items = JSONArray.parseArray(strModelFile, FileItem.class);
         if (!ObjectUtils.isEmpty(items) && items.size() > 1)
             throw new BadRequestAlertException(String.format("模型解析失败，[%s]模型文件过多", et.getConfigid()), "DynamicModelConfig", "unzip");
-        File publishFile = new File(getPublishPath() + systemId);
+        File publishFile = new File(getPublishPath() + systemId + File.separator + et.getDynainstid());
         //删除发布目录中的历史文件
         if (publishFile.exists()) {
             FileHelper.deleteDir(publishFile.getPath());
@@ -261,22 +261,6 @@ public class DynamicModelConfigExService extends DynamicModelConfigServiceImpl {
         return publishPath;
     }
 
-    /**
-     *
-     * @param filePath 原路径
-     * @param instId 需要补充的动态实例id
-     * @return 在第一层路径后加上动态实例id名字作为路径
-     * 原来：/sample/xxx
-     * 修改后：/sample/dynamic/xxx
-     */
-    public String concatFilePath(String filePath,String instId) {
-        if(filePath != null && filePath.contains("\\") && filePath.split("\\\\").length > 1){
-            String prePath = filePath.substring(0,filePath.indexOf("\\"));
-            String surPath = filePath.substring(filePath.indexOf("\\")+1);
-            return prePath + File.separator + instId.toLowerCase() + File.separator + surPath;
-        }
-        return filePath;
-    }
 
     /**
      * 获取系统标识

ibzlite-util/src/main/java/cn/ibizlab/util/helper/FileHelper.java

@@ -74,6 +74,7 @@ public class FileHelper {
     public static void unTarGz(File zipFile, String descDir,boolean exp) throws IOException{
         TarInputStream tarIn = null;
         try{
+            log.info("***************************开始解压缩tar.gz格式文件***************************");
             tarIn = new TarInputStream(new GZIPInputStream(
                     new BufferedInputStream(new FileInputStream(zipFile))),
                     1024 * 2);
@@ -122,6 +123,7 @@ public class FileHelper {
             }catch(IOException ex){
                 throw new IOException("关闭tarFile出现异常",ex);
             }
+            log.info("***************************解压缩tar.gz格式文件结束***************************");
         }
     }