diff --git a/initializer-backend/src/main/java/com/schbrain/archetype/initializer/response/PreviewFileTree.java b/initializer-backend/src/main/java/com/schbrain/archetype/initializer/response/PreviewFileTree.java index 75f5ee62ab3d61da36c90e67912a3a50433f7fa1..f3732a0edf6bd5849b136099a3b4f25f25a4571f 100644 --- a/initializer-backend/src/main/java/com/schbrain/archetype/initializer/response/PreviewFileTree.java +++ b/initializer-backend/src/main/java/com/schbrain/archetype/initializer/response/PreviewFileTree.java @@ -1,10 +1,9 @@ package com.schbrain.archetype.initializer.response; -import lombok.AllArgsConstructor; +import cn.hutool.core.io.FileUtil; import lombok.Data; -import lombok.NoArgsConstructor; -import org.springframework.util.CollectionUtils; +import java.io.File; import java.util.Collections; import java.util.List; @@ -13,24 +12,27 @@ import java.util.List; * @since 2022/3/20 */ @Data -@NoArgsConstructor -@AllArgsConstructor public class PreviewFileTree { private String fileName; private String fileContent; + private Boolean isFile; + private List children; - public PreviewFileTree(String fileName, String fileContent) { - this.fileName = fileName; - this.fileContent = fileContent; - this.children = Collections.emptyList(); + public PreviewFileTree(File file) { + this(file, Collections.emptyList()); } - public boolean isFile() { - return CollectionUtils.isEmpty(children); + public PreviewFileTree(File file, List children) { + this.isFile = file.isFile(); + this.fileName = file.getName(); + this.children = children; + if (this.isFile) { + this.fileContent = FileUtil.readUtf8String(file); + } } } \ No newline at end of file diff --git a/initializer-backend/src/main/java/com/schbrain/archetype/initializer/service/ArchetypeService.java b/initializer-backend/src/main/java/com/schbrain/archetype/initializer/service/ArchetypeService.java index c10ceb1a30e3e74af40352f0dc48d044d409e75c..015cfe04bb1c7bf799156dd0cd7ee101792b7d8c 100644 --- a/initializer-backend/src/main/java/com/schbrain/archetype/initializer/service/ArchetypeService.java +++ b/initializer-backend/src/main/java/com/schbrain/archetype/initializer/service/ArchetypeService.java @@ -1,6 +1,5 @@ package com.schbrain.archetype.initializer.service; -import cn.hutool.core.io.FileUtil; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.ZipUtil; import com.schbrain.archetype.initializer.maven.MavenUtils; @@ -57,7 +56,7 @@ public class ArchetypeService { private PreviewFileTree buildFileTree(File root) { File[] fileItems = root.listFiles(); if (ArrayUtil.isEmpty(fileItems)) { - return new PreviewFileTree(root.getName(), null); + return new PreviewFileTree(root); } List children = Arrays.stream(fileItems) .map(fileItem -> { @@ -65,17 +64,13 @@ public class ArchetypeService { if (fileItem.isDirectory()) { childrenFileTree = buildFileTree(fileItem); } else { - String fileContent = FileUtil.readUtf8String(fileItem); - childrenFileTree = new PreviewFileTree(fileItem.getName(), fileContent); + childrenFileTree = new PreviewFileTree(fileItem); } return childrenFileTree; }) - .sorted(Comparator.comparing(PreviewFileTree::isFile)) + .sorted(Comparator.comparing(PreviewFileTree::getIsFile)) .collect(Collectors.toList()); - PreviewFileTree fileTree = new PreviewFileTree(); - fileTree.setFileName(root.getName()); - fileTree.setChildren(children); - return fileTree; + return new PreviewFileTree(root, children); } private File getGeneratedFiles(String id) throws FileNotFoundException { diff --git a/initializer-ui/src/assets/logo.png b/initializer-ui/src/assets/logo.png deleted file mode 100644 index f3d2503fc2a44b5053b0837ebea6e87a2d339a43..0000000000000000000000000000000000000000 Binary files a/initializer-ui/src/assets/logo.png and /dev/null differ diff --git a/initializer-ui/src/components/BackendStarter.vue b/initializer-ui/src/components/BackendStarter.vue index a0e4dfdf6f0ee77c8a88462bf2e225fcb3c088cf..9077c0f105cbda4b80e1322fb206bb93648117df 100644 --- a/initializer-ui/src/components/BackendStarter.vue +++ b/initializer-ui/src/components/BackendStarter.vue @@ -28,15 +28,6 @@ - -
- -
- @@ -90,10 +81,7 @@ export default { const reader = new FileReader(); reader.readAsText(error.data, 'utf-8'); reader.onload = function () { - ElMessageBox.alert(JSON.parse(reader.result).message, '提示', { - confirmButtonText: '确定' - } - ) + ElMessageBox.alert(JSON.parse(reader.result).message, '提示', {confirmButtonText: '确定'}) } }) },