From a408dd55aca2bc168afa4f16c426339eba08d3ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E8=89=AF?= <841369634@qq.com> Date: Wed, 29 May 2024 12:16:48 +0800 Subject: [PATCH] =?UTF-8?q?optimize:=20file-generate=E6=8F=92=E4=BB=B6?= =?UTF-8?q?=EF=BC=8C=E6=8D=A2=E8=A1=8C=E7=AC=A6=E4=BC=98=E5=8C=96=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../icu/easyj/maven/plugin/mojo/file/FileGenerateMojo.java | 5 +++++ .../main/java/icu/easyj/maven/plugin/mojo/utils/IOUtils.java | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/easyj-maven-plugin/src/main/java/icu/easyj/maven/plugin/mojo/file/FileGenerateMojo.java b/easyj-maven-plugin/src/main/java/icu/easyj/maven/plugin/mojo/file/FileGenerateMojo.java index f324e8a..e00f96d 100644 --- a/easyj-maven-plugin/src/main/java/icu/easyj/maven/plugin/mojo/file/FileGenerateMojo.java +++ b/easyj-maven-plugin/src/main/java/icu/easyj/maven/plugin/mojo/file/FileGenerateMojo.java @@ -152,6 +152,11 @@ public void execute() throws MojoExecutionException { } else { // 新增文件 try { + fileInfo.setContent(fileInfo.getContent().replaceAll("\r?\n", "\r\n")); + if (!fileInfo.getContent().endsWith("\n")) { + fileInfo.setContent(fileInfo.getContent() + "\r\n"); + } + IOUtils.createFile(file, fileInfo.getContent()); getLog().info("Generate file: " + fileInfo.getPath()); } catch (IOException e) { diff --git a/easyj-maven-plugin/src/main/java/icu/easyj/maven/plugin/mojo/utils/IOUtils.java b/easyj-maven-plugin/src/main/java/icu/easyj/maven/plugin/mojo/utils/IOUtils.java index c97e4e8..44182f2 100644 --- a/easyj-maven-plugin/src/main/java/icu/easyj/maven/plugin/mojo/utils/IOUtils.java +++ b/easyj-maven-plugin/src/main/java/icu/easyj/maven/plugin/mojo/utils/IOUtils.java @@ -122,7 +122,7 @@ public static void createFile(File newFile, String text) throws IOException { } try (FileOutputStream out = new FileOutputStream(newFile)) { - out.write(text.replaceAll("\r", "").getBytes()); + out.write(text.getBytes()); out.flush(); } }