Browse Source

jfinal 3.8

James 6 years ago
parent
commit
55d26e6aaa

+ 2 - 1
src/main/java/com/jfinal/aop/AopFactory.java

@@ -5,6 +5,7 @@ import java.util.HashMap;
 import java.util.concurrent.ConcurrentHashMap;
 import com.jfinal.core.Controller;
 import com.jfinal.plugin.activerecord.Model;
+import com.jfinal.validate.Validator;
 
 /**
  * AopFactory 是工具类 Aop 功能的具体实现,详细用法见 Aop
@@ -146,7 +147,7 @@ public class AopFactory {
 		// 是否对超类进行注入
 		if (injectSuperClass) {
 			Class<?> c = targetClass.getSuperclass();
-			if (c != Controller.class && c != Object.class && c != Interceptor.class && c != Model.class && c != null) {
+			if (c != Controller.class && c != Object.class && c != Validator.class && c != Model.class && c != null) {
 				doInject(c, targetObject);
 			}
 		}

+ 5 - 0
src/main/java/com/jfinal/validate/Validator.java

@@ -66,6 +66,11 @@ public abstract class Validator implements Interceptor {
 		Validator validator = null;
 		try {
 			validator = getClass().newInstance();
+			
+			if (com.jfinal.core.JFinal.me().getConstants().getInjectDependency()) {
+				com.jfinal.aop.Aop.inject(validator);
+			}
+			
 		} catch (Exception e) {
 			throw new RuntimeException(e);
 		}