添加区域树

setup-project-manager/src/main/java/com/mortals/xhx/module/setup/service/impl/SetupProjectServiceImpl.java

@@ -228,6 +228,7 @@ public class SetupProjectServiceImpl extends AbstractCRUDServiceImpl<SetupProjec
         buildLogManagerUi(context);
 
 
+
         return Rest.ok();
     }
 

setup-project-manager/src/main/java/com/mortals/xhx/module/setup/web/SetupProjectController.java

@@ -271,7 +271,7 @@ public class SetupProjectController extends BaseCRUDJsonBodyMappingController<Se
 
                 if (YesNoEnum.YES.getValue() == siteAddRest.getCode()) {
                     //更新所有项目的站点编码与名称
-                    this.service.find(new SetupProjectQuery()).forEach(setupProjectEntity->{
+                    this.service.find(new SetupProjectQuery()).forEach(setupProjectEntity -> {
                         setupProjectEntity.setSiteName(siteAddRest.getData().getSiteName());
                         setupProjectEntity.setSiteCode(siteAddRest.getData().getSiteCode());
                         setupProjectEntity.setSiteId(siteAddRest.getData().getId());
@@ -283,11 +283,11 @@ public class SetupProjectController extends BaseCRUDJsonBodyMappingController<Se
                     //todo 更加站点编码生成基础服务应用，并部署到/home/publish/app/ 目录下
 
                     //todo 在/home/publish/app/ 目录下 创建自助服务应用
-                    String projectPath = this.publishPath + "/app/"+siteAddRest.getData().getSiteCode();
+                    String projectPath = this.publishPath + "/app/" + siteAddRest.getData().getSiteCode();
                     //解压资源文件
                     String sourcePath = this.publishPath + "/temp/project/" + 基础服务.getValue() + "/app.tar.gz";
                     File file = new File(sourcePath);
-                    log.info("文件存在：{} ,文件地址:{}", file.exists(),sourcePath);
+                    log.info("文件存在：{} ,文件地址:{}", file.exists(), sourcePath);
                     File destDir = new File(projectPath);
                     if (!file.exists()) {
                         throw new AppException("请上传项目工程文件！");
@@ -301,8 +301,19 @@ public class SetupProjectController extends BaseCRUDJsonBodyMappingController<Se
                     ua.setDestDirectory(destDir);
                     ua.extract();
 
-                    //todo 更新门户站点信息，用户站点树等
 
+                    projectPath = this.publishPath + "/app/";
+                    //解压资源文件
+                    sourcePath = this.publishPath + "/temp/project/" + 基础服务.getValue() + "/other.tar.gz";
+                    file = new File(sourcePath);
+                    destDir = new File(projectPath);
+                    manager.initialize();
+                    ua.enableLogging(manager.getLoggerForComponent("bla"));
+                    ua.setSourceFile(file);
+                    destDir.mkdirs();
+                    ua.setDestDirectory(destDir);
+                    ua.extract();
+                    //todo 更新门户站点信息，用户站点树等
 
 
                 } else {
@@ -340,7 +351,7 @@ public class SetupProjectController extends BaseCRUDJsonBodyMappingController<Se
 
         try {
             //todo 在/home/publish/app/ 目录下 创建自助服务应用
-            String projectPath = this.publishPath + "/app/"+siteEntity.getSiteCode();
+            String projectPath = this.publishPath + "/app/" + siteEntity.getSiteCode();
             boolean exist = FileUtil.exist(projectPath);
             if (!exist) {
                 FileUtil.mkdir(projectPath);