diff --git a/easysql-api/src/main/java/cc/carm/lib/easysql/api/SQLManager.java b/easysql-api/src/main/java/cc/carm/lib/easysql/api/SQLManager.java
index c38acce..ba036cc 100644
--- a/easysql-api/src/main/java/cc/carm/lib/easysql/api/SQLManager.java
+++ b/easysql-api/src/main/java/cc/carm/lib/easysql/api/SQLManager.java
@@ -4,7 +4,6 @@ import cc.carm.lib.easysql.api.action.PreparedSQLUpdateAction;
 import cc.carm.lib.easysql.api.action.PreparedSQLUpdateBatchAction;
 import cc.carm.lib.easysql.api.action.SQLUpdateAction;
 import cc.carm.lib.easysql.api.action.SQLUpdateBatchAction;
-import cc.carm.lib.easysql.api.action.query.SQLQuery;
 import cc.carm.lib.easysql.api.builder.*;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
diff --git a/easysql-api/src/main/java/cc/carm/lib/easysql/api/action/query/SQLQuery.java b/easysql-api/src/main/java/cc/carm/lib/easysql/api/SQLQuery.java
similarity index 85%
rename from easysql-api/src/main/java/cc/carm/lib/easysql/api/action/query/SQLQuery.java
rename to easysql-api/src/main/java/cc/carm/lib/easysql/api/SQLQuery.java
index fd13c3e..6f01e72 100644
--- a/easysql-api/src/main/java/cc/carm/lib/easysql/api/action/query/SQLQuery.java
+++ b/easysql-api/src/main/java/cc/carm/lib/easysql/api/SQLQuery.java
@@ -1,6 +1,8 @@
-package cc.carm.lib.easysql.api.action.query;
+package cc.carm.lib.easysql.api;
 
 import cc.carm.lib.easysql.api.SQLManager;
+import cc.carm.lib.easysql.api.action.query.PreparedQueryAction;
+import cc.carm.lib.easysql.api.action.query.QueryAction;
 
 import java.sql.Connection;
 import java.sql.ResultSet;
