Merge branch 'master' into jfinal-java8

README.md

@@ -15,7 +15,7 @@ JFinal 是基于 Java 语言的极速 WEB + ORM 框架，其核心设计目标
 - 多视图支持，支持FreeMarker、JSP、Velocity
 - 强大的Validator后端校验功能
 - 功能齐全，拥有struts2的绝大部分功能
-- 体积小仅538K
+- 体积小仅580K
 
 **JFinal 极速开发微信公众号欢迎你的加入: JFinal**
 

src/main/java/com/jfinal/kit/FileKit.java

@@ -34,8 +34,8 @@ public class FileKit {
 						delete(files[i]);
 					}
 				}
+				file.delete();
 			}
-			file.delete();
 		}
 	}
 }

src/main/java/com/jfinal/kit/StrKit.java

@@ -79,7 +79,7 @@ public class StrKit {
 	}
 	
 	public static boolean notBlank(String... strings) {
-		if (strings == null) {
+		if (strings == null || strings.length == 0) {
 			return false;
 		}
 		for (String str : strings) {

src/main/java/com/jfinal/plugin/activerecord/DbPro.java

@@ -1158,7 +1158,7 @@ public class DbPro {
     	// the same as the iterator in Dialect.forModelSave() to ensure the order of the attrs
     	for (Entry<String, Object> e : attrs.entrySet()) {
     		String attr = e.getKey();
-    		if (config.dialect.isPrimaryKey(attr, pKeys) == false)
+    		if (config.dialect.isPrimaryKey(attr, pKeys) == false && table.hasColumnLabel(attr))
     			attrNames.add(attr);
     	}
     	for (String pKey : pKeys)