diff --git a/assembly/assembly.xml b/assembly/assembly.xml index c3feffc14bb7812f54b04c12d332cc99e7b1d65e..2a421d698547531a0c76d9820e994794c9273f96 100644 --- a/assembly/assembly.xml +++ b/assembly/assembly.xml @@ -26,6 +26,11 @@ <outputDirectory>db</outputDirectory> <fileMode>0755</fileMode> </fileSet> + <fileSet> + <directory>./project</directory> + <outputDirectory>project</outputDirectory> + <fileMode>0755</fileMode> + </fileSet> </fileSets> <files> <file> diff --git a/setup-project-manager/src/main/resources/project/base-platform/base-manager.tar.gz b/setup-project-manager/project/base-platform/base-manager.tar.gz similarity index 100% rename from setup-project-manager/src/main/resources/project/base-platform/base-manager.tar.gz rename to setup-project-manager/project/base-platform/base-manager.tar.gz diff --git a/setup-project-manager/src/main/java/com/mortals/xhx/module/setup/service/impl/SetupProjectServiceImpl.java b/setup-project-manager/src/main/java/com/mortals/xhx/module/setup/service/impl/SetupProjectServiceImpl.java index fd829795c0b9ec59d05afd01f6eef33fb9cb6ee8..58b95c31b573cfbdd726ea5db319aad898453dd5 100644 --- a/setup-project-manager/src/main/java/com/mortals/xhx/module/setup/service/impl/SetupProjectServiceImpl.java +++ b/setup-project-manager/src/main/java/com/mortals/xhx/module/setup/service/impl/SetupProjectServiceImpl.java @@ -17,10 +17,7 @@ import com.mortals.xhx.module.setup.mode.SiteEntity; import com.mortals.xhx.module.setup.service.SetupDbService; import org.springframework.beans.BeanUtils; -import java.io.BufferedReader; -import java.io.File; -import java.io.InputStream; -import java.io.InputStreamReader; +import java.io.*; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; @@ -83,8 +80,16 @@ public class SetupProjectServiceImpl extends AbstractCRUDServiceImpl<SetupProjec } else { //璇诲彇鏈伐绋嬬殑璧勬簮鏂囦欢 妫€娴嬪帇缂╁寘绫诲瀷 - String sourcePath = "/project/" + ProductDisEnum.getByValue(setupProjectEntity.getProjectCode()).getDesc() + "/" + ProductDisEnum.getByValue(setupProjectEntity.getProjectCode()).getValue() + ".tar.gz"; - InputStream inputStream = this.getClass().getResourceAsStream(sourcePath); + //String sourcePath = "/project/" + ProductDisEnum.getByValue(setupProjectEntity.getProjectCode()).getDesc() + "/" + ProductDisEnum.getByValue(setupProjectEntity.getProjectCode()).getValue() + ".tar.gz"; + //InputStream inputStream = this.getClass().getResourceAsStream(sourcePath); + + String sourcePath = "./../project/" + ProductDisEnum.getByValue(setupProjectEntity.getProjectCode()).getDesc() + "/" + ProductDisEnum.getByValue(setupProjectEntity.getProjectCode()).getValue() + ".tar.gz"; + + File file = new File(sourcePath); + log.info("鏂囦欢瀛樺湪锛歿}", file.exists()); + + InputStream inputStream = FileUtil.getInputStream(file); + ZipUtils.unGzip(inputStream, setupProjectEntity.getProjectPath()); String publicPath = setupProjectEntity.getProjectPath() + ProductDisEnum.getByValue(setupProjectEntity.getProjectCode()).getValue(); diff --git a/setup-project-manager/src/main/resources/project/gateway-platform/smart-gateway.tar.gz b/setup-project-manager/src/main/resources/project/gateway-platform/smart-gateway.tar.gz deleted file mode 100644 index 851294c44979ce599da2bdbde69539f9c45d2814..0000000000000000000000000000000000000000 Binary files a/setup-project-manager/src/main/resources/project/gateway-platform/smart-gateway.tar.gz and /dev/null differ