diff --git a/easysql-api/src/main/java/cc/carm/lib/easysql/api/action/SQLUpdateBatchAction.java b/easysql-api/src/main/java/cc/carm/lib/easysql/api/action/SQLUpdateBatchAction.java
index 85b09da..fe73759 100644
--- a/easysql-api/src/main/java/cc/carm/lib/easysql/api/action/SQLUpdateBatchAction.java
+++ b/easysql-api/src/main/java/cc/carm/lib/easysql/api/action/SQLUpdateBatchAction.java
@@ -19,7 +19,7 @@ public interface SQLUpdateBatchAction extends SQLAction<List<Integer>> {
 	List<String> getSQLContents();
 
 	@Override
-	default SQLExceptionHandler<List<Integer>> defaultExceptionHandler() {
+	default SQLExceptionHandler defaultExceptionHandler() {
 		return (exception, action) -> {
 			getManager().getLogger().severe("Error when execute SQLs : ");
 			int i = 1;
diff --git a/easysql-api/src/main/java/cc/carm/lib/easysql/api/action/query/QueryAction.java b/easysql-api/src/main/java/cc/carm/lib/easysql/api/action/query/QueryAction.java
index 30ee919..915bf64 100644
--- a/easysql-api/src/main/java/cc/carm/lib/easysql/api/action/query/QueryAction.java
+++ b/easysql-api/src/main/java/cc/carm/lib/easysql/api/action/query/QueryAction.java
@@ -1,23 +1,24 @@
 package cc.carm.lib.easysql.api.action.query;
 
 import cc.carm.lib.easysql.api.SQLAction;
+import cc.carm.lib.easysql.api.SQLQuery;
+import cc.carm.lib.easysql.api.function.SQLExceptionHandler;
 import cc.carm.lib.easysql.api.function.SQLFunction;
+import cc.carm.lib.easysql.api.function.SQLHandler;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.sql.SQLException;
-import java.util.function.BiConsumer;
-import java.util.function.Consumer;
 
 /**
  * SQLQueryAction 是用于承载SQL查询语句并进行处理、返回并自动关闭连接的基本类。
  *
  * <ul>
- *     <li>同步执行 {@link #execute()}, {@link #execute(SQLFunction, BiConsumer)}
+ *     <li>同步执行 {@link #execute()}, {@link #execute(SQLFunction, SQLExceptionHandler)}
  *     <br>同步执行方法中有会抛出异常的方法与不抛出异常的方法，
  *     <br>若选择不抛出异常，则返回值可能为空，需要特殊处理。</li>
  *
- *     <li>异步执行 {@link #executeAsync(Consumer, BiConsumer)}
+ *     <li>异步执行 {@link #executeAsync(SQLHandler, SQLExceptionHandler)}
  *     <br>异步执行时将提供成功与异常两种处理方式
  *     <br>可自行选择是否对数据或异常进行处理
  *     <br>默认的异常处理器为 {@link #defaultExceptionHandler()}</li>
@@ -30,22 +31,22 @@ import java.util.function.Consumer;
  */
 public interface QueryAction extends SQLAction<SQLQuery> {
 
-    /**
-     * 执行语句并处理返回值
-     *
-     * @param function 处理方法
-     * @param <R>      需要返回的内容
-     * @return 指定类型数据
-     * @throws SQLException 当SQL操作出现问题时抛出
-     */
-    @Nullable
-    default <R> R executeFunction(@NotNull SQLFunction<SQLQuery, R> function)
-            throws SQLException {
-        try (SQLQuery value = execute()) {
-            return function.apply(value);
-        } catch (SQLException exception) {
-            throw new SQLException(exception);
-        }
-    }
+	/**
+	 * 执行语句并处理返回值
+	 *
+	 * @param function 处理方法
+	 * @param <R>      需要返回的内容
+	 * @return 指定类型数据
+	 * @throws SQLException 当SQL操作出现问题时抛出
+	 */
+	@Nullable
+	default <R> R executeFunction(@NotNull SQLFunction<SQLQuery, R> function)
+			throws SQLException {
+		try (SQLQuery value = execute()) {
+			return function.apply(value);
+		} catch (SQLException exception) {
+			throw new SQLException(exception);
+		}
+	}
 
 }
diff --git a/easysql-beecp/src/main/java/cc/carm/lib/easysql/EasySQL.java b/easysql-beecp/src/main/java/cc/carm/lib/easysql/EasySQL.java
index 6e2527e..ce2cf0d 100644
--- a/easysql-beecp/src/main/java/cc/carm/lib/easysql/EasySQL.java
+++ b/easysql-beecp/src/main/java/cc/carm/lib/easysql/EasySQL.java
@@ -1,7 +1,7 @@
 package cc.carm.lib.easysql;
 
 import cc.carm.lib.easysql.api.SQLManager;
-import cc.carm.lib.easysql.api.action.query.SQLQuery;
+import cc.carm.lib.easysql.api.SQLQuery;
 import cc.carm.lib.easysql.api.util.TimeDateUtils;
 import cc.carm.lib.easysql.manager.SQLManagerImpl;
 import cn.beecp.BeeDataSource;
diff --git a/easysql-demo/src/main/java/EasySQLDemo.java b/easysql-demo/src/main/java/EasySQLDemo.java
index 3fc59ff..edf1314 100644
--- a/easysql-demo/src/main/java/EasySQLDemo.java
+++ b/easysql-demo/src/main/java/EasySQLDemo.java
@@ -1,5 +1,5 @@
 import cc.carm.lib.easysql.api.SQLManager;
-import cc.carm.lib.easysql.api.action.query.SQLQuery;
+import cc.carm.lib.easysql.api.SQLQuery;
 import cc.carm.lib.easysql.api.util.TimeDateUtils;
 import cc.carm.lib.easysql.api.util.UUIDUtil;
 
diff --git a/easysql-hikaricp/src/main/java/cc/carm/lib/easysql/EasySQL.java b/easysql-hikaricp/src/main/java/cc/carm/lib/easysql/EasySQL.java
index 6572d05..48739b0 100644
--- a/easysql-hikaricp/src/main/java/cc/carm/lib/easysql/EasySQL.java
+++ b/easysql-hikaricp/src/main/java/cc/carm/lib/easysql/EasySQL.java
@@ -1,7 +1,7 @@
 package cc.carm.lib.easysql;
 
 import cc.carm.lib.easysql.api.SQLManager;
-import cc.carm.lib.easysql.api.action.query.SQLQuery;
+import cc.carm.lib.easysql.api.SQLQuery;
 import cc.carm.lib.easysql.api.util.TimeDateUtils;
 import cc.carm.lib.easysql.manager.SQLManagerImpl;
 import com.zaxxer.hikari.HikariConfig;
diff --git a/easysql-impl/src/main/java/cc/carm/lib/easysql/action/query/QueryActionImpl.java b/easysql-impl/src/main/java/cc/carm/lib/easysql/action/query/QueryActionImpl.java
index 056844e..4241e0b 100644
--- a/easysql-impl/src/main/java/cc/carm/lib/easysql/action/query/QueryActionImpl.java
+++ b/easysql-impl/src/main/java/cc/carm/lib/easysql/action/query/QueryActionImpl.java
@@ -2,7 +2,7 @@ package cc.carm.lib.easysql.action.query;
 
 import cc.carm.lib.easysql.action.AbstractSQLAction;
 import cc.carm.lib.easysql.api.action.query.QueryAction;
-import cc.carm.lib.easysql.api.action.query.SQLQuery;
+import cc.carm.lib.easysql.api.SQLQuery;
 import cc.carm.lib.easysql.api.function.SQLExceptionHandler;
 import cc.carm.lib.easysql.api.function.SQLHandler;
 import cc.carm.lib.easysql.manager.SQLManagerImpl;
diff --git a/easysql-impl/src/main/java/cc/carm/lib/easysql/manager/SQLManagerImpl.java b/easysql-impl/src/main/java/cc/carm/lib/easysql/manager/SQLManagerImpl.java
index 8e38ceb..5111153 100644
--- a/easysql-impl/src/main/java/cc/carm/lib/easysql/manager/SQLManagerImpl.java
+++ b/easysql-impl/src/main/java/cc/carm/lib/easysql/manager/SQLManagerImpl.java
@@ -8,7 +8,7 @@ import cc.carm.lib.easysql.api.SQLManager;
 import cc.carm.lib.easysql.api.action.PreparedSQLUpdateAction;
 import cc.carm.lib.easysql.api.action.PreparedSQLUpdateBatchAction;
 import cc.carm.lib.easysql.api.action.SQLUpdateBatchAction;
-import cc.carm.lib.easysql.api.action.query.SQLQuery;
+import cc.carm.lib.easysql.api.SQLQuery;
 import cc.carm.lib.easysql.api.builder.*;
 import cc.carm.lib.easysql.builder.impl.*;
 import org.jetbrains.annotations.NotNull;
diff --git a/easysql-impl/src/main/java/cc/carm/lib/easysql/query/SQLQueryImpl.java b/easysql-impl/src/main/java/cc/carm/lib/easysql/query/SQLQueryImpl.java
index 80cce92..9d24d6a 100644
--- a/easysql-impl/src/main/java/cc/carm/lib/easysql/query/SQLQueryImpl.java
+++ b/easysql-impl/src/main/java/cc/carm/lib/easysql/query/SQLQueryImpl.java
@@ -1,7 +1,7 @@
 package cc.carm.lib.easysql.query;
 
 import cc.carm.lib.easysql.action.query.QueryActionImpl;
-import cc.carm.lib.easysql.api.action.query.SQLQuery;
+import cc.carm.lib.easysql.api.SQLQuery;
 import cc.carm.lib.easysql.manager.SQLManagerImpl;
 
 import java.sql.Connection;