增加对代理类的判断

Author: LinuxSuRen

src/main/java/org/suren/autotest/web/framework/selenium/WebPage.java

@@ -96,5 +96,4 @@ public String getTitle()
 	{
 		return engine.getDriver().getTitle();
 	}
-
 }

src/main/java/org/suren/autotest/web/framework/settings/Phoenix.java

@@ -50,6 +50,7 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
+import org.springframework.cglib.proxy.Enhancer;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.support.AbstractApplicationContext;
@@ -87,6 +88,7 @@
 import com.surenpi.autotest.webui.ui.AbstractElement;
 import com.surenpi.autotest.webui.ui.Text;
 
+import net.sf.cglib.proxy.Proxy;
 import net.sf.json.util.JSONUtils;
 
 /**
@@ -227,11 +229,11 @@ private void annotationScan()
 
 			Page pageBean = (Page) bean;
 			Class<?> beanCls = bean.getClass();
-//			if(!beanCls.getSuperclass().equals(Page.class))
-//			{
-//				beanCls = beanCls.getSuperclass();
-//			}
-
+			if(Enhancer.isEnhanced(beanCls))
+			{
+				beanCls = beanCls.getSuperclass();
+			}
+			
 			String clsName = beanCls.getName();
 			pageMap.put(clsName, (Page) bean);
 
@@ -440,6 +442,20 @@ public void read(InputStream inputStream) throws DocumentException, IOException,
 
 		parse(document);
 	}
+	
+	public SeleniumEngine init()
+	{
+		SeleniumEngine engine = getEngine();
+		engine.init();
+		
+		return engine;
+	}
+	
+	public void initWithData()
+	{
+		init();
+		initData();
+	}
 
 	/**
 	 * 从数据源中加载第一组数据，设置到所有page类中