jfinal 3.5

src/main/java/com/jfinal/plugin/activerecord/generator/BaseModelGenerator.java

@@ -17,8 +17,9 @@
 package com.jfinal.plugin.activerecord.generator;
 
 import java.io.File;
-import java.io.FileWriter;
+import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.OutputStreamWriter;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -132,14 +133,25 @@ public class BaseModelGenerator {
 		}
 		
 		String target = baseModelOutputDir + File.separator + tableMeta.baseModelName + ".java";
-		FileWriter fw = new FileWriter(target);
+		OutputStreamWriter osw = null;
 		try {
-			fw.write(tableMeta.baseModelContent);
+			osw = new OutputStreamWriter(new FileOutputStream(target), "UTF-8");
+			osw.write(tableMeta.baseModelContent);
 		}
 		finally {
-			fw.close();
+			if (osw != null) {
+				osw.close();
+			}
 		}
 	}
+	
+	public String getBaseModelPackageName() {
+		return baseModelPackageName;
+	}
+	
+	public String getBaseModelOutputDir() {
+		return baseModelOutputDir;
+	}
 }
 
 

src/main/java/com/jfinal/plugin/activerecord/generator/DataDictionaryGenerator.java

@@ -17,8 +17,9 @@
 package com.jfinal.plugin.activerecord.generator;
 
 import java.io.File;
-import java.io.FileWriter;
+import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.OutputStreamWriter;
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
 import java.sql.ResultSet;
@@ -215,23 +216,23 @@ public class DataDictionaryGenerator {
 	 * _DataDictionary.txt 覆盖写入
 	 */
 	protected void writeToFile(String ret) {
-		FileWriter fw = null;
+		File dir = new File(dataDictionaryOutputDir);
+		if (!dir.exists()) {
+			dir.mkdirs();
+		}
+		
+		String target = dataDictionaryOutputDir + File.separator + dataDictionaryFileName;
+		OutputStreamWriter osw = null;
 		try {
-			File dir = new File(dataDictionaryOutputDir);
-			if (!dir.exists()) {
-				dir.mkdirs();
-			}
-			
-			String target = dataDictionaryOutputDir + File.separator + dataDictionaryFileName;
-			fw = new FileWriter(target);
-			fw.write(ret);
+			osw = new OutputStreamWriter(new FileOutputStream(target), "UTF-8");
+			osw.write(ret);
 		}
 		catch (IOException e) {
 			throw new RuntimeException(e);
 		}
 		finally {
-			if (fw != null) {
-				try {fw.close();} catch (IOException e) {LogKit.error(e.getMessage(), e);}
+			if (osw != null) {
+				try {osw.close();} catch (IOException e) {LogKit.error(e.getMessage(), e);}
 			}
 		}
 	}

src/main/java/com/jfinal/plugin/activerecord/generator/MappingKitGenerator.java

@@ -17,8 +17,9 @@
 package com.jfinal.plugin.activerecord.generator;
 
 import java.io.File;
-import java.io.FileWriter;
+import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.OutputStreamWriter;
 import java.util.List;
 import com.jfinal.kit.Kv;
 import com.jfinal.kit.LogKit;
@@ -91,23 +92,23 @@ public class MappingKitGenerator {
 	 * _MappingKit.java 覆盖写入
 	 */
 	protected void writeToFile(String ret) {
-		FileWriter fw = null;
+		File dir = new File(mappingKitOutputDir);
+		if (!dir.exists()) {
+			dir.mkdirs();
+		}
+		
+		String target = mappingKitOutputDir + File.separator + mappingKitClassName + ".java";
+		OutputStreamWriter osw = null;
 		try {
-			File dir = new File(mappingKitOutputDir);
-			if (!dir.exists()) {
-				dir.mkdirs();
-			}
-			
-			String target = mappingKitOutputDir + File.separator + mappingKitClassName + ".java";
-			fw = new FileWriter(target);
-			fw.write(ret);
+			osw = new OutputStreamWriter(new FileOutputStream(target), "UTF-8");
+			osw.write(ret);
 		}
 		catch (IOException e) {
 			throw new RuntimeException(e);
 		}
 		finally {
-			if (fw != null) {
-				try {fw.close();} catch (IOException e) {LogKit.error(e.getMessage(), e);}
+			if (osw != null) {
+				try {osw.close();} catch (IOException e) {LogKit.error(e.getMessage(), e);}
 			}
 		}
 	}

src/main/java/com/jfinal/plugin/activerecord/generator/ModelGenerator.java

@@ -17,8 +17,9 @@
 package com.jfinal.plugin.activerecord.generator;
 
 import java.io.File;
-import java.io.FileWriter;
+import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.OutputStreamWriter;
 import java.util.List;
 import com.jfinal.kit.Kv;
 import com.jfinal.kit.StrKit;
@@ -124,14 +125,29 @@ public class ModelGenerator {
 			return ;	// 若 Model 存在，不覆盖
 		}
 		
-		FileWriter fw = new FileWriter(file);
+		OutputStreamWriter osw = null;
 		try {
-			fw.write(tableMeta.modelContent);
+			osw = new OutputStreamWriter(new FileOutputStream(file), "UTF-8");
+			osw.write(tableMeta.modelContent);
 		}
 		finally {
-			fw.close();
+			if (osw != null) {
+				osw.close();
+			}
 		}
 	}
+	
+	public String getModelPackageName() {
+		return modelPackageName;
+	}
+	
+	public String getBaseModelPackageName() {
+		return baseModelPackageName;
+	}
+	
+	public String getModelOutputDir() {
+		return modelOutputDir;
+	}
 }