Merge pull request #271 from lhDream/master

Solve the problem of garbled characters

Author: fvarrui

src/main/java/io/github/fvarrui/javapackager/gradle/PackagePlugin.java

@@ -2,6 +2,7 @@
 
 import edu.sc.seis.launch4j.tasks.Launch4jLibraryTask;
 import io.github.fvarrui.javapackager.packagers.Context;
+import io.github.fvarrui.javapackager.utils.Logger;
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;
 
@@ -18,7 +19,6 @@ public class PackagePlugin implements Plugin<Project> {
 
 	@Override
 	public void apply(Project project) {
-
 		Context.setContext(new GradleContext(project));
 
 		project.getPluginManager().apply("java");

src/main/java/io/github/fvarrui/javapackager/utils/CharSetUtil.java

@@ -0,0 +1,39 @@
+package io.github.fvarrui.javapackager.utils;
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class CharSetUtil {
+
+    public static Charset getCommandLineChartSet(){
+        try{
+            Process p = Runtime.getRuntime().exec("cmd /k chcp");
+            BufferedReader br = new BufferedReader(new InputStreamReader(p.getInputStream()));
+            String res = br.readLine();
+            String code = find("\\d+",res);
+            switch (code){
+                case "037": return Charset.forName("IBM037");
+                case "936": return Charset.forName("gb2312");
+                case "950": return Charset.forName("big5");
+                case "1145": return Charset.forName("IBM01145");
+                case "1200": return StandardCharsets.UTF_16;
+                case "51936": return Charset.forName("EUC-CN");
+                case "65001": return StandardCharsets.UTF_8;
+            }
+        }catch (Exception e){
+        }
+        return Charset.defaultCharset();
+    }
+
+    private static String find(String pattern,String data){
+        Pattern r = Pattern.compile(pattern);
+        Matcher matcher = r.matcher(data);
+        matcher.find();
+        return matcher.group();
+    }
+
+}

src/main/java/io/github/fvarrui/javapackager/utils/CommandUtils.java

@@ -1,9 +1,6 @@
 package io.github.fvarrui.javapackager.utils;
 
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStreamReader;
+import java.io.*;
 
 import org.apache.commons.lang3.StringUtils;
 import org.codehaus.plexus.util.cli.CommandLineException;
@@ -47,7 +44,7 @@ public static ExecutionResult executeWithResult(File workingDirectory, String ex
 
 		Process process = command.execute();
 
-		BufferedReader output = new BufferedReader(new InputStreamReader(process.getInputStream()));
+		BufferedReader output = new BufferedReader(new InputStreamReader(process.getInputStream(), CharSetUtil.getCommandLineChartSet()));
 		BufferedReader error = new BufferedReader(new InputStreamReader(process.getErrorStream()));
 		while (process.isAlive() || output.ready() || error.ready()) {
 			if (output.ready()) {

src/main/java/io/github/fvarrui/javapackager/utils/VelocityUtils.java

@@ -2,8 +2,7 @@
 
 import static org.apache.commons.io.FileUtils.writeStringToFile;
 
-import java.io.File;
-import java.io.IOException;
+import java.io.*;
 import java.util.ArrayList;
 import java.util.UUID;
 
@@ -67,10 +66,22 @@ public static void render(String templatePath, File output, Object info) throws
 		try {
 			String data = render(templatePath, info);
 			data = data.replaceAll("\\r\\n", "\n").replaceAll("\\r", "\n");
-			writeStringToFile(output, data, "UTF-8");
+			writeString(output,data);
 		} catch (IOException e) {
 			throw new Exception(e.getMessage(), e);
 		}
 	}
+
+	public static void writeString(File output,String data) throws Exception{
+		if(!output.exists()){
+			output.getParentFile().mkdirs();
+		}
+		FileOutputStream fileOutputStream = new FileOutputStream(output);
+		// write utf-8 BOM
+		byte[] uft8bom={(byte)0xef,(byte)0xbb,(byte)0xbf};
+		fileOutputStream.write(uft8bom);
+		fileOutputStream.write(data.getBytes());
+		fileOutputStream.close();
+	}
 
 }