jfinal 3.5

jfinal · Jul 6, 2018 · 9d972f7 · 9d972f7
1 parent 9b1ba43
commit 9d972f7
Show file tree

Hide file tree

Showing 8 changed files with 106 additions and 53 deletions.
diff --git a/src/main/java/com/jfinal/core/Controller.java b/src/main/java/com/jfinal/core/Controller.java
@@ -55,6 +55,7 @@ public abstract class Controller {
 
 	private String urlPara;
 	private String[] urlParaArray;
+	private String rawData;
 
 	private Render render;
 
@@ -79,6 +80,14 @@ void clear() {
 		urlPara = null;
 		urlParaArray = null;
 		render = null;
+		rawData = null;
+	}
+
+	public String getRawData() {
+		if (rawData == null) {
+			rawData = com.jfinal.kit.HttpKit.readData(request);
+		}
+		return rawData;
 	}
 
 	public String getControllerKey() {

diff --git a/src/main/java/com/jfinal/plugin/activerecord/generator/BaseModelGenerator.java b/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 @@ protected void writeToFile(TableMeta tableMeta) throws IOException {
 		}
 
 		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;
+	}
 }
 
 

diff --git a/src/main/java/com/jfinal/plugin/activerecord/generator/ColumnMeta.java b/src/main/java/com/jfinal/plugin/activerecord/generator/ColumnMeta.java
@@ -16,10 +16,13 @@
 
 package com.jfinal.plugin.activerecord.generator;
 
+import java.io.Serializable;
+
 /**
  * ColumnMeta
  */
-public class ColumnMeta {
+@SuppressWarnings("serial")
+public class ColumnMeta implements Serializable  {
 
 	public String name;				// 字段名
 	public String javaType;			// 字段对应的 java 类型

diff --git a/src/main/java/com/jfinal/plugin/activerecord/generator/DataDictionaryGenerator.java b/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;
@@ -49,12 +50,20 @@ public void setDataDictionaryOutputDir(String dataDictionaryOutputDir) {
 		}
 	}
 
+	public String getDataDictionaryOutputDir() {
+		return dataDictionaryOutputDir;
+	}
+
 	public void setDataDictionaryFileName(String dataDictionaryFileName) {
 		if (StrKit.notBlank(dataDictionaryFileName)) {
 			this.dataDictionaryFileName = dataDictionaryFileName;
 		}
 	}
 
+	public String getDataDictionaryFileName() {
+		return dataDictionaryFileName;
+	}
+
 	public void generate(List<TableMeta> tableMetas) {
 		System.out.println("Generate DataDictionary file ...");
 		System.out.println("Data Dictionary Output Dir: " + dataDictionaryOutputDir);
@@ -215,23 +224,23 @@ protected void rebuildColumnMetas(List<TableMeta> tableMetas) {
 	 * _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);}
 			}
 		}
 	}

diff --git a/src/main/java/com/jfinal/plugin/activerecord/generator/MappingKitGenerator.java b/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;
@@ -63,18 +64,30 @@ public void setMappingKitOutputDir(String mappingKitOutputDir) {
 		}
 	}
 
+	public String getMappingKitOutputDir() {
+		return mappingKitOutputDir;
+	}
+
 	public void setMappingKitPackageName(String mappingKitPackageName) {
 		if (StrKit.notBlank(mappingKitPackageName)) {
 			this.mappingKitPackageName = mappingKitPackageName;
 		}
 	}
 
+	public String getMappingKitPackageName() {
+		return mappingKitPackageName;
+	}
+
 	public void setMappingKitClassName(String mappingKitClassName) {
 		if (StrKit.notBlank(mappingKitClassName)) {
 			this.mappingKitClassName = StrKit.firstCharToUpperCase(mappingKitClassName);
 		}
 	}
 
+	public String getMappingKitClassName() {
+		return mappingKitClassName;
+	}
+
 	public void generate(List<TableMeta> tableMetas) {
 		System.out.println("Generate MappingKit file ...");
 		System.out.println("MappingKit Output Dir: " + mappingKitOutputDir);
@@ -91,23 +104,23 @@ public void generate(List<TableMeta> tableMetas) {
 	 * _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);}
 			}
 		}
 	}

diff --git a/src/main/java/com/jfinal/plugin/activerecord/generator/ModelGenerator.java b/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 @@ protected void writeToFile(TableMeta tableMeta) throws IOException {
 			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;
+	}
 }
 
 
diff --git a/src/main/java/com/jfinal/plugin/activerecord/generator/TableMeta.java b/src/main/java/com/jfinal/plugin/activerecord/generator/TableMeta.java
@@ -16,13 +16,15 @@
 
 package com.jfinal.plugin.activerecord.generator;
 
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
 /**
  * TableMeta
  */
-public class TableMeta {
+@SuppressWarnings("serial")
+public class TableMeta implements Serializable {
 
 	public String name;					// 表名
 	public String remarks;				// 表备注

diff --git a/src/main/java/com/jfinal/template/source/ClassPathSource.java b/src/main/java/com/jfinal/template/source/ClassPathSource.java
@@ -17,12 +17,11 @@
 package com.jfinal.template.source;
 
 import java.io.BufferedReader;
+import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.net.JarURLConnection;
 import java.net.URL;
-import java.net.URLConnection;
 import com.jfinal.template.EngineConfig;
 
 /**
@@ -72,17 +71,12 @@ public ClassPathSource(String baseTemplatePath, String fileName, String encoding
 	}
 
 	protected void processIsInJarAndlastModified() {
-		try {
-			URLConnection conn = url.openConnection();
-			if ("jar".equals(url.getProtocol()) || conn instanceof JarURLConnection) {
-				isInJar = true;
-				lastModified = -1;
-			} else {
-				isInJar = false;
-				lastModified = conn.getLastModified();
-			}
-		} catch (IOException e) {
-			throw new RuntimeException(e);
+		if ("file".equalsIgnoreCase(url.getProtocol())) {
+			isInJar = false;
+			lastModified = new File(url.getFile()).lastModified();
+		} else {	
+			isInJar = true;
+			lastModified = -1;
 		}
 	}
 
@@ -120,12 +114,7 @@ public String getEncoding() {
 	}
 
 	protected long getLastModified() {
-		try {
-			URLConnection conn = url.openConnection();
-			return conn.getLastModified();
-		} catch (IOException e) {
-			throw new RuntimeException(e);
-		}
+		return new File(url.getFile()).lastModified();
 	}
 
 	/**