修改包名以及类名

src/main/java/pres/auxiliary/db/DataBaseType.java

@@ -1,4 +1,4 @@
-package pres.auxiliary.tool.sql;
+package pres.auxiliary.db;
 
 /**
  * <p><b>文件名：</b>DataBaseType.java</p>

src/main/java/pres/auxiliary/db/DatabaseException.java

@@ -1,4 +1,4 @@
-package pres.auxiliary.tool.sql;
+package pres.auxiliary.db;
 
 /**
  * <p><b>文件名：</b>DatabaseException.java</p>

src/main/java/pres/auxiliary/db/SqlAction.java

@@ -1,4 +1,4 @@
-package pres.auxiliary.tool.sql;
+package pres.auxiliary.db;
 
 import java.sql.Connection;
 import java.sql.DriverManager;

src/main/java/pres/auxiliary/http/EasyHttp.java

@@ -1,4 +1,4 @@
-package pres.auxiliary.tool.http;
+package pres.auxiliary.http;
 
 import java.io.IOException;
 import java.net.URI;

src/main/java/pres/auxiliary/http/EasyResponse.java

@@ -1,4 +1,4 @@
-package pres.auxiliary.tool.http;
+package pres.auxiliary.http;
 
 import java.io.BufferedWriter;
 import java.io.File;

src/main/java/pres/auxiliary/http/EasyResponseUtil.java

@@ -1,4 +1,4 @@
-package pres.auxiliary.tool.http;
+package pres.auxiliary.http;
 
 public class EasyResponseUtil {
 	public static void compareResponse(EasyResponse  response1, EasyResponse response2) {

src/main/java/pres/auxiliary/http/HeadType.java

@@ -1,4 +1,4 @@
-package pres.auxiliary.tool.http;
+package pres.auxiliary.http;
 
 /**
  * <p><b>文件名：</b>HeadType.java</p>

src/main/java/pres/auxiliary/http/RequestType.java

@@ -1,4 +1,4 @@
-package pres.auxiliary.tool.http;
+package pres.auxiliary.http;
 
 /**
  * <p><b>文件名：</b>RequestType.java</p>

src/main/java/pres/auxiliary/selenium/brower/AbstractBrower.java

@@ -1,4 +1,4 @@
-package pres.auxiliary.work.selenium.brower;
+package pres.auxiliary.selenium.brower;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -15,7 +15,7 @@ import org.openqa.selenium.remote.RemoteWebDriver;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 
-import pres.auxiliary.work.selenium.page.Page;
+import pres.auxiliary.selenium.page.Page;
 
 /**
  * <p><b>文件名：</b>AbstractBrower.java</p>

src/main/java/pres/auxiliary/selenium/brower/ChromeBrower.java

@@ -1,4 +1,4 @@
-package pres.auxiliary.work.selenium.brower;
+package pres.auxiliary.selenium.brower;
 
 import java.io.File;
 import java.util.HashMap;
@@ -9,7 +9,7 @@ import org.openqa.selenium.chrome.ChromeOptions;
 
 import com.alibaba.fastjson.JSONArray;
 
-import pres.auxiliary.work.selenium.page.Page;
+import pres.auxiliary.selenium.page.Page;
 
 /**
  * <p><b>文件名：</b>ChromeBrower.java</p>

src/main/java/pres/auxiliary/selenium/brower/FirefoxBrower.java

@@ -1,4 +1,4 @@
-package pres.auxiliary.work.selenium.brower;
+package pres.auxiliary.selenium.brower;
 
 import java.io.File;
 
@@ -6,7 +6,7 @@ import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.firefox.FirefoxDriver;
 import org.openqa.selenium.firefox.FirefoxOptions;
 
-import pres.auxiliary.work.selenium.page.Page;
+import pres.auxiliary.selenium.page.Page;
 
 /**
  * <p><b>文件名：</b>FirefoxBrower.java</p>

src/main/java/pres/auxiliary/selenium/brower/IeBrower.java

@@ -1,11 +1,11 @@
-package pres.auxiliary.work.selenium.brower;
+package pres.auxiliary.selenium.brower;
 
 import java.io.File;
 
 import org.openqa.selenium.ie.InternetExplorerDriver;
 import org.openqa.selenium.ie.InternetExplorerOptions;
 
-import pres.auxiliary.work.selenium.page.Page;
+import pres.auxiliary.selenium.page.Page;
 
 /**
  * <p><b>文件名：</b>IeBrower.java</p>

src/main/java/pres/auxiliary/selenium/brower/IncorrectPageException.java

@@ -1,4 +1,4 @@
-package pres.auxiliary.work.selenium.brower;
+package pres.auxiliary.selenium.brower;
 
 /**
  * <p><b>文件名：</b>IncorrectPageException.java</p>

src/main/java/pres/auxiliary/selenium/datadriven/DataDriverFunction.java

@@ -1,4 +1,4 @@
-package pres.auxiliary.work.selenium.datadriven;
+package pres.auxiliary.selenium.datadriven;
 
 /**
  * <p><b>文件名：</b>DataDriverFunction.java</p>

src/main/java/pres/auxiliary/selenium/datadriven/DataFunction.java

@@ -1,4 +1,4 @@
-package pres.auxiliary.work.selenium.datadriven;
+package pres.auxiliary.selenium.datadriven;
 
 import java.util.function.Function;
 

src/main/java/pres/auxiliary/selenium/datadriven/DataMode.java

@@ -1,4 +1,4 @@
-package pres.auxiliary.work.selenium.datadriven;
+package pres.auxiliary.selenium.datadriven;
 
 /**
  * 用于定义可向数据驱动中添加的预设模型

src/main/java/pres/auxiliary/selenium/datadriven/DataNotFoundException.java

@@ -1,4 +1,4 @@
-package pres.auxiliary.work.selenium.datadriven;
+package pres.auxiliary.selenium.datadriven;
 
 public class DataNotFoundException extends RuntimeException {
 

src/main/java/pres/auxiliary/selenium/datadriven/Functions.java

@@ -1,4 +1,4 @@
-package pres.auxiliary.work.selenium.datadriven;
+package pres.auxiliary.selenium.datadriven;
 
 import pres.auxiliary.tool.data.RandomString;
 import pres.auxiliary.tool.data.StringMode;

src/main/java/pres/auxiliary/selenium/datadriven/SplitType.java

@@ -1,4 +1,4 @@
-package pres.auxiliary.work.selenium.datadriven;
+package pres.auxiliary.selenium.datadriven;
 
 public enum SplitType {
 	/**

src/main/java/pres/auxiliary/selenium/datadriven/TestNGDataDriver.java

@@ -1,4 +1,4 @@
-package pres.auxiliary.work.selenium.datadriven;
+package pres.auxiliary.selenium.datadriven;
 
 import java.io.File;
 import java.io.IOException;

src/main/java/pres/auxiliary/selenium/element/Element.java

@@ -1,4 +1,4 @@
-package pres.auxiliary.work.selenium.element;
+package pres.auxiliary.selenium.element;
 
 import java.util.ArrayList;
 
@@ -29,7 +29,7 @@ public class Element {
 	/**
 	 * 存储AbstractBy类对象
 	 */
