diff --git a/pom.xml b/pom.xml index 65cafc0..1c18464 100644 --- a/pom.xml +++ b/pom.xml @@ -180,14 +180,6 @@ - - - - - - - - diff --git a/src/main/java/com/qiwenshare/file/controller/OfficeController.java b/src/main/java/com/qiwenshare/file/controller/OfficeController.java index 1dee8fd..b97736b 100644 --- a/src/main/java/com/qiwenshare/file/controller/OfficeController.java +++ b/src/main/java/com/qiwenshare/file/controller/OfficeController.java @@ -87,7 +87,7 @@ public class OfficeController { } else if ("pptx".equals(extendName)) { templateFilePath = "template/PowerPoint.pptx"; } - String templateFileUrl = PathUtil.getProjectRootPath() + templateFilePath; + String templateFileUrl = PathUtil.getStaticPath() + templateFilePath; FileInputStream fileInputStream = new FileInputStream(templateFileUrl); Copier copier = ufopFactory.getCopier(); CopyFile copyFile = new CopyFile(); diff --git a/src/main/resources/build/assembly.xml b/src/main/resources/build/assembly.xml index d3175ec..0fd922a 100644 --- a/src/main/resources/build/assembly.xml +++ b/src/main/resources/build/assembly.xml @@ -17,6 +17,14 @@ src/main/resources conf 0644 + + static/** + + + + src/main/resources/static + static + 0644 diff --git a/src/main/resources/database/data.sql b/src/main/resources/database/data.sql index 4a8fa37..777714a 100644 --- a/src/main/resources/database/data.sql +++ b/src/main/resources/database/data.sql @@ -1,4 +1,3 @@ --- 初始化用户 insert ignore into role (roleId, role, description) values (1, 'admin', '管理员'),(2, 'user', '普通用户'); insert ignore into permission (permissionId, permission) values (1, 'admin'),(2, 'user'); diff --git a/src/main/resources/template/Excel.xlsx b/src/main/resources/static/template/Excel.xlsx similarity index 100% rename from src/main/resources/template/Excel.xlsx rename to src/main/resources/static/template/Excel.xlsx diff --git a/src/main/resources/template/PowerPoint.pptx b/src/main/resources/static/template/PowerPoint.pptx similarity index 100% rename from src/main/resources/template/PowerPoint.pptx rename to src/main/resources/static/template/PowerPoint.pptx diff --git a/src/main/resources/template/Word.docx b/src/main/resources/static/template/Word.docx similarity index 100% rename from src/main/resources/template/Word.docx rename to src/main/resources/static/template/Word.docx