jfinal 3.6

src/main/java/com/jfinal/config/Routes.java

@@ -33,6 +33,8 @@ public abstract class Routes {
 	private static List<Routes> routesList = new ArrayList<Routes>();
 	private static Set<String> controllerKeySet = new HashSet<String>();
 	
+	private boolean mappingSuperClass = false;	// 是否映射父类中的方法为路由
+	
 	private String baseViewPath = null;
 	private List<Route> routeItemList = new ArrayList<Route>();
 	private List<Interceptor> injectInters = new ArrayList<Interceptor>();
@@ -45,6 +47,20 @@ public abstract class Routes {
 	public abstract void config();
 	
 	/**
+	 * 设置是否映射父类中的方法为路由，默认值为 false
+	 * 
+	 * 以免 BaseController extends Controller 用法中的 BaseController 中的方法被映射成 action
+	 */
+	public Routes setMappingSuperClass(boolean mappingSuperClass) {
+		this.mappingSuperClass = mappingSuperClass;
+		return this;
+	}
+	
+	public boolean getMappingSuperClass() {
+		return mappingSuperClass;
+	}
+	
+	/**
 	 * Add Routes
 	 */
 	public Routes add(Routes routes) {

src/main/java/com/jfinal/core/ActionMapping.java

@@ -42,17 +42,6 @@ public class ActionMapping {
 		this.routes = routes;
 	}
 	
-	/*
-	protected Set<String> buildExcludedMethodName() {
-		Set<String> excludedMethodName = new HashSet<String>();
-		Method[] methods = Controller.class.getMethods();
-		for (Method m : methods) {
-			// if (m.getParameterTypes().length == 0)
-				excludedMethodName.add(m.getName());
-		}
-		return excludedMethodName;
-	} */
-	
 	protected List<Routes> getRoutesList() {
 		List<Routes> routesList = Routes.getRoutesList();
 		List<Routes> ret = new ArrayList<Routes>(routesList.size() + 1);
@@ -63,39 +52,36 @@ public class ActionMapping {
 	
 	protected void buildActionMapping() {
 		mapping.clear();
-		// Set<String> excludedMethodName = buildExcludedMethodName();
+		Class<?> dc;
 		InterceptorManager interMan = InterceptorManager.me();
 		for (Routes routes : getRoutesList()) {
 		for (Route route : routes.getRouteItemList()) {
 			Class<? extends Controller> controllerClass = route.getControllerClass();
 			Interceptor[] controllerInters = interMan.createControllerInterceptor(controllerClass);
 			
-			boolean sonOfController = (controllerClass.getSuperclass() == Controller.class);
-			Method[] methods = (sonOfController ? controllerClass.getDeclaredMethods() : controllerClass.getMethods());
+			boolean declaredMethods = routes.getMappingSuperClass()
+					? controllerClass.getSuperclass() == Controller.class
+					: true;
+			
+			Method[] methods = (declaredMethods ? controllerClass.getDeclaredMethods() : controllerClass.getMethods());
 			for (Method method : methods) {
-				String methodName = method.getName();
-				
-				// if (excludedMethodName.contains(methodName) /* || method.getParameterTypes().length != 0 */)
-					// continue ;
-				// if (sonOfController && !Modifier.isPublic(method.getModifiers()))
-					// continue ;
-				
-				
-				if (sonOfController) {
+				if (declaredMethods) {
 					if (!Modifier.isPublic(method.getModifiers()))
 						continue ;
 				} else {
-					if (method.getDeclaringClass() == Controller.class || method.getDeclaringClass() == Object.class)
+					dc = method.getDeclaringClass();
+					if (dc == Controller.class || dc == Object.class)
 						continue ;
 				}
 				
-				
-				if (method.getAnnotation(NotAction.class) != null)
+				if (method.getAnnotation(NotAction.class) != null) {
 					continue ;
+				}
 				
 				Interceptor[] actionInters = interMan.buildControllerActionInterceptor(routes.getInterceptors(), controllerInters, controllerClass, method);
 				String controllerKey = route.getControllerKey();
 				
+				String methodName = method.getName();
 				ActionKey ak = method.getAnnotation(ActionKey.class);
 				String actionKey;
 				if (ak != null) {