-	private AbstractBy abstractBy;
+	private FindElement abstractBy;
 	
 	/**
 	 * 构造对象。其传入的下标允许为-1，表示当前元素集合中不存在该元素
@@ -37,7 +37,7 @@ public class Element {
 	 * @param elementData 元素信息
 	 * @param abstractBy 元素获取类对象
 	 */
-	public Element(int index, ElementData elementData, AbstractBy abstractBy) {
+	public Element(int index, ElementData elementData, FindElement abstractBy) {
 		super();
 		this.index = index;
 		this.elementData = elementData;
@@ -89,7 +89,7 @@ public class Element {
 	 * 返回当前元素的搜索方式类对象
 	 * @return 元素的搜索方式类对象
 	 */
-	public AbstractBy getBy() {
+	public FindElement getBy() {
 		return abstractBy;
 	}
 	

src/main/java/pres/auxiliary/selenium/element/ElementData.java

@@ -1,12 +1,12 @@
-package pres.auxiliary.work.selenium.element;
+package pres.auxiliary.selenium.element;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Iterator;
 
-import pres.auxiliary.work.selenium.location.AbstractLocation;
-import pres.auxiliary.work.selenium.location.ByType;
-import pres.auxiliary.work.selenium.location.ReadLocation;
+import pres.auxiliary.selenium.location.AbstractLocation;
+import pres.auxiliary.selenium.location.ByType;
+import pres.auxiliary.selenium.location.ReadLocation;
 
 /**
  * <p><b>文件名：</b>ElementData.java</p>

src/main/java/pres/auxiliary/selenium/element/ElementType.java

@@ -1,4 +1,4 @@
-package pres.auxiliary.work.selenium.element;
+package pres.auxiliary.selenium.element;
 
 /**
  * <p><b>文件名：</b>EelementType.java</p>

src/main/java/pres/auxiliary/selenium/element/ExceptionAction.java

@@ -1,4 +1,4 @@
-package pres.auxiliary.work.selenium.element;
+package pres.auxiliary.selenium.element;
 
 import java.util.function.Consumer;
 

src/main/java/pres/auxiliary/selenium/element/FindCommonElement.java

@@ -1,10 +1,10 @@
-package pres.auxiliary.work.selenium.element;
+package pres.auxiliary.selenium.element;
 
 import java.util.ArrayList;
 
 import org.openqa.selenium.TimeoutException;
 
-import pres.auxiliary.work.selenium.brower.AbstractBrower;
+import pres.auxiliary.selenium.brower.AbstractBrower;
 
 /**
  * <p><b>文件名：</b>CommonBy.java</p>
@@ -17,13 +17,13 @@ import pres.auxiliary.work.selenium.brower.AbstractBrower;
  * @version Ver1.0
  *
  */
-public class CommonBy extends AbstractBy {
+public class FindCommonElement extends FindElement {
 
 	/**
 	 * 构造方法，初始化浏览器对象
 	 * @param brower {@link AbstractBrower}类对象
 	 */
-	public CommonBy(AbstractBrower brower) {
+	public FindCommonElement(AbstractBrower brower) {
 		super(brower);
 	}
 	
@@ -60,7 +60,7 @@ public class CommonBy extends AbstractBy {
 	 * <p>
 	 * <b>注意：</b>
 	 * <ol>
-	 * 	<li>下标允许传入负数，具体的参数逻辑可以参考{@link MultiBy#getElement(int)}方法的参数说明。</li>
+	 * 	<li>下标允许传入负数，具体的参数逻辑可以参考{@link FindMultiElement#getElement(int)}方法的参数说明。</li>
 	 * 	<li>若下标超出当前从页面获取到元素的最大值时，其不会抛出异常，但当调用{@link Element#getWebElement()}
 	 * 方法时，则会抛出元素不存在异常。</li>
 	 * </ol>

src/main/java/pres/auxiliary/selenium/element/FindDataListElement.java

@@ -1,9 +1,9 @@
-package pres.auxiliary.work.selenium.element;
+package pres.auxiliary.selenium.element;
 
 import java.util.HashSet;
 import java.util.Set;
 
-import pres.auxiliary.work.selenium.brower.AbstractBrower;
+import pres.auxiliary.selenium.brower.AbstractBrower;
 
 /**
  * <p><b>文件名：</b>DataListBy.java</p>
@@ -16,12 +16,12 @@ import pres.auxiliary.work.selenium.brower.AbstractBrower;
  * @version Ver1.0
  *
  */
-public class DataListBy extends MultiBy<DataListBy> {
+public class FindDataListElement extends FindMultiElement<FindDataListElement> {
 	/**
 	 * 构造方法，初始化浏览器对象
 	 * @param brower {@link AbstractBrower}类对象
 	 */
-	public DataListBy(AbstractBrower brower) {
+	public FindDataListElement(AbstractBrower brower) {
 		super(brower);
 	}
 	

src/main/java/pres/auxiliary/selenium/element/FindElement.java

@@ -1,4 +1,4 @@
-package pres.auxiliary.work.selenium.element;
+package pres.auxiliary.selenium.element;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -10,9 +10,9 @@ import org.openqa.selenium.TimeoutException;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.ui.WebDriverWait;
 
-import pres.auxiliary.work.selenium.brower.AbstractBrower;
-import pres.auxiliary.work.selenium.location.AbstractLocation;
-import pres.auxiliary.work.selenium.location.ByType;
+import pres.auxiliary.selenium.brower.AbstractBrower;
+import pres.auxiliary.selenium.location.AbstractLocation;
+import pres.auxiliary.selenium.location.ByType;
 
 /**
  * <p><b>文件名：</b>AbstractElement.java</p>
@@ -26,7 +26,7 @@ import pres.auxiliary.work.selenium.location.ByType;
  * @version Ver1.0
  * @since JDK 1.8
  */
-public abstract class AbstractBy {
+public abstract class FindElement {
 	/**
 	 * 存储通过信息获取到的页面元素对象
 	 */
@@ -69,7 +69,7 @@ public abstract class AbstractBy {
 	 * 通过元素信息类对象（{@link ElementData}）构造对象
 	 * @param brower {@link AbstractBrower}类对象
 	 */
-	public AbstractBy(AbstractBrower brower) {
+	public FindElement(AbstractBrower brower) {
 		this.brower = brower;
 	}
 	
@@ -111,7 +111,7 @@ public abstract class AbstractBy {
 	 * @param isBreakRootFrame 是否需要将窗体切回到顶层
 	 */
 	public void setReadMode(AbstractLocation read, boolean isBreakRootFrame) {
-		AbstractBy.read = read;
+		FindElement.read = read;
 		
 		if (isBreakRootFrame) {
 			switchRootFrame();

src/main/java/pres/auxiliary/selenium/element/FindMultiElement.java

@@ -1,11 +1,11 @@
-package pres.auxiliary.work.selenium.element;
+package pres.auxiliary.selenium.element;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import org.openqa.selenium.TimeoutException;
 
-import pres.auxiliary.work.selenium.brower.AbstractBrower;
+import pres.auxiliary.selenium.brower.AbstractBrower;
 
 /**
  * <p>
@@ -25,7 +25,7 @@ import pres.auxiliary.work.selenium.brower.AbstractBrower;
  * @version Ver1.0
  *
  */
-public abstract class MultiBy<T extends MultiBy<T>> extends AbstractBy {
+public abstract class FindMultiElement<T extends FindMultiElement<T>> extends FindElement {
 	/**
 	 * 用于记录当前元素集合中第一个元素是否为不可选择的元素，用于对元素的随机返回
 	 */
@@ -36,7 +36,7 @@ public abstract class MultiBy<T extends MultiBy<T>> extends AbstractBy {
 	 * 
 	 * @param brower {@link AbstractBrower}类对象
 	 */
-	public MultiBy(AbstractBrower brower) {
+	public FindMultiElement(AbstractBrower brower) {
 		super(brower);
 	}
 

src/main/java/pres/auxiliary/selenium/element/FindSelectElement.java

@@ -1,4 +1,4 @@
-package pres.auxiliary.work.selenium.element;
+package pres.auxiliary.selenium.element;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -6,7 +6,7 @@ import java.util.stream.Collectors;
 
 import org.openqa.selenium.support.ui.Select;
 
-import pres.auxiliary.work.selenium.brower.AbstractBrower;
+import pres.auxiliary.selenium.brower.AbstractBrower;
 
 /**
  * <p><b>文件名：</b>SelectBy.java</p>
@@ -50,7 +50,7 @@ import pres.auxiliary.work.selenium.brower.AbstractBrower;
  * @version Ver1.0
  *
  */
-public class SelectBy extends MultiBy<SelectBy> {
+public class FindSelectElement extends FindMultiElement<FindSelectElement> {
 	/**
 	 * 定义标准下拉选项的tagname
 	 */
@@ -69,7 +69,7 @@ public class SelectBy extends MultiBy<SelectBy> {
 	 * 构造方法，初始化浏览器对象
 	 * @param brower {@link AbstractBrower}类对象
 	 */
-	public SelectBy(AbstractBrower brower) {
+	public FindSelectElement(AbstractBrower brower) {
 		super(brower);
 	}
 	
@@ -101,7 +101,7 @@ public class SelectBy extends MultiBy<SelectBy> {
 	}
 	
 	@Override
-	public SelectBy find(String elementName, String... linkKeys) {
+	public FindSelectElement find(String elementName, String... linkKeys) {
 		super.find(elementName, linkKeys);
 		//判断当前存储的元素集合中是否为空，若为空，则直接返回
 		if (elementList == null || elementList.size() == 0) {

src/main/java/pres/auxiliary/selenium/element/UnrecognizableLocationModeException.java

@@ -1,38 +1,38 @@
-package pres.auxiliary.work.selenium.element;
-
-/**
- * <p><b>文件名：</b>UnrecognizableLocationModeException.java</p>
- * <p><b>用途：</b>在元素定位方式无法被识别的情况下，抛出的异常</p>
- * <p><b>编码时间：</b>2019年9月24日下午3:19:43</p>
- * <p><b>修改时间：</b>2019年9月24日下午3:19:43</p>
- * @author 彭宇琦
- * @version Ver1.0
- * @since JDK 12
- *
- */
-public class UnrecognizableLocationModeException extends RuntimeException {
-
-	private static final long serialVersionUID = 1L;
-
-	public UnrecognizableLocationModeException() {
-		super();
-	}
-
-	public UnrecognizableLocationModeException(String message, Throwable cause, boolean enableSuppression,
-			boolean writableStackTrace) {
-		super(message, cause, enableSuppression, writableStackTrace);
-	}
-
-	public UnrecognizableLocationModeException(String message, Throwable cause) {
-		super(message, cause);
-	}
-
-	public UnrecognizableLocationModeException(String message) {
-		super(message);
-	}
-
-	public UnrecognizableLocationModeException(Throwable cause) {
-		super(cause);
-	}
-
-}
+package pres.auxiliary.selenium.element;
+
+/**
+ * <p><b>文件名：</b>UnrecognizableLocationModeException.java</p>
+ * <p><b>用途：</b>在元素定位方式无法被识别的情况下，抛出的异常</p>
+ * <p><b>编码时间：</b>2019年9月24日下午3:19:43</p>
+ * <p><b>修改时间：</b>2019年9月24日下午3:19:43</p>
+ * @author 彭宇琦
+ * @version Ver1.0
+ * @since JDK 12
+ *
+ */
+public class UnrecognizableLocationModeException extends RuntimeException {
+
+	private static final long serialVersionUID = 1L;
+
+	public UnrecognizableLocationModeException() {
+		super();
+	}
+
+	public UnrecognizableLocationModeException(String message, Throwable cause, boolean enableSuppression,
+			boolean writableStackTrace) {
+		super(message, cause, enableSuppression, writableStackTrace);
+	}
+
+	public UnrecognizableLocationModeException(String message, Throwable cause) {
+		super(message, cause);
+	}
+
+	public UnrecognizableLocationModeException(String message) {
+		super(message);
+	}
+
+	public UnrecognizableLocationModeException(Throwable cause) {
+		super(cause);
+	}
+
+}

src/main/java/pres/auxiliary/selenium/event/AbstractEvent.java

@@ -1,4 +1,4 @@
-package pres.auxiliary.work.selenium.event;
+package pres.auxiliary.selenium.event;
 
 import java.time.Duration;
 import java.util.Arrays;
@@ -12,8 +12,8 @@ import org.openqa.selenium.StaleElementReferenceException;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.ui.WebDriverWait;
 
-import pres.auxiliary.work.selenium.brower.AbstractBrower;
-import pres.auxiliary.work.selenium.element.Element;
+import pres.auxiliary.selenium.brower.AbstractBrower;
+import pres.auxiliary.selenium.element.Element;
 
 /**
  * <p><b>文件名：</b>AbstractEvent.java</p>

src/main/java/pres/auxiliary/selenium/event/AssertEvent.java

@@ -1,12 +1,12 @@
-package pres.auxiliary.work.selenium.event;
+package pres.auxiliary.selenium.event;
 
 import java.util.function.Function;
 
 import org.openqa.selenium.NoSuchElementException;
 import org.openqa.selenium.TimeoutException;
 
-import pres.auxiliary.work.selenium.brower.AbstractBrower;
-import pres.auxiliary.work.selenium.element.Element;
+import pres.auxiliary.selenium.brower.AbstractBrower;
+import pres.auxiliary.selenium.element.Element;
 
 /**
  * <p>

src/main/java/pres/auxiliary/selenium/event/ClickEvent.java

@@ -1,11 +1,11 @@
-package pres.auxiliary.work.selenium.event;
+package pres.auxiliary.selenium.event;
 
 import org.openqa.selenium.NoSuchElementException;
 import org.openqa.selenium.TimeoutException;
 import org.openqa.selenium.interactions.Actions;
 
-import pres.auxiliary.work.selenium.brower.AbstractBrower;
-import pres.auxiliary.work.selenium.element.Element;
+import pres.auxiliary.selenium.brower.AbstractBrower;
+import pres.auxiliary.selenium.element.Element;
 
 /**
  * <p><b>文件名：</b>ClickEvent.java</p>

src/main/java/pres/auxiliary/selenium/event/CompareNumberType.java

@@ -1,4 +1,4 @@
-package pres.auxiliary.work.selenium.event;
+package pres.auxiliary.selenium.event;
 
 /**
  * <p><b>文件名：</b>CompareNumberType.java</p>

src/main/java/pres/auxiliary/selenium/event/EventAction.java

@@ -1,6 +1,6 @@
-package pres.auxiliary.work.selenium.event;
+package pres.auxiliary.selenium.event;
 
-import pres.auxiliary.work.selenium.element.Element;
+import pres.auxiliary.selenium.element.Element;
 
 /**
  * <p><b>文件名：</b>EventAction.java</p>

src/main/java/pres/auxiliary/selenium/event/EventInformation.java

@@ -1,10 +1,10 @@
-package pres.auxiliary.work.selenium.event;
+package pres.auxiliary.selenium.event;
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Arrays;
 
-import pres.auxiliary.work.selenium.element.Element;
+import pres.auxiliary.selenium.element.Element;
 
 /**
  * <p><b>文件名：</b>EventInformation.java</p>

src/main/java/pres/auxiliary/selenium/event/EventProxy.java

@@ -1,4 +1,4 @@
-package pres.auxiliary.work.selenium.event;
+package pres.auxiliary.selenium.event;
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;
@@ -10,9 +10,9 @@ import org.springframework.cglib.proxy.Enhancer;
 import org.springframework.cglib.proxy.MethodInterceptor;
 import org.springframework.cglib.proxy.MethodProxy;
 
-import pres.auxiliary.work.selenium.brower.AbstractBrower;
-import pres.auxiliary.work.selenium.brower.ChromeBrower;
-import pres.auxiliary.work.selenium.element.Element;
+import pres.auxiliary.selenium.brower.AbstractBrower;
+import pres.auxiliary.selenium.brower.ChromeBrower;
+import pres.auxiliary.selenium.element.Element;
 
 /**
  * <p><b>文件名：</b>EventProxy.java</p>

src/main/java/pres/auxiliary/selenium/event/JsEvent.java

@@ -1,4 +1,4 @@
-package pres.auxiliary.work.selenium.event;
+package pres.auxiliary.selenium.event;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -13,8 +13,8 @@ import org.openqa.selenium.WebElement;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 
-import pres.auxiliary.work.selenium.brower.AbstractBrower;
-import pres.auxiliary.work.selenium.element.Element;
+import pres.auxiliary.selenium.brower.AbstractBrower;
+import pres.auxiliary.selenium.element.Element;
 
 /**
  * <p>	

src/main/java/pres/auxiliary/selenium/event/TextEvent.java

@@ -1,4 +1,4 @@
-package pres.auxiliary.work.selenium.event;
+package pres.auxiliary.selenium.event;
 
 import java.io.File;
 import java.io.IOException;
@@ -11,10 +11,10 @@ import org.openqa.selenium.TimeoutException;
 import org.openqa.selenium.WebDriverException;
 import org.openqa.selenium.WebElement;
 
-import pres.auxiliary.work.selenium.brower.AbstractBrower;
-import pres.auxiliary.work.selenium.element.Element;
-import pres.auxiliary.work.selenium.tool.RecognitionImage;
-import pres.auxiliary.work.selenium.tool.Screenshot;
+import pres.auxiliary.selenium.brower.AbstractBrower;
+import pres.auxiliary.selenium.element.Element;
+import pres.auxiliary.selenium.tool.RecognitionImage;
+import pres.auxiliary.selenium.tool.Screenshot;
 
 /**
  * <p><b>文件名：</b>TextEvent.java</p>

src/main/java/pres/auxiliary/selenium/event/WaitEvent.java

@@ -1,4 +1,4 @@
-package pres.auxiliary.work.selenium.event;
+package pres.auxiliary.selenium.event;
 
 import java.time.Duration;
 
@@ -7,8 +7,8 @@ import org.openqa.selenium.StaleElementReferenceException;
 import org.openqa.selenium.TimeoutException;
 import org.openqa.selenium.support.ui.WebDriverWait;
 
-import pres.auxiliary.work.selenium.brower.AbstractBrower;
-import pres.auxiliary.work.selenium.element.Element;
+import pres.auxiliary.selenium.brower.AbstractBrower;
+import pres.auxiliary.selenium.element.Element;
 
 /**
  * <p><b>文件名：</b>WaitEvent.java</p>

src/main/java/pres/auxiliary/selenium/event/extend/ControlException.java

@@ -1,4 +1,4 @@
-package pres.auxiliary.work.selenium.event.extend;
+package pres.auxiliary.selenium.event.extend;
 
 /**
  * <p><b>文件名：</b>ControlException.java</p>

src/main/java/pres/auxiliary/selenium/event/extend/DataTableEvent.java

@@ -1,4 +1,4 @@
-package pres.auxiliary.work.selenium.event.extend;
+package pres.auxiliary.selenium.event.extend;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -9,16 +9,16 @@ import java.util.function.BooleanSupplier;
 
 import org.openqa.selenium.Keys;
 
+import pres.auxiliary.selenium.brower.AbstractBrower;
+import pres.auxiliary.selenium.element.Element;
+import pres.auxiliary.selenium.element.FindDataListElement;
+import pres.auxiliary.selenium.event.AbstractEvent;
+import pres.auxiliary.selenium.event.AssertEvent;
+import pres.auxiliary.selenium.event.ClickEvent;
+import pres.auxiliary.selenium.event.TextEvent;
+import pres.auxiliary.selenium.event.WaitEvent;
 import pres.auxiliary.tool.data.ListUtil;
 import pres.auxiliary.tool.data.TableData;
-import pres.auxiliary.work.selenium.brower.AbstractBrower;
-import pres.auxiliary.work.selenium.element.DataListBy;
-import pres.auxiliary.work.selenium.element.Element;
-import pres.auxiliary.work.selenium.event.AbstractEvent;
-import pres.auxiliary.work.selenium.event.AssertEvent;
-import pres.auxiliary.work.selenium.event.ClickEvent;
-import pres.auxiliary.work.selenium.event.TextEvent;
-import pres.auxiliary.work.selenium.event.WaitEvent;
 
 /**
  * <p>
@@ -92,7 +92,7 @@ public final class DataTableEvent extends AbstractEvent {
 	}
 
 	/**
-	 * 用于设置是否对传入的元素列表的个数进行严格校验，即在调用{@link #addList(DataListBy)}方法时，
+	 * 用于设置是否对传入的元素列表的个数进行严格校验，即在调用{@link #addList(FindDataListElement)}方法时，
 	 * 若元素个数与初次传入的个数不符且需要严格校验，则抛出异常；反之，则直接进行存储
 	 * 
 	 * @param isExamine 是否严格校验元素个数
@@ -113,13 +113,13 @@ public final class DataTableEvent extends AbstractEvent {
 	/**
 	 * 用于添加一列元素
 	 * <p>
-	 * <b>注意：</b>传入的{@link DataListBy}类对象中元素的名称请勿与其他元素名称一致，否则会覆盖原有的元素列。
+	 * <b>注意：</b>传入的{@link FindDataListElement}类对象中元素的名称请勿与其他元素名称一致，否则会覆盖原有的元素列。
 	 * 其元素名称将作为列表名称，可通过该名称获取当前列
 	 * </p>
 	 * 
 	 * @param dataListBy 元素列查找对象
 	 */
-	public void addList(DataListBy dataListBy) {
+	public void addList(FindDataListElement dataListBy) {
 		elementTable.addColumn(dataListBy.getElementData().getName(), new ArrayList<>(Optional.ofNullable(dataListBy)
 				// 将By对象转换为元素集合
 				.map(by -> by.getAllElement())
@@ -331,7 +331,7 @@ public final class DataTableEvent extends AbstractEvent {
 	}
 	
 	/**
-	 * 获取指定行的文本，其行号可传入负数，具体规则可参考{@link DataListBy#getElement(int)}方法
+	 * 获取指定行的文本，其行号可传入负数，具体规则可参考{@link FindDataListElement#getElement(int)}方法
 	 * 
 	 * @param rowIndex 指定的行号
 	 * @return 该行元素的文本
@@ -442,7 +442,7 @@ public final class DataTableEvent extends AbstractEvent {
 				
 				String columnName = element.getElementData().getName();
 				elementTable.clearColumn(columnName);
-				addList((DataListBy) element.getBy());
+				addList((FindDataListElement) element.getBy());
 			}
 		});
 	}

src/main/java/pres/auxiliary/selenium/event/extend/GroupEvent.java

@@ -1,4 +1,4 @@
-package pres.auxiliary.work.selenium.event.extend;
+package pres.auxiliary.selenium.event.extend;
 
 import java.util.ArrayList;
 import java.util.Arrays;

src/main/java/pres/auxiliary/selenium/location/AbstractLocation.java

@@ -1,6 +1,6 @@
-package pres.auxiliary.work.selenium.location;
+package pres.auxiliary.selenium.location;
 
-import pres.auxiliary.work.selenium.element.ElementType;
+import pres.auxiliary.selenium.element.ElementType;
 
 /**
  * <p><b>文件名：</b>AbstractReadConfig.java</p>

src/main/java/pres/auxiliary/selenium/location/ByType.java

@@ -1,4 +1,4 @@
-package pres.auxiliary.work.selenium.location;
+package pres.auxiliary.selenium.location;
 
 /**
  * <p>

src/main/java/pres/auxiliary/selenium/location/IncorrectFileException.java

@@ -1,4 +1,4 @@
-package pres.auxiliary.work.selenium.location;
+package pres.auxiliary.selenium.location;
 
 /**
  * 路径文件有误时抛出的异常

src/main/java/pres/auxiliary/selenium/location/JsonLocation.java

@@ -1,4 +1,4 @@
-package pres.auxiliary.work.selenium.location;
+package pres.auxiliary.selenium.location;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -11,8 +11,8 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 
-import pres.auxiliary.work.selenium.element.ElementType;
-import pres.auxiliary.work.selenium.location.UndefinedElementException.ExceptionElementType;
+import pres.auxiliary.selenium.element.ElementType;
+import pres.auxiliary.selenium.location.UndefinedElementException.ExceptionElementType;
 
 /**
  * <p><b>文件名：</b>JsonLocation.java</p>

src/main/java/pres/auxiliary/selenium/location/NoFileLocation.java

@@ -1,4 +1,4 @@
-package pres.auxiliary.work.selenium.location;
+package pres.auxiliary.selenium.location;
 
 import java.util.ArrayList;
 
@@ -6,8 +6,8 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 
-import pres.auxiliary.work.selenium.element.ElementType;
-import pres.auxiliary.work.selenium.location.UndefinedElementException.ExceptionElementType;
+import pres.auxiliary.selenium.element.ElementType;
+import pres.auxiliary.selenium.location.UndefinedElementException.ExceptionElementType;
 
 /**
  * <p><b>文件名：</b>NoFileLocation.java</p>

src/main/java/pres/auxiliary/selenium/location/ReadLocation.java

@@ -1,8 +1,8 @@
-package pres.auxiliary.work.selenium.location;
+package pres.auxiliary.selenium.location;
 
 import java.util.ArrayList;
 
-import pres.auxiliary.work.selenium.element.ElementType;
+import pres.auxiliary.selenium.element.ElementType;
 
 /**
  * <p><b>文件名：</b>ReadLocation.java</p>

src/main/java/pres/auxiliary/selenium/location/TextLocation.java

@@ -1,10 +1,10 @@
-package pres.auxiliary.work.selenium.location;
+package pres.auxiliary.selenium.location;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import pres.auxiliary.work.selenium.element.ElementType;
+import pres.auxiliary.selenium.element.ElementType;
 
 /**
  * <p><b>文件名：</b>TextLcation.java</p>

src/main/java/pres/auxiliary/selenium/location/UndefinedElementException.java

@@ -1,4 +1,4 @@
-package pres.auxiliary.work.selenium.location;
+package pres.auxiliary.selenium.location;
 
 /**
  * <p><b>文件名：</b>UndefinedElementException.java</p>

src/main/java/pres/auxiliary/selenium/location/WriteLocation.java

@@ -1,6 +1,6 @@
-package pres.auxiliary.work.selenium.location;
+package pres.auxiliary.selenium.location;
 
-import pres.auxiliary.work.selenium.element.ElementType;
+import pres.auxiliary.selenium.element.ElementType;
 
 /**
  * <p><b>文件名：</b>WriteLocation.java</p>

src/main/java/pres/auxiliary/selenium/location/WriteTempletLocation.java

@@ -1,4 +1,4 @@
-package pres.auxiliary.work.selenium.location;
+package pres.auxiliary.selenium.location;
 
 /**
  * <p><b>文件名：</b>WriteTempletLocation.java</p>

src/main/java/pres/auxiliary/selenium/location/XmlLocation.java

@@ -1,4 +1,4 @@
-package pres.auxiliary.work.selenium.location;
+package pres.auxiliary.selenium.location;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -10,8 +10,8 @@ import org.dom4j.DocumentException;
 import org.dom4j.Element;
 import org.dom4j.io.SAXReader;
 
-import pres.auxiliary.work.selenium.element.ElementType;
-import pres.auxiliary.work.selenium.location.UndefinedElementException.ExceptionElementType;
+import pres.auxiliary.selenium.element.ElementType;
+import pres.auxiliary.selenium.location.UndefinedElementException.ExceptionElementType;
 
 /**
  * <p>

src/main/java/pres/auxiliary/selenium/page/Page.java

@@ -1,4 +1,4 @@
-package pres.auxiliary.work.selenium.page;
+package pres.auxiliary.selenium.page;
 
 import java.util.concurrent.TimeUnit;
 
@@ -6,7 +6,7 @@ import org.openqa.selenium.WebDriver;
 
 import com.alibaba.fastjson.JSONObject;
 
-import pres.auxiliary.work.selenium.brower.AbstractBrower;
+import pres.auxiliary.selenium.brower.AbstractBrower;
 
 /**
  * <p><b>文件名：</b>Page.java</p>

src/main/java/pres/auxiliary/selenium/tool/ExcelRecord.java

@@ -1,4 +1,4 @@
-package pres.auxiliary.work.selenium.tool;
+package pres.auxiliary.selenium.tool;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -10,10 +10,10 @@ import org.dom4j.Element;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 
+import pres.auxiliary.selenium.brower.AbstractBrower;
 import pres.auxiliary.tool.date.Time;
 import pres.auxiliary.tool.file.MarkColorsType;
 import pres.auxiliary.tool.file.excel.AbstractWriteExcel;
-import pres.auxiliary.work.selenium.brower.AbstractBrower;
 
 /**
  * <p><b>文件名：</b>ExcelRecord.java</p>

src/main/java/pres/auxiliary/selenium/tool/IncorrectDirectoryException.java

@@ -1,4 +1,4 @@
-package pres.auxiliary.work.selenium.tool;
+package pres.auxiliary.selenium.tool;
 
 public class IncorrectDirectoryException extends RuntimeException {
 

src/main/java/pres/auxiliary/selenium/tool/RecognitionImage.java

@@ -1,4 +1,4 @@
-package pres.auxiliary.work.selenium.tool;
+package pres.auxiliary.selenium.tool;
 
 import java.awt.Rectangle;
 import java.awt.image.BufferedImage;

src/main/java/pres/auxiliary/selenium/tool/RecordType.java

@@ -1,4 +1,4 @@
-package pres.auxiliary.work.selenium.tool;
+package pres.auxiliary.selenium.tool;
 
 /**
  * <p><b>文件名：</b>RecordType.java</p>

src/main/java/pres/auxiliary/selenium/tool/Screenshot.java

@@ -1,4 +1,4 @@
-package pres.auxiliary.work.selenium.tool;
+package pres.auxiliary.selenium.tool;
 
 import java.io.File;
 import java.io.IOException;

src/main/java/pres/auxiliary/testcase/file/AbstractTestCaseWrite.java

@@ -1,4 +1,4 @@
-package pres.auxiliary.work.testcase.file;
+package pres.auxiliary.testcase.file;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -6,9 +6,9 @@ import java.util.HashMap;
 
 import org.dom4j.DocumentException;
 
+import pres.auxiliary.testcase.templet.Case;
+import pres.auxiliary.testcase.templet.LabelNotFoundException;
 import pres.auxiliary.tool.file.excel.AbstractWriteExcel;
-import pres.auxiliary.work.testcase.templet.Case;
-import pres.auxiliary.work.testcase.templet.LabelNotFoundException;
 
 /**
  * <p><b>文件名：</b>AbstractTestCaseWrite.java</p>

src/main/java/pres/auxiliary/testcase/file/BasicTestCaseWrite.java

@@ -1,30 +1,30 @@
-package pres.auxiliary.work.testcase.file;
-
-import java.io.File;
-
-import org.dom4j.DocumentException;
-
-/**
- * <p><b>文件名：</b>BasicTestCaseWrite.java</p>
- * <p><b>用途：</b>在无相应的测试用例文件类时，可使用本类，对自定义的一个测试用例模板进行编辑</p>
- * <p><b>编码时间：</b>2020年4月5日 下午6:51:54</p>
- * <p><b>修改时间：</b>2020年4月5日 下午6:51:54</p>
- * @author 彭宇琦
- * @version Ver1.0
- * @since JDK 12
- */
-public class BasicTestCaseWrite extends AbstractTestCaseWrite<BasicTestCaseWrite> {
-	/**
-	 * 通过测试文件模板xml配置文件和测试用例文件来构造AbstractTestCaseWrite类。当配置文件中
-	 * 只存在一个sheet标签时，则直接获取其对应sheet下所有column标签的id属性；若存在
-	 * 多个sheet标签时，则读取第一个sheet标签，如需切换sheet标签，则可调用{@link #switchSheet(String)} 方法。
-	 * 
-	 * @param configFile 测试文件模板xml配置文件类对象
-	 * @param caseFile   测试用例文件类对象
-	 * @throws DocumentException 
-	 * @throws IncorrectFileException 文件格式或路径不正确时抛出的异常
-	 */
-	public BasicTestCaseWrite(File configFile, File caseFile) throws DocumentException {
-		super(configFile, caseFile);
-	}
-}
+package pres.auxiliary.testcase.file;
+
+import java.io.File;
+
+import org.dom4j.DocumentException;
+
+/**
+ * <p><b>文件名：</b>BasicTestCaseWrite.java</p>
+ * <p><b>用途：</b>在无相应的测试用例文件类时，可使用本类，对自定义的一个测试用例模板进行编辑</p>
+ * <p><b>编码时间：</b>2020年4月5日 下午6:51:54</p>
+ * <p><b>修改时间：</b>2020年4月5日 下午6:51:54</p>
+ * @author 彭宇琦
+ * @version Ver1.0
+ * @since JDK 12
+ */
+public class BasicTestCaseWrite extends AbstractTestCaseWrite<BasicTestCaseWrite> {
+	/**
+	 * 通过测试文件模板xml配置文件和测试用例文件来构造AbstractTestCaseWrite类。当配置文件中
+	 * 只存在一个sheet标签时，则直接获取其对应sheet下所有column标签的id属性；若存在
+	 * 多个sheet标签时，则读取第一个sheet标签，如需切换sheet标签，则可调用{@link #switchSheet(String)} 方法。
+	 * 
+	 * @param configFile 测试文件模板xml配置文件类对象
+	 * @param caseFile   测试用例文件类对象
+	 * @throws DocumentException 
+	 * @throws IncorrectFileException 文件格式或路径不正确时抛出的异常
+	 */
+	public BasicTestCaseWrite(File configFile, File caseFile) throws DocumentException {
+		super(configFile, caseFile);
+	}
+}

src/main/java/pres/auxiliary/testcase/file/CommonTestCaseWrite.java

@@ -1,4 +1,4 @@
-package pres.auxiliary.work.testcase.file;
+package pres.auxiliary.testcase.file;
 
 import java.io.File;
 import java.util.ArrayList;

src/main/java/pres/auxiliary/testcase/file/FieldType.java

@@ -1,4 +1,4 @@
-package pres.auxiliary.work.testcase.file;
+package pres.auxiliary.testcase.file;
 
 /**
  * <p><b>文件名：</b>FieidType.java</p>

src/main/java/pres/auxiliary/testcase/file/IncorrectFileException.java

@@ -1,4 +1,4 @@
-package pres.auxiliary.work.testcase.file;
+package pres.auxiliary.testcase.file;
 
 /**
  * <p><b>文件名：</b>IncorrectFileException.java</p>

src/main/java/pres/auxiliary/testcase/file/JiraTestCaseWrite.java

@@ -1,10 +1,10 @@
-package pres.auxiliary.work.testcase.file;
+package pres.auxiliary.testcase.file;
 
 import java.io.File;
 
 import org.dom4j.DocumentException;
 
-import pres.auxiliary.work.testcase.templet.LabelType;
+import pres.auxiliary.testcase.templet.LabelType;
 
 /**
  * <p><b>文件名：</b>JiraTestCaseWrite.java</p>

src/main/java/pres/auxiliary/testcase/templet/Case.java

@@ -1,4 +1,4 @@
-package pres.auxiliary.work.testcase.templet;
+package pres.auxiliary.testcase.templet;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -11,7 +11,7 @@ import org.dom4j.DocumentException;
 import org.dom4j.Element;
 import org.dom4j.io.SAXReader;
 
-import pres.auxiliary.work.testcase.file.IncorrectFileException;
+import pres.auxiliary.testcase.file.IncorrectFileException;
 
 /**
  * <p><b>文件名：</b>Case.java</p>

src/main/java/pres/auxiliary/testcase/templet/CaseContentException.java

@@ -1,4 +1,4 @@
-package pres.auxiliary.work.testcase.templet;
+package pres.auxiliary.testcase.templet;
 
 /**
  * <p><b>文件名：</b>CaseContentException.java</p>

src/main/java/pres/auxiliary/testcase/templet/DataListCase.java

@@ -1,4 +1,4 @@
-package pres.auxiliary.work.testcase.templet;
+package pres.auxiliary.testcase.templet;
 
 import java.io.File;
 

src/main/java/pres/auxiliary/testcase/templet/InformationCase.java

@@ -1,4 +1,4 @@
-package pres.auxiliary.work.testcase.templet;
+package pres.auxiliary.testcase.templet;
 
 import java.io.File;
 import java.util.Arrays;

src/main/java/pres/auxiliary/testcase/templet/LabelNotFoundException.java

@@ -1,4 +1,4 @@
-package pres.auxiliary.work.testcase.templet;
+package pres.auxiliary.testcase.templet;
 
 public class LabelNotFoundException extends RuntimeException {
 

src/main/java/pres/auxiliary/testcase/templet/LabelType.java

@@ -1,4 +1,4 @@
-package pres.auxiliary.work.testcase.templet;
+package pres.auxiliary.testcase.templet;
 
 /**
  * <p><b>文件名：</b>LabelType.java</p>

src/main/java/pres/auxiliary/testcase/templet/MapCase.java

@@ -1,4 +1,4 @@
-package pres.auxiliary.work.testcase.templet;
+package pres.auxiliary.testcase.templet;
 
 import java.io.File;
 import java.util.Arrays;

src/main/java/pres/auxiliary/testcase/templet/UserCase.java

@@ -1,4 +1,4 @@
-package pres.auxiliary.work.testcase.templet;
+package pres.auxiliary.testcase.templet;
 
 import java.io.File;
 

src/main/java/pres/auxiliary/testcase/templet/VideoCase.java

@@ -1,4 +1,4 @@
-package pres.auxiliary.work.testcase.templet;
+package pres.auxiliary.testcase.templet;
 
 import java.io.File;
 

src/main/java/pres/auxiliary/tool/file/ExcelConfigXmlTool.java

@@ -8,7 +8,7 @@ import org.dom4j.Document;
 import org.dom4j.io.OutputFormat;
 import org.dom4j.io.XMLWriter;
 
-import pres.auxiliary.work.selenium.tool.ExcelRecord;
+import pres.auxiliary.selenium.tool.ExcelRecord;
 
 /**
  * <p><b>文件名：</b>ConfigXmlTool.java</p>

src/main/java/pres/auxiliary/tool/file/excel/AbstractWriteExcel.java

@@ -37,13 +37,13 @@ import org.dom4j.DocumentHelper;
 import org.dom4j.Element;
 import org.dom4j.io.SAXReader;
 
+import pres.auxiliary.testcase.file.IncorrectFileException;
+import pres.auxiliary.testcase.templet.LabelNotFoundException;
 import pres.auxiliary.tool.data.TableData;
 import pres.auxiliary.tool.file.MarkColorsType;
 import pres.auxiliary.tool.file.TableFileReadUtil;
 import pres.auxiliary.tool.file.UnsupportedFileException;
 import pres.auxiliary.tool.regex.RegexType;
-import pres.auxiliary.work.testcase.file.IncorrectFileException;
-import pres.auxiliary.work.testcase.templet.LabelNotFoundException;
 
 /**
  * <p>

src/main/java/pres/auxiliary/tool/file/excel/CreateExcelFile.java

@@ -22,11 +22,11 @@ import org.dom4j.DocumentException;
 import org.dom4j.Element;
 import org.dom4j.io.SAXReader;
 
+import pres.auxiliary.testcase.file.IncorrectFileException;
+import pres.auxiliary.testcase.templet.LabelNotFoundException;
 import pres.auxiliary.tool.data.TableData;
 import pres.auxiliary.tool.file.TableFileReadUtil;
 import pres.auxiliary.tool.file.UnsupportedFileException;
-import pres.auxiliary.work.testcase.file.IncorrectFileException;
-import pres.auxiliary.work.testcase.templet.LabelNotFoundException;
 
 /**
  * <p>

src/main/java/pres/auxiliary/tool/file/excel/WriteExcel.java

@@ -5,7 +5,7 @@ import java.io.File;
 import org.dom4j.Document;
 import org.dom4j.DocumentException;
 
-import pres.auxiliary.work.testcase.file.IncorrectFileException;
+import pres.auxiliary.testcase.file.IncorrectFileException;
 
 /**
  * <p><b>文件名：</b>WriteExcel.java</p>