From 41fd7ed4c3f0b2829f6d5663f1eafa95ad20b63e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=80=E6=BA=90=E6=B5=B7=E5=93=A5?= <fuhai999@gmail.com>
Date: Wed, 9 Aug 2023 10:43:09 +0800
Subject: [PATCH 01/22] fix: db2 sql escape error

---
 .../java/com/mybatisflex/core/dialect/DialectFactory.java  | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/dialect/DialectFactory.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/dialect/DialectFactory.java
index d87aa474..29405865 100644
--- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/dialect/DialectFactory.java
+++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/dialect/DialectFactory.java
@@ -103,12 +103,13 @@ public class DialectFactory {
             case GBASE:
             case OSCAR:
             case XUGU:
-            case CLICK_HOUSE:
             case OCEAN_BASE:
             case CUBRID:
             case GOLDILOCKS:
             case CSIIDB:
                 return new CommonsDialectImpl(KeywordWrap.BACK_QUOTE, LimitOffsetProcessor.MYSQL);
+            case CLICK_HOUSE:
+                return new CommonsDialectImpl(KeywordWrap.NONE, LimitOffsetProcessor.MYSQL);
             case DM:
                 return new DmDialect();
             case ORACLE:
@@ -134,13 +135,13 @@ public class DialectFactory {
                 return new OracleDialect(LimitOffsetProcessor.DERBY);
             case FIREBIRD:
             case DB2:
-                return new CommonsDialectImpl(KeywordWrap.DOUBLE_QUOTATION, LimitOffsetProcessor.DERBY);
+                return new CommonsDialectImpl(KeywordWrap.NONE, LimitOffsetProcessor.DERBY);
             case SQLSERVER:
                 return new CommonsDialectImpl(KeywordWrap.SQUARE_BRACKETS, LimitOffsetProcessor.SQLSERVER);
             case SQLSERVER_2005:
                 return new CommonsDialectImpl(KeywordWrap.SQUARE_BRACKETS, LimitOffsetProcessor.SQLSERVER_2005);
             case INFORMIX:
-                return new CommonsDialectImpl(KeywordWrap.DOUBLE_QUOTATION, LimitOffsetProcessor.INFORMIX);
+                return new CommonsDialectImpl(KeywordWrap.NONE, LimitOffsetProcessor.INFORMIX);
             case SINODB:
                 return new CommonsDialectImpl(KeywordWrap.DOUBLE_QUOTATION, LimitOffsetProcessor.SINODB);
             case SYBASE:

From 79d7b2c934316e685d2382cab5740878c891589f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=80=E6=BA=90=E6=B5=B7=E5=93=A5?= <fuhai999@gmail.com>
Date: Wed, 9 Aug 2023 10:52:15 +0800
Subject: [PATCH 02/22] test: update AccountSqlTester.java

---
 .../mybatisflex/coretest/AccountSqlTester.java    | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/mybatis-flex-core/src/test/java/com/mybatisflex/coretest/AccountSqlTester.java b/mybatis-flex-core/src/test/java/com/mybatisflex/coretest/AccountSqlTester.java
index 889395ea..564d30bf 100644
--- a/mybatis-flex-core/src/test/java/com/mybatisflex/coretest/AccountSqlTester.java
+++ b/mybatis-flex-core/src/test/java/com/mybatisflex/coretest/AccountSqlTester.java
@@ -359,6 +359,21 @@ public class AccountSqlTester {
         System.out.println(sql);
     }
 
+
+    @Test
+    public void testJoin4Sql() {
+        QueryWrapper query = QueryWrapper.create()
+            .select(ACCOUNT.ALL_COLUMNS,
+                column("bui.user_code"),
+                column("bui.user_name"),
+                column("burmc.user_name as created_by_name"))
+            .from(ACCOUNT).as("burm")
+            .leftJoin("base_admin_user_info").as("bui").on("bui.user_id = burm.user_id")
+            .leftJoin("base_admin_user_info").as("burmc").on("burmc.user_id = burm.created_by")
+            .where("bui.is_valid = ?", 3);
+        System.out.println(query.toSQL());
+    }
+
     @Test
     public void testJoinSelf() {
         QueryWrapper queryWrapper = QueryWrapper.create()

From bf23e81e20fc79864cb4ee564dc98edd92c7f5b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=80=E6=BA=90=E6=B5=B7=E5=93=A5?= <fuhai999@gmail.com>
Date: Wed, 9 Aug 2023 12:01:36 +0800
Subject: [PATCH 03/22] =?UTF-8?q?feat:=20QueryWrapper=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=20"delete"=20=E4=B8=8E=20"update"=20=E7=9A=84=20left=20join=20?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/dialect/impl/CommonsDialectImpl.java | 85 +++++++++++++------
 .../core/provider/EntitySqlProvider.java      | 10 ++-
 .../java/com/mybatisflex/core/query/CPI.java  | 10 ++-
 .../core/query/OperatorSelectCondition.java   |  2 +-
 .../mybatisflex/core/query/QueryWrapper.java  | 67 ++++++++++++++-
 .../core/query/SelectQueryColumn.java         |  2 +-
 .../core/query/SelectQueryTable.java          |  2 +-
 .../core/query/WithSelectDetail.java          |  2 +-
 .../core/query/WithValuesDetail.java          |  2 +-
 .../mybatisflex/core/query/WrapperUtil.java   |  2 +-
 10 files changed, 148 insertions(+), 36 deletions(-)

diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/dialect/impl/CommonsDialectImpl.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/dialect/impl/CommonsDialectImpl.java
index 5067e4ea..60c4b89e 100644
--- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/dialect/impl/CommonsDialectImpl.java
+++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/dialect/impl/CommonsDialectImpl.java
@@ -242,7 +242,7 @@ public class CommonsDialectImpl implements IDialect {
 
     @Override
     public String forUpdateByQuery(QueryWrapper queryWrapper, Row row) {
-        StringBuilder sql = new StringBuilder();
+        StringBuilder sqlBuilder = new StringBuilder();
 
         Set<String> modifyAttrs = RowCPI.getModifyAttrs(row);
         Map<String, RawValue> rawValueMap = RowCPI.getRawValueMap(row);
@@ -254,30 +254,39 @@ public class CommonsDialectImpl implements IDialect {
 
         //fix: support schema
         QueryTable queryTable = queryTables.get(0);
-        sql.append(UPDATE).append(queryTable.toSql(this)).append(SET);
+        sqlBuilder.append(UPDATE).append(queryTable.toSql(this)).append(SET);
         int index = 0;
         for (String modifyAttr : modifyAttrs) {
             if (index > 0) {
-                sql.append(DELIMITER);
+                sqlBuilder.append(DELIMITER);
             }
 
-            sql.append(wrap(modifyAttr));
+            sqlBuilder.append(wrap(modifyAttr));
 
             if (rawValueMap.containsKey(modifyAttr)) {
-                sql.append(EQUALS).append(rawValueMap.get(modifyAttr).toSql(this));
+                sqlBuilder.append(EQUALS).append(rawValueMap.get(modifyAttr).toSql(this));
             } else {
-                sql.append(EQUALS_PLACEHOLDER);
+                sqlBuilder.append(EQUALS_PLACEHOLDER);
             }
 
             index++;
         }
 
-        String whereConditionSql = buildWhereConditionSql(queryWrapper);
-        if (StringUtil.isNotBlank(whereConditionSql)) {
-            sql.append(WHERE).append(whereConditionSql);
+        buildJoinSql(sqlBuilder, queryWrapper, queryTables);
+        buildWhereSql(sqlBuilder, queryWrapper, queryTables, false);
+        buildGroupBySql(sqlBuilder, queryWrapper, queryTables);
+        buildHavingSql(sqlBuilder, queryWrapper, queryTables);
+
+        //ignore orderBy and limit
+        buildOrderBySql(sqlBuilder, queryWrapper, queryTables);
+
+        Long limitRows = CPI.getLimitRows(queryWrapper);
+        Long limitOffset = CPI.getLimitOffset(queryWrapper);
+        if (limitRows != null || limitOffset != null) {
+            sqlBuilder = buildLimitOffsetSql(sqlBuilder, queryWrapper, limitRows, limitOffset);
         }
 
-        return sql.toString();
+        return sqlBuilder.toString();
     }
 
     @Override
@@ -473,8 +482,13 @@ public class CommonsDialectImpl implements IDialect {
         buildHavingSql(sqlBuilder, queryWrapper, allTables);
 
         //ignore orderBy and limit
-        //buildOrderBySql(sqlBuilder, queryWrapper)
-        //buildLimitSql(sqlBuilder, queryWrapper)
+        buildOrderBySql(sqlBuilder, queryWrapper, allTables);
+
+        Long limitRows = CPI.getLimitRows(queryWrapper);
+        Long limitOffset = CPI.getLimitOffset(queryWrapper);
+        if (limitRows != null || limitOffset != null) {
+            sqlBuilder = buildLimitOffsetSql(sqlBuilder, queryWrapper, limitRows, limitOffset);
+        }
 
         List<String> endFragments = CPI.getEndFragments(queryWrapper);
         if (CollectionUtil.isNotEmpty(endFragments)) {
@@ -777,13 +791,19 @@ public class CommonsDialectImpl implements IDialect {
 
     @Override
     public String forUpdateEntityByQuery(TableInfo tableInfo, Object entity, boolean ignoreNulls, QueryWrapper queryWrapper) {
-        StringBuilder sql = new StringBuilder();
+        StringBuilder sqlBuilder = new StringBuilder();
 
         Set<String> updateColumns = tableInfo.obtainUpdateColumns(entity, ignoreNulls, true);
         Map<String, RawValue> rawValueMap = tableInfo.obtainUpdateRawValueMap(entity);
 
-        sql.append(UPDATE).append(forHint(CPI.getHint(queryWrapper)));
-        sql.append(tableInfo.getWrapSchemaAndTableName(this)).append(SET);
+        sqlBuilder.append(UPDATE).append(forHint(CPI.getHint(queryWrapper)));
+        sqlBuilder.append(tableInfo.getWrapSchemaAndTableName(this));
+
+        List<QueryTable> queryTables = CPI.getQueryTables(queryWrapper);
+        buildJoinSql(sqlBuilder, queryWrapper, queryTables);
+
+
+        sqlBuilder.append(SET);
 
         StringJoiner stringJoiner = new StringJoiner(DELIMITER);
 
@@ -807,26 +827,40 @@ public class CommonsDialectImpl implements IDialect {
             stringJoiner.add(wrap(versionColumn) + EQUALS + wrap(versionColumn) + " + 1 ");
         }
 
-        sql.append(stringJoiner);
+        sqlBuilder.append(stringJoiner);
 
 
-        String whereConditionSql = buildWhereConditionSql(queryWrapper);
+        buildWhereSql(sqlBuilder, queryWrapper, queryTables, false);
+        buildGroupBySql(sqlBuilder, queryWrapper, queryTables);
+        buildHavingSql(sqlBuilder, queryWrapper, queryTables);
 
-        //不允许全量更新
-        if (StringUtil.isBlank(whereConditionSql)) {
-            throw FlexExceptions.wrap(LocalizedFormats.UPDATE_OR_DELETE_NOT_ALLOW);
+        //ignore orderBy and limit
+        buildOrderBySql(sqlBuilder, queryWrapper, queryTables);
+
+        Long limitRows = CPI.getLimitRows(queryWrapper);
+        Long limitOffset = CPI.getLimitOffset(queryWrapper);
+        if (limitRows != null || limitOffset != null) {
+            sqlBuilder = buildLimitOffsetSql(sqlBuilder, queryWrapper, limitRows, limitOffset);
         }
 
-        sql.append(WHERE).append(whereConditionSql);
+
+//        String whereConditionSql = buildWhereConditionSql(queryWrapper);
+//
+//        //不允许全量更新
+//        if (StringUtil.isBlank(whereConditionSql)) {
+//            throw FlexExceptions.wrap(LocalizedFormats.UPDATE_OR_DELETE_NOT_ALLOW);
+//        }
+//
+//        sql.append(WHERE).append(whereConditionSql);
 
         List<String> endFragments = CPI.getEndFragments(queryWrapper);
         if (CollectionUtil.isNotEmpty(endFragments)) {
             for (String endFragment : endFragments) {
-                sql.append(BLANK).append(endFragment);
+                sqlBuilder.append(BLANK).append(endFragment);
             }
         }
 
-        return sql.toString();
+        return sqlBuilder.toString();
     }
 
 
@@ -973,16 +1007,19 @@ public class CommonsDialectImpl implements IDialect {
     }
 
 
-    protected void buildJoinSql(StringBuilder sqlBuilder, QueryWrapper queryWrapper, List<QueryTable> queryTables) {
+    protected boolean buildJoinSql(StringBuilder sqlBuilder, QueryWrapper queryWrapper, List<QueryTable> queryTables) {
         List<Join> joins = CPI.getJoins(queryWrapper);
+        boolean joinSuccess = false;
         if (joins != null && !joins.isEmpty()) {
             for (Join join : joins) {
                 if (!join.checkEffective()) {
                     continue;
                 }
                 sqlBuilder.append(join.toSql(queryTables, this));
+                joinSuccess = true;
             }
         }
+        return joinSuccess;
     }
 
 
diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/provider/EntitySqlProvider.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/provider/EntitySqlProvider.java
index c77cf81b..9aa0d4d5 100644
--- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/provider/EntitySqlProvider.java
+++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/provider/EntitySqlProvider.java
@@ -261,7 +261,9 @@ public class EntitySqlProvider {
         FlexAssert.notNull(entity, "entity can not be null");
 
         boolean ignoreNulls = ProviderUtil.isIgnoreNulls(params);
+
         QueryWrapper queryWrapper = ProviderUtil.getQueryWrapper(params);
+        appendTableConditions(context,queryWrapper,false);
 
         TableInfo tableInfo = ProviderUtil.getTableInfo(context);
 
@@ -274,9 +276,13 @@ public class EntitySqlProvider {
         //优先构建 sql，再构建参数
         String sql = DialectFactory.getDialect().forUpdateEntityByQuery(tableInfo, entity, ignoreNulls, queryWrapper);
 
+        Object[] joinValueArray = CPI.getJoinValueArray(queryWrapper);
         Object[] values = tableInfo.buildUpdateSqlArgs(entity, ignoreNulls, true);
-        Object[] queryParams = CPI.getValueArray(queryWrapper);
-        ProviderUtil.setSqlArgs(params, ArrayUtil.concat(values, queryParams));
+        Object[] queryParams = CPI.getConditionValueArray(queryWrapper);
+
+        Object[] paramValues = ArrayUtil.concat(joinValueArray,ArrayUtil.concat(values,queryParams));
+
+        ProviderUtil.setSqlArgs(params, paramValues);
 
         return sql;
     }
diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/CPI.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/CPI.java
index 7ffdc962..1894336f 100644
--- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/CPI.java
+++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/CPI.java
@@ -34,7 +34,15 @@ public class CPI {
     }
 
     public static Object[] getValueArray(QueryWrapper queryWrapper) {
-        return queryWrapper.getValueArray();
+        return queryWrapper.getAllValueArray();
+    }
+
+    public static Object[] getJoinValueArray(QueryWrapper queryWrapper) {
+        return queryWrapper.getJoinValueArray();
+    }
+
+    public static Object[] getConditionValueArray(QueryWrapper queryWrapper) {
+        return queryWrapper.getConditionValueArray();
     }
 
     public static List<QueryWrapper> getChildSelect(QueryWrapper queryWrapper) {
diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/OperatorSelectCondition.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/OperatorSelectCondition.java
index 4389cea5..6d9594d5 100644
--- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/OperatorSelectCondition.java
+++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/OperatorSelectCondition.java
@@ -71,7 +71,7 @@ public class OperatorSelectCondition extends QueryCondition {
 
     @Override
     public Object getValue() {
-        return queryWrapper.getValueArray();
+        return queryWrapper.getAllValueArray();
     }
 
     @Override
diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryWrapper.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryWrapper.java
index 6017a491..661a16ed 100644
--- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryWrapper.java
+++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryWrapper.java
@@ -692,7 +692,7 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
      * 获取 queryWrapper 的参数
      * 在构建 sql 的时候，需要保证 where 在 having 的前面
      */
-    Object[] getValueArray() {
+    Object[] getAllValueArray() {
 
         List<Object> withValues = null;
         if (with != null) {
@@ -770,7 +770,7 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
         if (CollectionUtil.isNotEmpty(unions)) {
             for (UnionWrapper union : unions) {
                 QueryWrapper queryWrapper = union.getQueryWrapper();
-                paramValues = ArrayUtil.concat(paramValues, queryWrapper.getValueArray());
+                paramValues = ArrayUtil.concat(paramValues, queryWrapper.getAllValueArray());
             }
         }
 
@@ -783,6 +783,67 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
         return returnValues;
     }
 
+
+
+    /**
+     * 获取 queryWrapper 的参数
+     * 在构建 sql 的时候，需要保证 where 在 having 的前面
+     */
+    Object[] getJoinValueArray() {
+        //join 子查询的参数：left join (select ...)
+        List<Object> joinValues = null;
+        List<Join> joins = getJoins();
+        if (CollectionUtil.isNotEmpty(joins)) {
+            for (Join join : joins) {
+                QueryTable joinTable = join.getQueryTable();
+                Object[] valueArray = joinTable.getValueArray();
+                if (valueArray.length > 0) {
+                    if (joinValues == null) {
+                        joinValues = new ArrayList<>(valueArray.length);
+                    }
+                    joinValues.addAll(Arrays.asList(valueArray));
+                }
+                QueryCondition onCondition = join.getOnCondition();
+                Object[] values = WrapperUtil.getValues(onCondition);
+                if (values.length > 0) {
+                    if (joinValues == null) {
+                        joinValues = new ArrayList<>(values.length);
+                    }
+                    joinValues.addAll(Arrays.asList(values));
+                }
+            }
+        }
+
+        return joinValues == null ? FlexConsts.EMPTY_ARRAY : joinValues.toArray();
+    }
+
+
+
+    /**
+     * 获取 queryWrapper 的参数
+     * 在构建 sql 的时候，需要保证 where 在 having 的前面
+     */
+    Object[] getConditionValueArray() {
+        //where 参数
+        Object[] whereValues = WrapperUtil.getValues(whereQueryCondition);
+
+        //having 参数
+        Object[] havingValues = WrapperUtil.getValues(havingQueryCondition);
+
+        Object[] paramValues = ArrayUtil.concat(whereValues, havingValues);
+
+        //unions 参数
+        if (CollectionUtil.isNotEmpty(unions)) {
+            for (UnionWrapper union : unions) {
+                QueryWrapper queryWrapper = union.getQueryWrapper();
+                paramValues = ArrayUtil.concat(paramValues, queryWrapper.getAllValueArray());
+            }
+        }
+
+        return paramValues;
+    }
+
+
     List<QueryWrapper> getChildSelect() {
 
         List<QueryWrapper> tableChildQuery = null;
@@ -815,7 +876,7 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
 
     public String toSQL() {
         String sql = DialectFactory.getDialect().forSelectByQuery(this);
-        return SqlUtil.replaceSqlParams(sql, getValueArray());
+        return SqlUtil.replaceSqlParams(sql, getAllValueArray());
     }
 
     @Override
diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/SelectQueryColumn.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/SelectQueryColumn.java
index b251f145..8bde2f8d 100644
--- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/SelectQueryColumn.java
+++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/SelectQueryColumn.java
@@ -58,7 +58,7 @@ public class SelectQueryColumn extends QueryColumn implements HasParamsColumn {
 
     @Override
     public Object[] getParamValues() {
-        return queryWrapper.getValueArray();
+        return queryWrapper.getAllValueArray();
     }
 
 }
diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/SelectQueryTable.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/SelectQueryTable.java
index 1bd83e2a..4d91ace7 100644
--- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/SelectQueryTable.java
+++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/SelectQueryTable.java
@@ -42,7 +42,7 @@ public class SelectQueryTable extends QueryTable {
 
     @Override
     Object[] getValueArray() {
-        return queryWrapper.getValueArray();
+        return queryWrapper.getAllValueArray();
     }
 
     @Override
diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/WithSelectDetail.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/WithSelectDetail.java
index bf0c52c6..36de431c 100644
--- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/WithSelectDetail.java
+++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/WithSelectDetail.java
@@ -44,7 +44,7 @@ public class WithSelectDetail implements WithDetail {
 
     @Override
     public Object[] getParamValues() {
-        return queryWrapper.getValueArray();
+        return queryWrapper.getAllValueArray();
     }
 
     @Override
diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/WithValuesDetail.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/WithValuesDetail.java
index 22ef21c4..91f7feab 100644
--- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/WithValuesDetail.java
+++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/WithValuesDetail.java
@@ -57,7 +57,7 @@ public class WithValuesDetail implements WithDetail {
 
     @Override
     public Object[] getParamValues() {
-        return queryWrapper.getValueArray();
+        return queryWrapper.getAllValueArray();
     }
 
     @Override
diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/WrapperUtil.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/WrapperUtil.java
index 7c0286fb..4e1eb0ad 100644
--- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/WrapperUtil.java
+++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/WrapperUtil.java
@@ -115,7 +115,7 @@ class WrapperUtil {
                 addParam(paras, Array.get(value, i));
             }
         } else if (value instanceof QueryWrapper) {
-            Object[] valueArray = ((QueryWrapper) value).getValueArray();
+            Object[] valueArray = ((QueryWrapper) value).getAllValueArray();
             paras.addAll(Arrays.asList(valueArray));
         } else if (value.getClass().isEnum()) {
             EnumWrapper enumWrapper = EnumWrapper.of(value.getClass());

From 9064e22031bcc0ea935108653e91f615e3bc3d56 Mon Sep 17 00:00:00 2001
From: Suomm <1474983351@qq.com>
Date: Wed, 9 Aug 2023 12:48:24 +0800
Subject: [PATCH 04/22] =?UTF-8?q?build:=20=E7=A7=BB=E9=99=A4=20seata-sprin?=
 =?UTF-8?q?g-boot-starter=20=E4=BE=9D=E8=B5=96=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mybatis-flex-spring/pom.xml                               | 8 --------
 .../com/mybatisflex/spring/FlexSqlSessionFactoryBean.java | 3 ---
 2 files changed, 11 deletions(-)

diff --git a/mybatis-flex-spring/pom.xml b/mybatis-flex-spring/pom.xml
index b786dc4d..fb132737 100644
--- a/mybatis-flex-spring/pom.xml
+++ b/mybatis-flex-spring/pom.xml
@@ -39,14 +39,6 @@
             <groupId>org.springframework</groupId>
             <artifactId>spring-jdbc</artifactId>
         </dependency>
-
-        <dependency>
-            <groupId>io.seata</groupId>
-            <artifactId>seata-spring-boot-starter</artifactId>
-            <version>1.7.0</version>
-        </dependency>
-
-
     </dependencies>
 
 </project>
diff --git a/mybatis-flex-spring/src/main/java/com/mybatisflex/spring/FlexSqlSessionFactoryBean.java b/mybatis-flex-spring/src/main/java/com/mybatisflex/spring/FlexSqlSessionFactoryBean.java
index b78352c3..5bf6d2f2 100644
--- a/mybatis-flex-spring/src/main/java/com/mybatisflex/spring/FlexSqlSessionFactoryBean.java
+++ b/mybatis-flex-spring/src/main/java/com/mybatisflex/spring/FlexSqlSessionFactoryBean.java
@@ -19,8 +19,6 @@ import com.mybatisflex.core.FlexConsts;
 import com.mybatisflex.core.datasource.FlexDataSource;
 import com.mybatisflex.core.mybatis.FlexConfiguration;
 import com.mybatisflex.core.mybatis.FlexSqlSessionFactoryBuilder;
-import io.seata.rm.datasource.DataSourceProxy;
-import io.seata.rm.datasource.xa.DataSourceProxyXA;
 import org.apache.ibatis.builder.xml.XMLConfigBuilder;
 import org.apache.ibatis.builder.xml.XMLMapperBuilder;
 import org.apache.ibatis.cache.Cache;
@@ -37,7 +35,6 @@ import org.apache.ibatis.session.Configuration;
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.apache.ibatis.session.SqlSessionFactoryBuilder;
 import org.apache.ibatis.transaction.TransactionFactory;
-import org.apache.ibatis.transaction.jdbc.JdbcTransactionFactory;
 import org.apache.ibatis.type.TypeHandler;
 import org.mybatis.logging.Logger;
 import org.mybatis.logging.LoggerFactory;

From fe064988863583a775b91481fd71ec85d9caf89c Mon Sep 17 00:00:00 2001
From: Suomm <1474983351@qq.com>
Date: Wed, 9 Aug 2023 12:48:57 +0800
Subject: [PATCH 05/22] =?UTF-8?q?build:=20=E6=B5=8B=E8=AF=95=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E6=B7=BB=E5=8A=A0=20seata-spring-boot-starter=20?=
 =?UTF-8?q?=E4=BE=9D=E8=B5=96=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mybatis-flex-test/mybatis-flex-spring-boot-seata/pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/mybatis-flex-test/mybatis-flex-spring-boot-seata/pom.xml b/mybatis-flex-test/mybatis-flex-spring-boot-seata/pom.xml
index 85f2e4ad..e7fd6f34 100644
--- a/mybatis-flex-test/mybatis-flex-spring-boot-seata/pom.xml
+++ b/mybatis-flex-test/mybatis-flex-spring-boot-seata/pom.xml
@@ -66,6 +66,12 @@
 			<artifactId>mysql-connector-j</artifactId>
 		</dependency>
 
+        <dependency>
+            <groupId>io.seata</groupId>
+            <artifactId>seata-spring-boot-starter</artifactId>
+            <version>1.7.0</version>
+        </dependency>
+
 
 		<!--        <dependency>-->
 		<!--            <groupId>com.h2database</groupId>-->

From 3142ec66ecd8ea3787633a4f6afa57648b5b43c1 Mon Sep 17 00:00:00 2001
From: Suomm <1474983351@qq.com>
Date: Wed, 9 Aug 2023 12:50:06 +0800
Subject: [PATCH 06/22] =?UTF-8?q?build:=20=E4=BB=85=E5=9C=A8=E7=BC=96?=
 =?UTF-8?q?=E8=AF=91=E6=9C=9F=E4=BE=9D=E8=B5=96=20seata-rm-datasource=20?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mybatis-flex-spring-boot-starter/pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mybatis-flex-spring-boot-starter/pom.xml b/mybatis-flex-spring-boot-starter/pom.xml
index e9546f5f..c3c4f1dc 100644
--- a/mybatis-flex-spring-boot-starter/pom.xml
+++ b/mybatis-flex-spring-boot-starter/pom.xml
@@ -95,6 +95,7 @@
             <groupId>io.seata</groupId>
             <artifactId>seata-rm-datasource</artifactId>
             <version>1.7.0</version>
+            <scope>compile</scope>
             <optional>true</optional>
         </dependency>
 

From 8d498c930b4e9e1e2371cf520f53b38242a154c1 Mon Sep 17 00:00:00 2001
From: Suomm <1474983351@qq.com>
Date: Wed, 9 Aug 2023 13:03:28 +0800
Subject: [PATCH 07/22] =?UTF-8?q?refactor:=20=E7=A7=BB=E5=8A=A8=20SeataMod?=
 =?UTF-8?q?e=20=E7=B1=BB=E5=88=B0=20starter=20=E6=A8=A1=E5=9D=97=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MultiDataSourceAutoConfiguration.java     |  3 +--
 .../spring/boot/MybatisFlexProperties.java    | 16 ++++++++++--
 .../com/mybatisflex/spring/SeataMode.java     | 26 -------------------
 3 files changed, 15 insertions(+), 30 deletions(-)
 delete mode 100644 mybatis-flex-spring/src/main/java/com/mybatisflex/spring/SeataMode.java

diff --git a/mybatis-flex-spring-boot-starter/src/main/java/com/mybatisflex/spring/boot/MultiDataSourceAutoConfiguration.java b/mybatis-flex-spring-boot-starter/src/main/java/com/mybatisflex/spring/boot/MultiDataSourceAutoConfiguration.java
index 8576ddd3..315a0e95 100644
--- a/mybatis-flex-spring-boot-starter/src/main/java/com/mybatisflex/spring/boot/MultiDataSourceAutoConfiguration.java
+++ b/mybatis-flex-spring-boot-starter/src/main/java/com/mybatisflex/spring/boot/MultiDataSourceAutoConfiguration.java
@@ -19,7 +19,6 @@ import com.mybatisflex.core.datasource.DataSourceBuilder;
 import com.mybatisflex.core.datasource.DataSourceDecipher;
 import com.mybatisflex.core.datasource.DataSourceManager;
 import com.mybatisflex.core.datasource.FlexDataSource;
-import com.mybatisflex.spring.SeataMode;
 import com.mybatisflex.spring.boot.MybatisFlexProperties.SeataConfig;
 import com.mybatisflex.spring.datasource.DataSourceAdvice;
 import io.seata.rm.datasource.DataSourceProxy;
@@ -87,7 +86,7 @@ public class MultiDataSourceAutoConfiguration {
                 DataSourceManager.decryptDataSource(dataSource);
 
                 if (seataConfig != null && seataConfig.isEnable()) {
-                    if (seataConfig.getSeataMode() == SeataMode.XA) {
+                    if (seataConfig.getSeataMode() == MybatisFlexProperties.SeataMode.XA) {
                         dataSource = new DataSourceProxyXA(dataSource);
                     } else {
                         dataSource = new DataSourceProxy(dataSource);
diff --git a/mybatis-flex-spring-boot-starter/src/main/java/com/mybatisflex/spring/boot/MybatisFlexProperties.java b/mybatis-flex-spring-boot-starter/src/main/java/com/mybatisflex/spring/boot/MybatisFlexProperties.java
index b7cbd98c..50e60d91 100644
--- a/mybatis-flex-spring-boot-starter/src/main/java/com/mybatisflex/spring/boot/MybatisFlexProperties.java
+++ b/mybatis-flex-spring-boot-starter/src/main/java/com/mybatisflex/spring/boot/MybatisFlexProperties.java
@@ -17,7 +17,6 @@ package com.mybatisflex.spring.boot;
 
 import com.mybatisflex.core.FlexConsts;
 import com.mybatisflex.core.FlexGlobalConfig;
-import com.mybatisflex.spring.SeataMode;
 import org.apache.ibatis.io.VFS;
 import org.apache.ibatis.logging.Log;
 import org.apache.ibatis.mapping.ResultSetType;
@@ -42,6 +41,7 @@ import java.util.stream.Stream;
 /**
  * Mybatis-Flex 的配置属性。
  * 参考：https://github.com/mybatis/spring-boot-starter/blob/master/mybatis-spring-boot-autoconfigure/src/main/java/org/mybatis/spring/boot/autoconfigure/MybatisProperties.java
+ *
  * @author Eddú Meléndez
  * @author Kazuki Shimizu
  * @author micahel
@@ -909,7 +909,7 @@ public class MybatisFlexProperties {
      *
      * @author life
      */
-    public static class SeataConfig{
+    public static class SeataConfig {
 
         /**
          * 是否开启
@@ -936,6 +936,18 @@ public class MybatisFlexProperties {
         public void setSeataMode(SeataMode seataMode) {
             this.seataMode = seataMode;
         }
+
+    }
+
+    /**
+     * @author life
+     */
+    public enum SeataMode {
+
+        XA,
+
+        AT
+
     }
 
 }
diff --git a/mybatis-flex-spring/src/main/java/com/mybatisflex/spring/SeataMode.java b/mybatis-flex-spring/src/main/java/com/mybatisflex/spring/SeataMode.java
deleted file mode 100644
index cbabe97b..00000000
--- a/mybatis-flex-spring/src/main/java/com/mybatisflex/spring/SeataMode.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- *  Copyright (c) 2022-2023, Mybatis-Flex (fuhai999@gmail.com).
- *  <p>
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *  <p>
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  <p>
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package com.mybatisflex.spring;
-
-/**
- * @author life
- */
-public enum SeataMode {
-
-    XA,
-
-    AT
-}

From 53f6bcda6a4562c750796a1b6dbde1c9cbf08523 Mon Sep 17 00:00:00 2001
From: Suomm <1474983351@qq.com>
Date: Wed, 9 Aug 2023 13:07:11 +0800
Subject: [PATCH 08/22] =?UTF-8?q?feat:=20=E8=87=AA=E5=8A=A8=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=20SQL=20FROM=20=E8=AF=AD=E5=8F=A5=EF=BC=8C=E6=8F=90?=
 =?UTF-8?q?=E4=BE=9B=20as()=20=E6=96=B9=E6=B3=95=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E8=A1=A8=E5=88=AB=E5=90=8D=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/activerecord/query/QueryModel.java           | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/activerecord/query/QueryModel.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/activerecord/query/QueryModel.java
index ceb382f6..ac4372b2 100644
--- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/activerecord/query/QueryModel.java
+++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/activerecord/query/QueryModel.java
@@ -44,11 +44,20 @@ public abstract class QueryModel<T extends QueryModel<T>> {
 
     protected QueryWrapper queryWrapper() {
         if (queryWrapper == null) {
-            queryWrapper = QueryWrapper.create();
+            TableInfo tableInfo = TableInfoFactory.ofEntityClass(getClass());
+            QueryTable queryTable = new QueryTable();
+            queryTable.setSchema(tableInfo.getSchema());
+            queryTable.setName(tableInfo.getTableName());
+            queryWrapper = QueryWrapper.create().from(queryTable);
         }
         return queryWrapper;
     }
 
+    public T as(String alias) {
+        queryWrapper().as(alias);
+        return (T) this;
+    }
+
     public T select() {
         return (T) this;
     }

From 0f9dbc17422003f8b013ebaf277e2b70e0256ac6 Mon Sep 17 00:00:00 2001
From: Suomm <1474983351@qq.com>
Date: Wed, 9 Aug 2023 13:07:39 +0800
Subject: [PATCH 09/22] =?UTF-8?q?test:=20=E6=B5=8B=E8=AF=95=20Model=20toSq?=
 =?UTF-8?q?l()=20=E6=96=B9=E6=B3=95=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybatisflex/test/mapper/ActiveRecordTest.java  | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/mybatis-flex-test/mybatis-flex-spring-boot-test/src/test/java/com/mybatisflex/test/mapper/ActiveRecordTest.java b/mybatis-flex-test/mybatis-flex-spring-boot-test/src/test/java/com/mybatisflex/test/mapper/ActiveRecordTest.java
index 3d06030c..99eede8d 100644
--- a/mybatis-flex-test/mybatis-flex-spring-boot-test/src/test/java/com/mybatisflex/test/mapper/ActiveRecordTest.java
+++ b/mybatis-flex-test/mybatis-flex-spring-boot-test/src/test/java/com/mybatisflex/test/mapper/ActiveRecordTest.java
@@ -156,4 +156,18 @@ class ActiveRecordTest {
             .forEach(System.out::println);
     }
 
+    @Test
+    void testToSql() {
+        String sql = User.create()
+            .as("u")
+            .select(USER.ALL_COLUMNS, ROLE.ALL_COLUMNS)
+            .leftJoin(USER_ROLE).as("ur").on(USER_ROLE.USER_ID.eq(USER.USER_ID))
+            .leftJoin(ROLE).as("r").on(USER_ROLE.ROLE_ID.eq(ROLE.ROLE_ID))
+            .where(USER.USER_ID.eq(2))
+            .toQueryWrapper()
+            .toSQL();
+
+        System.out.println(sql);
+    }
+
 }

From 9889889087a47a31ed7cb8a1fb8336a2784819c0 Mon Sep 17 00:00:00 2001
From: Suomm <1474983351@qq.com>
Date: Wed, 9 Aug 2023 13:07:39 +0800
Subject: [PATCH 10/22] =?UTF-8?q?fixed=200f9dbc1=20from=20https://gitee.co?=
 =?UTF-8?q?m/Suomm/mybatis-flex/pulls/261=20test:=20=E6=B5=8B=E8=AF=95=20M?=
 =?UTF-8?q?odel=20toSql()=20=E6=96=B9=E6=B3=95=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybatisflex/test/mapper/ActiveRecordTest.java  | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/mybatis-flex-test/mybatis-flex-spring-boot-test/src/test/java/com/mybatisflex/test/mapper/ActiveRecordTest.java b/mybatis-flex-test/mybatis-flex-spring-boot-test/src/test/java/com/mybatisflex/test/mapper/ActiveRecordTest.java
index 3d06030c..99eede8d 100644
--- a/mybatis-flex-test/mybatis-flex-spring-boot-test/src/test/java/com/mybatisflex/test/mapper/ActiveRecordTest.java
+++ b/mybatis-flex-test/mybatis-flex-spring-boot-test/src/test/java/com/mybatisflex/test/mapper/ActiveRecordTest.java
@@ -156,4 +156,18 @@ class ActiveRecordTest {
             .forEach(System.out::println);
     }
 
+    @Test
+    void testToSql() {
+        String sql = User.create()
+            .as("u")
+            .select(USER.ALL_COLUMNS, ROLE.ALL_COLUMNS)
+            .leftJoin(USER_ROLE).as("ur").on(USER_ROLE.USER_ID.eq(USER.USER_ID))
+            .leftJoin(ROLE).as("r").on(USER_ROLE.ROLE_ID.eq(ROLE.ROLE_ID))
+            .where(USER.USER_ID.eq(2))
+            .toQueryWrapper()
+            .toSQL();
+
+        System.out.println(sql);
+    }
+
 }

From 35bc85aa58000dcba50f2ff4a1c29507e4f82d17 Mon Sep 17 00:00:00 2001
From: Suomm <1474983351@qq.com>
Date: Wed, 9 Aug 2023 13:07:11 +0800
Subject: [PATCH 11/22] =?UTF-8?q?fixed=2053f6bcd=20from=20https://gitee.co?=
 =?UTF-8?q?m/Suomm/mybatis-flex/pulls/261=20feat:=20=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20SQL=20FROM=20=E8=AF=AD=E5=8F=A5=EF=BC=8C?=
 =?UTF-8?q?=E6=8F=90=E4=BE=9B=20as()=20=E6=96=B9=E6=B3=95=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E8=A1=A8=E5=88=AB=E5=90=8D=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/activerecord/query/QueryModel.java           | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/activerecord/query/QueryModel.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/activerecord/query/QueryModel.java
index ceb382f6..ac4372b2 100644
--- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/activerecord/query/QueryModel.java
+++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/activerecord/query/QueryModel.java
@@ -44,11 +44,20 @@ public abstract class QueryModel<T extends QueryModel<T>> {
 
     protected QueryWrapper queryWrapper() {
         if (queryWrapper == null) {
-            queryWrapper = QueryWrapper.create();
+            TableInfo tableInfo = TableInfoFactory.ofEntityClass(getClass());
+            QueryTable queryTable = new QueryTable();
+            queryTable.setSchema(tableInfo.getSchema());
+            queryTable.setName(tableInfo.getTableName());
+            queryWrapper = QueryWrapper.create().from(queryTable);
         }
         return queryWrapper;
     }
 
+    public T as(String alias) {
+        queryWrapper().as(alias);
+        return (T) this;
+    }
+
     public T select() {
         return (T) this;
     }

From 05151f4d4f9b934b8573dc22b642c34c018828f2 Mon Sep 17 00:00:00 2001
From: 2han9wen71an <2han9wen71an@gmail.com>
Date: Wed, 9 Aug 2023 13:42:24 +0800
Subject: [PATCH 12/22] =?UTF-8?q?=E4=BF=AE=E5=A4=8DOSGI=E7=8E=AF=E5=A2=83C?=
 =?UTF-8?q?lassLoader=E8=8E=B7=E5=8F=96=E4=B8=8D=E5=88=B0=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

当osgi环境下mybatis-flex与应用代码不在同一个bundle包中，会导致类找不到。需要获取到具体应用bundle包的classloader进行类加载
---
 .../main/java/com/mybatisflex/core/util/LambdaUtil.java  | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/util/LambdaUtil.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/util/LambdaUtil.java
index 4fcf5272..c935ccb8 100644
--- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/util/LambdaUtil.java
+++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/util/LambdaUtil.java
@@ -44,7 +44,7 @@ public class LambdaUtil {
 
     public static <T> Class<?> getImplClass(LambdaGetter<T> getter) {
         SerializedLambda lambda = getSerializedLambda(getter);
-        return getImplClass(lambda);
+        return getImplClass(lambda, getter.getClass().getClassLoader());
     }
 
 
@@ -56,9 +56,10 @@ public class LambdaUtil {
 
 
     public static <T> QueryColumn getQueryColumn(LambdaGetter<T> getter) {
+        ClassLoader classLoader = getter.getClass().getClassLoader();
         SerializedLambda lambda = getSerializedLambda(getter);
         String methodName = lambda.getImplMethodName();
-        Class<?> entityClass = getImplClass(lambda);
+        Class<?> entityClass = getImplClass(lambda, classLoader);
         TableInfo tableInfo = TableInfoFactory.ofEntityClass(entityClass);
         return tableInfo.getQueryColumnByProperty(PropertyNamer.methodToProperty(methodName));
     }
@@ -77,11 +78,11 @@ public class LambdaUtil {
     }
 
 
-    private static Class<?> getImplClass(SerializedLambda lambda) {
+    private static Class<?> getImplClass(SerializedLambda lambda, ClassLoader classLoader) {
         String implClass = getImplClassName(lambda);
         return MapUtil.computeIfAbsent(classMap, implClass, s -> {
             try {
-                return Class.forName(s.replace("/", "."));
+                return Class.forName(s.replace("/", "."), true, classLoader);
             } catch (ClassNotFoundException e) {
                 throw FlexExceptions.wrap(e);
             }

From f44425ebef646827afc3e9e1ca92689aaa38bcf5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=80=E6=BA=90=E6=B5=B7=E5=93=A5?= <fuhai999@gmail.com>
Date: Wed, 9 Aug 2023 15:24:10 +0800
Subject: [PATCH 13/22] doc: update docs

---
 docs/.vitepress/theme/MyLayout.vue        |   2 +-
 docs/assets/images/ad/topiam_20230909.png | Bin 0 -> 38929 bytes
 2 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 docs/assets/images/ad/topiam_20230909.png

diff --git a/docs/.vitepress/theme/MyLayout.vue b/docs/.vitepress/theme/MyLayout.vue
index 14767443..7fb3b5cf 100644
--- a/docs/.vitepress/theme/MyLayout.vue
+++ b/docs/.vitepress/theme/MyLayout.vue
@@ -115,7 +115,7 @@ const {Layout} = DefaultTheme
                 <a href="https://gitee.com/sdyunze/iotlink" target="_blank"><img src="/assets/images/ad/iotlink_20240802.png"></a>
             </div>
           <div class="banner">
-            虚以待位
+              <a href="https://eiam.topiam.cn" target="_blank"><img src="/assets/images/ad/topiam_20230909.png" style="width: 105px;height: 50px"></a>
           </div>
         </div>
         <div class="banner-bottom">
diff --git a/docs/assets/images/ad/topiam_20230909.png b/docs/assets/images/ad/topiam_20230909.png
new file mode 100644
index 0000000000000000000000000000000000000000..ba5d768d676c88201eb6f35d52f5eda82034d3df
GIT binary patch
literal 38929
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

literal 0
HcmV?d00001


From bfdcb702856fae3bf07f036f3192e9eb34012254 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=80=E6=BA=90=E6=B5=B7=E5=93=A5?= <fuhai999@gmail.com>
Date: Wed, 9 Aug 2023 15:40:58 +0800
Subject: [PATCH 14/22] refactor: remove default primaryKey

---
 .../java/com/mybatisflex/core/FlexConsts.java |  4 +++-
 .../com/mybatisflex/core/table/IdInfo.java    | 15 -------------
 .../core/table/TableInfoFactory.java          | 21 +------------------
 3 files changed, 4 insertions(+), 36 deletions(-)

diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/FlexConsts.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/FlexConsts.java
index 9aa76d8d..beef3fe2 100644
--- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/FlexConsts.java
+++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/FlexConsts.java
@@ -17,6 +17,9 @@ package com.mybatisflex.core;
 
 /**
  * Mybatis-Flex 可能用到的静态常量
+ *
+ * @author michael
+ * @author 王帅
  */
 public class FlexConsts {
 
@@ -26,7 +29,6 @@ public class FlexConsts {
     public static final String NAME = "MyBatis-Flex";
     public static final String VERSION = "1.5.6";
 
-    public static final String DEFAULT_PRIMARY_FIELD = "id";
 
     public static final String SQL = "$$sql";
     public static final String SQL_ARGS = "$$sql_args";
diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/table/IdInfo.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/table/IdInfo.java
index 390b9cf0..3ad66d08 100644
--- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/table/IdInfo.java
+++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/table/IdInfo.java
@@ -45,21 +45,6 @@ public class IdInfo extends ColumnInfo {
     private Boolean before;
 
 
-    public IdInfo(ColumnInfo columnInfo) {
-        this.setColumn(columnInfo.getColumn());
-        this.setAlias(columnInfo.getAlias());
-        this.setProperty(columnInfo.getProperty());
-        this.setPropertyType(columnInfo.getPropertyType());
-
-        //当 id 的类型为数值时，默认设置为自增的方式
-        if (Number.class.isAssignableFrom(columnInfo.getPropertyType())) {
-            keyType = KeyType.Auto;
-        } else {
-            initDefaultKeyType();
-        }
-    }
-
-
     public IdInfo(Id id) {
         this.keyType = id.keyType();
         this.value = id.value();
diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/table/TableInfoFactory.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/table/TableInfoFactory.java
index b87d9b4f..cc086083 100644
--- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/table/TableInfoFactory.java
+++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/table/TableInfoFactory.java
@@ -17,7 +17,6 @@ package com.mybatisflex.core.table;
 
 import com.mybatisflex.annotation.*;
 import com.mybatisflex.core.BaseMapper;
-import com.mybatisflex.core.FlexConsts;
 import com.mybatisflex.core.FlexGlobalConfig;
 import com.mybatisflex.core.exception.FlexExceptions;
 import com.mybatisflex.core.util.ClassUtil;
@@ -179,7 +178,7 @@ public class TableInfoFactory {
         List<ColumnInfo> columnInfoList = new ArrayList<>();
         List<IdInfo> idInfos = new ArrayList<>();
 
-        Field idField = null;
+//        Field idField = null;
 
         String logicDeleteColumn = null;
         String versionColumn = null;
@@ -330,27 +329,9 @@ public class TableInfoFactory {
                 columnInfo.setJdbcType(column.jdbcType());
             }
 
-            if (FlexConsts.DEFAULT_PRIMARY_FIELD.equals(field.getName())) {
-                idField = field;
-            }
         }
 
 
-        if (idInfos.isEmpty() && idField != null) {
-            int index = -1;
-            for (int i = 0; i < columnInfoList.size(); i++) {
-                ColumnInfo columnInfo = columnInfoList.get(i);
-                if (FlexConsts.DEFAULT_PRIMARY_FIELD.equals(columnInfo.getProperty())) {
-                    index = i;
-                    break;
-                }
-            }
-            if (index >= 0) {
-                ColumnInfo removedColumnInfo = columnInfoList.remove(index);
-                idInfos.add(new IdInfo(removedColumnInfo));
-            }
-        }
-
         tableInfo.setLogicDeleteColumn(logicDeleteColumn);
         tableInfo.setVersionColumn(versionColumn);
         tableInfo.setTenantIdColumn(tenantIdColumn);

From 44f84daaefbb325461694f81886bc2f2f6c12fa2 Mon Sep 17 00:00:00 2001
From: Suomm <1474983351@qq.com>
Date: Wed, 9 Aug 2023 16:20:42 +0800
Subject: [PATCH 15/22] =?UTF-8?q?refactor:=20=E7=BB=9F=E4=B8=80=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E6=A8=A1=E5=9D=97=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybatis-flex.config                       |   1 +
 .../mybatis-flex-seata-test/pom.xml           |  67 ++++++++
 ...MybatisFlexSpringBootSeataApplication.java |  31 ++++
 .../test/controller/TestController.java       |  44 +++++
 .../mybatisflex/test}/entity/AccountTbl.java  |  23 ++-
 .../mybatisflex/test}/entity/OrderTbl.java    |  23 ++-
 .../mybatisflex/test}/entity/StockTbl.java    |  23 ++-
 .../test}/service/TestService.java            |  41 +++--
 .../src/main/resources/application.yml        |   1 -
 .../src/main/resources/db/all_in_one.sql      |   0
 ...isFlexSpringBootSeataApplicationTests.java |  29 ++++
 .../mybatis-flex-spring-boot-seata/pom.xml    | 155 ------------------
 ...MybatisFlexSpringBootSeataApplication.java |  15 --
 .../controller/TestController.java            |  28 ----
 .../mapper/AccountTblMapper.java              |  15 --
 .../mapper/OrderTblMapper.java                |  15 --
 .../mapper/StockTblMapper.java                |  15 --
 .../utils/Codegen.java                        |  88 ----------
 ...isFlexSpringBootSeataApplicationTests.java |  13 --
 mybatis-flex-test/pom.xml                     |   2 +-
 20 files changed, 255 insertions(+), 374 deletions(-)
 create mode 100644 mybatis-flex-test/mybatis-flex-seata-test/mybatis-flex.config
 create mode 100644 mybatis-flex-test/mybatis-flex-seata-test/pom.xml
 create mode 100644 mybatis-flex-test/mybatis-flex-seata-test/src/main/java/com/mybatisflex/test/MybatisFlexSpringBootSeataApplication.java
 create mode 100644 mybatis-flex-test/mybatis-flex-seata-test/src/main/java/com/mybatisflex/test/controller/TestController.java
 rename mybatis-flex-test/{mybatis-flex-spring-boot-seata/src/main/java/com/mybatisfle/test/mybatisflexspringbootseata => mybatis-flex-seata-test/src/main/java/com/mybatisflex/test}/entity/AccountTbl.java (54%)
 rename mybatis-flex-test/{mybatis-flex-spring-boot-seata/src/main/java/com/mybatisfle/test/mybatisflexspringbootseata => mybatis-flex-seata-test/src/main/java/com/mybatisflex/test}/entity/OrderTbl.java (63%)
 rename mybatis-flex-test/{mybatis-flex-spring-boot-seata/src/main/java/com/mybatisfle/test/mybatisflexspringbootseata => mybatis-flex-seata-test/src/main/java/com/mybatisflex/test}/entity/StockTbl.java (56%)
 rename mybatis-flex-test/{mybatis-flex-spring-boot-seata/src/main/java/com/mybatisfle/test/mybatisflexspringbootseata => mybatis-flex-seata-test/src/main/java/com/mybatisflex/test}/service/TestService.java (58%)
 rename mybatis-flex-test/{mybatis-flex-spring-boot-seata => mybatis-flex-seata-test}/src/main/resources/application.yml (99%)
 rename mybatis-flex-test/{mybatis-flex-spring-boot-seata => mybatis-flex-seata-test}/src/main/resources/db/all_in_one.sql (100%)
 create mode 100644 mybatis-flex-test/mybatis-flex-seata-test/src/test/java/com/mybatisflex/test/MybatisFlexSpringBootSeataApplicationTests.java
 delete mode 100644 mybatis-flex-test/mybatis-flex-spring-boot-seata/pom.xml
 delete mode 100644 mybatis-flex-test/mybatis-flex-spring-boot-seata/src/main/java/com/mybatisfle/test/mybatisflexspringbootseata/MybatisFlexSpringBootSeataApplication.java
 delete mode 100644 mybatis-flex-test/mybatis-flex-spring-boot-seata/src/main/java/com/mybatisfle/test/mybatisflexspringbootseata/controller/TestController.java
 delete mode 100644 mybatis-flex-test/mybatis-flex-spring-boot-seata/src/main/java/com/mybatisfle/test/mybatisflexspringbootseata/mapper/AccountTblMapper.java
 delete mode 100644 mybatis-flex-test/mybatis-flex-spring-boot-seata/src/main/java/com/mybatisfle/test/mybatisflexspringbootseata/mapper/OrderTblMapper.java
 delete mode 100644 mybatis-flex-test/mybatis-flex-spring-boot-seata/src/main/java/com/mybatisfle/test/mybatisflexspringbootseata/mapper/StockTblMapper.java
 delete mode 100644 mybatis-flex-test/mybatis-flex-spring-boot-seata/src/main/java/com/mybatisfle/test/mybatisflexspringbootseata/utils/Codegen.java
 delete mode 100644 mybatis-flex-test/mybatis-flex-spring-boot-seata/src/test/java/com/mybatisfle/test/mybatisflexspringbootseata/MybatisFlexSpringBootSeataApplicationTests.java

diff --git a/mybatis-flex-test/mybatis-flex-seata-test/mybatis-flex.config b/mybatis-flex-test/mybatis-flex-seata-test/mybatis-flex.config
new file mode 100644
index 00000000..f6050f8b
--- /dev/null
+++ b/mybatis-flex-test/mybatis-flex-seata-test/mybatis-flex.config
@@ -0,0 +1 @@
+processor.mapper.generateEnable=true
diff --git a/mybatis-flex-test/mybatis-flex-seata-test/pom.xml b/mybatis-flex-test/mybatis-flex-seata-test/pom.xml
new file mode 100644
index 00000000..af3998bc
--- /dev/null
+++ b/mybatis-flex-test/mybatis-flex-seata-test/pom.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<parent>
+		<artifactId>mybatis-flex-test</artifactId>
+		<groupId>com.mybatis-flex</groupId>
+		<version>1.5.6</version>
+	</parent>
+	<modelVersion>4.0.0</modelVersion>
+
+	<artifactId>mybatis-flex-seata-test</artifactId>
+    <packaging>jar</packaging>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+
+	<dependencies>
+		<dependency>
+			<groupId>com.mybatis-flex</groupId>
+			<artifactId>mybatis-flex-spring-boot-starter</artifactId>
+			<version>${mybatis-flex.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>com.alibaba.fastjson2</groupId>
+			<artifactId>fastjson2</artifactId>
+			<version>2.0.32</version>
+		</dependency>
+
+		<dependency>
+			<groupId>com.alibaba</groupId>
+			<artifactId>druid-spring-boot-starter</artifactId>
+			<version>1.2.18</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-data-jdbc</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>com.mysql</groupId>
+			<artifactId>mysql-connector-j</artifactId>
+		</dependency>
+
+        <dependency>
+            <groupId>io.seata</groupId>
+            <artifactId>seata-spring-boot-starter</artifactId>
+            <version>1.7.0</version>
+        </dependency>
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-test</artifactId>
+			<scope>test</scope>
+		</dependency>
+
+	</dependencies>
+
+</project>
diff --git a/mybatis-flex-test/mybatis-flex-seata-test/src/main/java/com/mybatisflex/test/MybatisFlexSpringBootSeataApplication.java b/mybatis-flex-test/mybatis-flex-seata-test/src/main/java/com/mybatisflex/test/MybatisFlexSpringBootSeataApplication.java
new file mode 100644
index 00000000..6a60a118
--- /dev/null
+++ b/mybatis-flex-test/mybatis-flex-seata-test/src/main/java/com/mybatisflex/test/MybatisFlexSpringBootSeataApplication.java
@@ -0,0 +1,31 @@
+/*
+ *  Copyright (c) 2022-2023, Mybatis-Flex (fuhai999@gmail.com).
+ *  <p>
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *  <p>
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *  <p>
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package com.mybatisflex.test;
+
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+@MapperScan("com.mybatisflex.test.mapper")
+public class MybatisFlexSpringBootSeataApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(MybatisFlexSpringBootSeataApplication.class, args);
+    }
+
+}
diff --git a/mybatis-flex-test/mybatis-flex-seata-test/src/main/java/com/mybatisflex/test/controller/TestController.java b/mybatis-flex-test/mybatis-flex-seata-test/src/main/java/com/mybatisflex/test/controller/TestController.java
new file mode 100644
index 00000000..77b093d1
--- /dev/null
+++ b/mybatis-flex-test/mybatis-flex-seata-test/src/main/java/com/mybatisflex/test/controller/TestController.java
@@ -0,0 +1,44 @@
+/*
+ *  Copyright (c) 2022-2023, Mybatis-Flex (fuhai999@gmail.com).
+ *  <p>
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *  <p>
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *  <p>
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package com.mybatisflex.test.controller;
+
+import com.mybatisflex.core.audit.AuditManager;
+import com.mybatisflex.core.audit.ConsoleMessageCollector;
+import com.mybatisflex.core.audit.MessageCollector;
+import com.mybatisflex.test.service.TestService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+@Controller
+public class TestController {
+
+
+    @Autowired
+    TestService testService;
+
+    @RequestMapping("buy")
+    public String buy() {
+        //开启审计功能
+        AuditManager.setAuditEnable(true);
+        //设置 SQL 审计收集器
+        MessageCollector collector = new ConsoleMessageCollector();
+        AuditManager.setMessageCollector(collector);
+        return String.valueOf(testService.buy());
+    }
+
+}
diff --git a/mybatis-flex-test/mybatis-flex-spring-boot-seata/src/main/java/com/mybatisfle/test/mybatisflexspringbootseata/entity/AccountTbl.java b/mybatis-flex-test/mybatis-flex-seata-test/src/main/java/com/mybatisflex/test/entity/AccountTbl.java
similarity index 54%
rename from mybatis-flex-test/mybatis-flex-spring-boot-seata/src/main/java/com/mybatisfle/test/mybatisflexspringbootseata/entity/AccountTbl.java
rename to mybatis-flex-test/mybatis-flex-seata-test/src/main/java/com/mybatisflex/test/entity/AccountTbl.java
index ee716d42..d2629d81 100644
--- a/mybatis-flex-test/mybatis-flex-spring-boot-seata/src/main/java/com/mybatisfle/test/mybatisflexspringbootseata/entity/AccountTbl.java
+++ b/mybatis-flex-test/mybatis-flex-seata-test/src/main/java/com/mybatisflex/test/entity/AccountTbl.java
@@ -1,13 +1,26 @@
-package com.mybatisfle.test.mybatisflexspringbootseata.entity;
+/*
+ *  Copyright (c) 2022-2023, Mybatis-Flex (fuhai999@gmail.com).
+ *  <p>
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *  <p>
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *  <p>
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package com.mybatisflex.test.entity;
 
 import com.mybatisflex.annotation.Id;
 import com.mybatisflex.annotation.KeyType;
 import com.mybatisflex.annotation.Table;
+
 import java.io.Serializable;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
 
 /**
  *  实体类。
diff --git a/mybatis-flex-test/mybatis-flex-spring-boot-seata/src/main/java/com/mybatisfle/test/mybatisflexspringbootseata/entity/OrderTbl.java b/mybatis-flex-test/mybatis-flex-seata-test/src/main/java/com/mybatisflex/test/entity/OrderTbl.java
similarity index 63%
rename from mybatis-flex-test/mybatis-flex-spring-boot-seata/src/main/java/com/mybatisfle/test/mybatisflexspringbootseata/entity/OrderTbl.java
rename to mybatis-flex-test/mybatis-flex-seata-test/src/main/java/com/mybatisflex/test/entity/OrderTbl.java
index 8f5b7c2f..d9f32725 100644
--- a/mybatis-flex-test/mybatis-flex-spring-boot-seata/src/main/java/com/mybatisfle/test/mybatisflexspringbootseata/entity/OrderTbl.java
+++ b/mybatis-flex-test/mybatis-flex-seata-test/src/main/java/com/mybatisflex/test/entity/OrderTbl.java
@@ -1,13 +1,26 @@
-package com.mybatisfle.test.mybatisflexspringbootseata.entity;
+/*
+ *  Copyright (c) 2022-2023, Mybatis-Flex (fuhai999@gmail.com).
+ *  <p>
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *  <p>
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *  <p>
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package com.mybatisflex.test.entity;
 
 import com.mybatisflex.annotation.Id;
 import com.mybatisflex.annotation.KeyType;
 import com.mybatisflex.annotation.Table;
+
 import java.io.Serializable;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
 
 /**
  *  实体类。
diff --git a/mybatis-flex-test/mybatis-flex-spring-boot-seata/src/main/java/com/mybatisfle/test/mybatisflexspringbootseata/entity/StockTbl.java b/mybatis-flex-test/mybatis-flex-seata-test/src/main/java/com/mybatisflex/test/entity/StockTbl.java
similarity index 56%
rename from mybatis-flex-test/mybatis-flex-spring-boot-seata/src/main/java/com/mybatisfle/test/mybatisflexspringbootseata/entity/StockTbl.java
rename to mybatis-flex-test/mybatis-flex-seata-test/src/main/java/com/mybatisflex/test/entity/StockTbl.java
index f452cdec..e38e090f 100644
--- a/mybatis-flex-test/mybatis-flex-spring-boot-seata/src/main/java/com/mybatisfle/test/mybatisflexspringbootseata/entity/StockTbl.java
+++ b/mybatis-flex-test/mybatis-flex-seata-test/src/main/java/com/mybatisflex/test/entity/StockTbl.java
@@ -1,13 +1,26 @@
-package com.mybatisfle.test.mybatisflexspringbootseata.entity;
+/*
+ *  Copyright (c) 2022-2023, Mybatis-Flex (fuhai999@gmail.com).
+ *  <p>
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *  <p>
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *  <p>
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package com.mybatisflex.test.entity;
 
 import com.mybatisflex.annotation.Id;
 import com.mybatisflex.annotation.KeyType;
 import com.mybatisflex.annotation.Table;
+
 import java.io.Serializable;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
 
 /**
  *  实体类。
diff --git a/mybatis-flex-test/mybatis-flex-spring-boot-seata/src/main/java/com/mybatisfle/test/mybatisflexspringbootseata/service/TestService.java b/mybatis-flex-test/mybatis-flex-seata-test/src/main/java/com/mybatisflex/test/service/TestService.java
similarity index 58%
rename from mybatis-flex-test/mybatis-flex-spring-boot-seata/src/main/java/com/mybatisfle/test/mybatisflexspringbootseata/service/TestService.java
rename to mybatis-flex-test/mybatis-flex-seata-test/src/main/java/com/mybatisflex/test/service/TestService.java
index 77a811e5..15acd016 100644
--- a/mybatis-flex-test/mybatis-flex-spring-boot-seata/src/main/java/com/mybatisfle/test/mybatisflexspringbootseata/service/TestService.java
+++ b/mybatis-flex-test/mybatis-flex-seata-test/src/main/java/com/mybatisflex/test/service/TestService.java
@@ -1,23 +1,37 @@
-package com.mybatisfle.test.mybatisflexspringbootseata.service;
+/*
+ *  Copyright (c) 2022-2023, Mybatis-Flex (fuhai999@gmail.com).
+ *  <p>
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *  <p>
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *  <p>
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package com.mybatisflex.test.service;
 
 
-import com.mybatisfle.test.mybatisflexspringbootseata.entity.AccountTbl;
-import com.mybatisfle.test.mybatisflexspringbootseata.entity.OrderTbl;
-import com.mybatisfle.test.mybatisflexspringbootseata.entity.StockTbl;
-import com.mybatisfle.test.mybatisflexspringbootseata.entity.table.AccountTblTableDef;
-import com.mybatisfle.test.mybatisflexspringbootseata.mapper.AccountTblMapper;
-import com.mybatisfle.test.mybatisflexspringbootseata.mapper.OrderTblMapper;
-import com.mybatisfle.test.mybatisflexspringbootseata.mapper.StockTblMapper;
 import com.mybatisflex.core.datasource.DataSourceKey;
 import com.mybatisflex.core.query.QueryWrapper;
+import com.mybatisflex.test.entity.AccountTbl;
+import com.mybatisflex.test.entity.OrderTbl;
+import com.mybatisflex.test.entity.StockTbl;
+import com.mybatisflex.test.entity.table.AccountTblTableDef;
+import com.mybatisflex.test.mapper.AccountTblMapper;
+import com.mybatisflex.test.mapper.OrderTblMapper;
+import com.mybatisflex.test.mapper.StockTblMapper;
 import io.seata.core.context.RootContext;
 import io.seata.spring.annotation.GlobalTransactional;
 import org.mybatis.logging.Logger;
 import org.mybatis.logging.LoggerFactory;
-import org.mybatis.spring.SqlSessionFactoryBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 @Service
 public class TestService {
@@ -33,12 +47,12 @@ public class TestService {
     @Autowired
     StockTblMapper stockTblMapper;
 
-//    @Transactional
+    //    @Transactional
     @GlobalTransactional
     public boolean buy() {
 //        DataSourceKey.use("accountdb");
-        LOGGER.warn(() -> "xid:"+RootContext.getXID());
-        QueryWrapper account =new QueryWrapper();
+        LOGGER.warn(() -> "xid:" + RootContext.getXID());
+        QueryWrapper account = new QueryWrapper();
         account.where(AccountTblTableDef.ACCOUNT_TBL.USER_ID.eq("1001"));
         AccountTbl accountTbl = accountTblMapper.selectOneByQuery(account);
         accountTbl.setMoney(accountTbl.getMoney() - 5);
@@ -59,4 +73,5 @@ public class TestService {
         orderTblMapper.insert(orderTbl);
         return true;
     }
+
 }
diff --git a/mybatis-flex-test/mybatis-flex-spring-boot-seata/src/main/resources/application.yml b/mybatis-flex-test/mybatis-flex-seata-test/src/main/resources/application.yml
similarity index 99%
rename from mybatis-flex-test/mybatis-flex-spring-boot-seata/src/main/resources/application.yml
rename to mybatis-flex-test/mybatis-flex-seata-test/src/main/resources/application.yml
index 2000304f..97c7b42c 100644
--- a/mybatis-flex-test/mybatis-flex-spring-boot-seata/src/main/resources/application.yml
+++ b/mybatis-flex-test/mybatis-flex-seata-test/src/main/resources/application.yml
@@ -1,4 +1,3 @@
-
 mybatis-flex:
   seata-config:
     enable: true #启动seata
diff --git a/mybatis-flex-test/mybatis-flex-spring-boot-seata/src/main/resources/db/all_in_one.sql b/mybatis-flex-test/mybatis-flex-seata-test/src/main/resources/db/all_in_one.sql
similarity index 100%
rename from mybatis-flex-test/mybatis-flex-spring-boot-seata/src/main/resources/db/all_in_one.sql
rename to mybatis-flex-test/mybatis-flex-seata-test/src/main/resources/db/all_in_one.sql
diff --git a/mybatis-flex-test/mybatis-flex-seata-test/src/test/java/com/mybatisflex/test/MybatisFlexSpringBootSeataApplicationTests.java b/mybatis-flex-test/mybatis-flex-seata-test/src/test/java/com/mybatisflex/test/MybatisFlexSpringBootSeataApplicationTests.java
new file mode 100644
index 00000000..812410b1
--- /dev/null
+++ b/mybatis-flex-test/mybatis-flex-seata-test/src/test/java/com/mybatisflex/test/MybatisFlexSpringBootSeataApplicationTests.java
@@ -0,0 +1,29 @@
+/*
+ *  Copyright (c) 2022-2023, Mybatis-Flex (fuhai999@gmail.com).
+ *  <p>
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *  <p>
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *  <p>
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package com.mybatisflex.test;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+
+@SpringBootTest
+class MybatisFlexSpringBootSeataApplicationTests {
+
+	@Test
+	void contextLoads() {
+	}
+
+}
diff --git a/mybatis-flex-test/mybatis-flex-spring-boot-seata/pom.xml b/mybatis-flex-test/mybatis-flex-spring-boot-seata/pom.xml
deleted file mode 100644
index e7fd6f34..00000000
--- a/mybatis-flex-test/mybatis-flex-spring-boot-seata/pom.xml
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<artifactId>mybatis-flex-test</artifactId>
-		<groupId>com.mybatis-flex</groupId>
-		<version>1.5.6</version>
-	</parent>
-	<groupId>com.mybatisfle.test</groupId>
-	<artifactId>mybatis-flex-spring-boot-seata</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
-	<name>mybatis-flex-spring-boot-seata</name>
-	<description>mybatis-flex-spring-boot-seata</description>
-	<properties>
-		<java.version>1.8</java.version>
-	</properties>
-	<dependencies>
-		<dependency>
-			<groupId>com.mybatis-flex</groupId>
-			<artifactId>mybatis-flex-spring-boot-starter</artifactId>
-			<version>${mybatis-flex.version}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>com.mybatis-flex</groupId>
-			<artifactId>mybatis-flex-codegen</artifactId>
-			<version>${mybatis-flex.version}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-web</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>com.alibaba.fastjson2</groupId>
-			<artifactId>fastjson2</artifactId>
-			<version>2.0.32</version>
-		</dependency>
-
-		<dependency>
-			<groupId>com.alibaba</groupId>
-			<artifactId>druid-spring-boot-starter</artifactId>
-			<version>1.2.18</version>
-		</dependency>
-
-		<!--        <dependency>-->
-		<!--            <groupId>org.springframework.boot</groupId>-->
-		<!--            <artifactId>spring-boot-starter-jdbc</artifactId>-->
-		<!--            <version>2.7.9</version>-->
-		<!--        </dependency>-->
-
-		<!--        <dependency>-->
-		<!--            <groupId>org.springframework</groupId>-->
-		<!--            <artifactId>spring-jdbc</artifactId>-->
-		<!--        </dependency>-->
-
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-data-jdbc</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>com.mysql</groupId>
-			<artifactId>mysql-connector-j</artifactId>
-		</dependency>
-
-        <dependency>
-            <groupId>io.seata</groupId>
-            <artifactId>seata-spring-boot-starter</artifactId>
-            <version>1.7.0</version>
-        </dependency>
-
-
-		<!--        <dependency>-->
-		<!--            <groupId>com.h2database</groupId>-->
-		<!--            <artifactId>h2</artifactId>-->
-		<!--            <version>2.1.214</version>-->
-		<!--        </dependency>-->
-
-		<!--        <dependency>-->
-		<!--            <groupId>org.yaml</groupId>-->
-		<!--            <artifactId>snakeyaml</artifactId>-->
-		<!--            <version>1.33</version>-->
-		<!--        </dependency>-->
-
-
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-test</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.projectlombok</groupId>
-			<artifactId>lombok</artifactId>
-			<version>RELEASE</version>
-			<scope>compile</scope>
-		</dependency>
-	</dependencies>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-maven-plugin</artifactId>
-				<configuration>
-					<excludes>
-						<exclude>
-							<groupId>org.projectlombok</groupId>
-							<artifactId>lombok</artifactId>
-						</exclude>
-					</excludes>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-	<repositories>
-		<repository>
-			<id>spring-milestones</id>
-			<name>Spring Milestones</name>
-			<url>https://repo.spring.io/milestone</url>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>spring-snapshots</id>
-			<name>Spring Snapshots</name>
-			<url>https://repo.spring.io/snapshot</url>
-			<releases>
-				<enabled>false</enabled>
-			</releases>
-		</repository>
-	</repositories>
-	<pluginRepositories>
-		<pluginRepository>
-			<id>spring-milestones</id>
-			<name>Spring Milestones</name>
-			<url>https://repo.spring.io/milestone</url>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</pluginRepository>
-		<pluginRepository>
-			<id>spring-snapshots</id>
-			<name>Spring Snapshots</name>
-			<url>https://repo.spring.io/snapshot</url>
-			<releases>
-				<enabled>false</enabled>
-			</releases>
-		</pluginRepository>
-	</pluginRepositories>
-
-</project>
diff --git a/mybatis-flex-test/mybatis-flex-spring-boot-seata/src/main/java/com/mybatisfle/test/mybatisflexspringbootseata/MybatisFlexSpringBootSeataApplication.java b/mybatis-flex-test/mybatis-flex-spring-boot-seata/src/main/java/com/mybatisfle/test/mybatisflexspringbootseata/MybatisFlexSpringBootSeataApplication.java
deleted file mode 100644
index 142a5773..00000000
--- a/mybatis-flex-test/mybatis-flex-spring-boot-seata/src/main/java/com/mybatisfle/test/mybatisflexspringbootseata/MybatisFlexSpringBootSeataApplication.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.mybatisfle.test.mybatisflexspringbootseata;
-
-import org.mybatis.spring.annotation.MapperScan;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-
-@MapperScan("com.mybatisfle.test.mybatisflexspringbootseata")
-@SpringBootApplication
-public class MybatisFlexSpringBootSeataApplication {
-
-	public static void main(String[] args) {
-		SpringApplication.run(MybatisFlexSpringBootSeataApplication.class, args);
-	}
-
-}
diff --git a/mybatis-flex-test/mybatis-flex-spring-boot-seata/src/main/java/com/mybatisfle/test/mybatisflexspringbootseata/controller/TestController.java b/mybatis-flex-test/mybatis-flex-spring-boot-seata/src/main/java/com/mybatisfle/test/mybatisflexspringbootseata/controller/TestController.java
deleted file mode 100644
index b32d80b5..00000000
--- a/mybatis-flex-test/mybatis-flex-spring-boot-seata/src/main/java/com/mybatisfle/test/mybatisflexspringbootseata/controller/TestController.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.mybatisfle.test.mybatisflexspringbootseata.controller;
-
-import com.mybatisfle.test.mybatisflexspringbootseata.service.TestService;
-import com.mybatisflex.core.audit.AuditManager;
-import com.mybatisflex.core.audit.ConsoleMessageCollector;
-import com.mybatisflex.core.audit.MessageCollector;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-@Controller
-public class TestController {
-
-
-    @Autowired
-    TestService testService;
-
-    @RequestMapping("buy")
-    public String buy(){
-        //开启审计功能
-        AuditManager.setAuditEnable(true);
-//设置 SQL 审计收集器
-        MessageCollector collector = new ConsoleMessageCollector();
-        AuditManager.setMessageCollector(collector);
-        String flag =String.valueOf(testService.buy());
-        return flag;
-    }
-}
diff --git a/mybatis-flex-test/mybatis-flex-spring-boot-seata/src/main/java/com/mybatisfle/test/mybatisflexspringbootseata/mapper/AccountTblMapper.java b/mybatis-flex-test/mybatis-flex-spring-boot-seata/src/main/java/com/mybatisfle/test/mybatisflexspringbootseata/mapper/AccountTblMapper.java
deleted file mode 100644
index f6a9cdd5..00000000
--- a/mybatis-flex-test/mybatis-flex-spring-boot-seata/src/main/java/com/mybatisfle/test/mybatisflexspringbootseata/mapper/AccountTblMapper.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.mybatisfle.test.mybatisflexspringbootseata.mapper;
-
-
-import com.mybatisfle.test.mybatisflexspringbootseata.entity.AccountTbl;
-import com.mybatisflex.core.BaseMapper;
-
-/**
- *  映射层。
- *
- * @author life
- * @since 2023-08-03
- */
-public interface AccountTblMapper extends BaseMapper<AccountTbl> {
-
-}
diff --git a/mybatis-flex-test/mybatis-flex-spring-boot-seata/src/main/java/com/mybatisfle/test/mybatisflexspringbootseata/mapper/OrderTblMapper.java b/mybatis-flex-test/mybatis-flex-spring-boot-seata/src/main/java/com/mybatisfle/test/mybatisflexspringbootseata/mapper/OrderTblMapper.java
deleted file mode 100644
index 56983337..00000000
--- a/mybatis-flex-test/mybatis-flex-spring-boot-seata/src/main/java/com/mybatisfle/test/mybatisflexspringbootseata/mapper/OrderTblMapper.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.mybatisfle.test.mybatisflexspringbootseata.mapper;
-
-
-import com.mybatisfle.test.mybatisflexspringbootseata.entity.OrderTbl;
-import com.mybatisflex.core.BaseMapper;
-
-/**
- *  映射层。
- *
- * @author life
- * @since 2023-08-03
- */
-public interface OrderTblMapper extends BaseMapper<OrderTbl> {
-
-}
diff --git a/mybatis-flex-test/mybatis-flex-spring-boot-seata/src/main/java/com/mybatisfle/test/mybatisflexspringbootseata/mapper/StockTblMapper.java b/mybatis-flex-test/mybatis-flex-spring-boot-seata/src/main/java/com/mybatisfle/test/mybatisflexspringbootseata/mapper/StockTblMapper.java
deleted file mode 100644
index ef6abe50..00000000
--- a/mybatis-flex-test/mybatis-flex-spring-boot-seata/src/main/java/com/mybatisfle/test/mybatisflexspringbootseata/mapper/StockTblMapper.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.mybatisfle.test.mybatisflexspringbootseata.mapper;
-
-
-import com.mybatisfle.test.mybatisflexspringbootseata.entity.StockTbl;
-import com.mybatisflex.core.BaseMapper;
-
-/**
- *  映射层。
- *
- * @author life
- * @since 2023-08-03
- */
-public interface StockTblMapper extends BaseMapper<StockTbl> {
-
-}
diff --git a/mybatis-flex-test/mybatis-flex-spring-boot-seata/src/main/java/com/mybatisfle/test/mybatisflexspringbootseata/utils/Codegen.java b/mybatis-flex-test/mybatis-flex-spring-boot-seata/src/main/java/com/mybatisfle/test/mybatisflexspringbootseata/utils/Codegen.java
deleted file mode 100644
index a1dd2649..00000000
--- a/mybatis-flex-test/mybatis-flex-spring-boot-seata/src/main/java/com/mybatisfle/test/mybatisflexspringbootseata/utils/Codegen.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package com.mybatisfle.test.mybatisflexspringbootseata.utils;
-
-import com.mybatisflex.codegen.Generator;
-import com.mybatisflex.codegen.config.ColumnConfig;
-import com.mybatisflex.codegen.config.GlobalConfig;
-import com.zaxxer.hikari.HikariDataSource;
-
-public class Codegen {
-
-    public static void main(String[] args) {
-        //配置数据源
-        HikariDataSource dataSource = new HikariDataSource();
-        dataSource.setJdbcUrl("jdbc:mysql://127.0.0.1:3306/db_stock?characterEncoding=utf-8");
-        dataSource.setUsername("root");
-        dataSource.setPassword("131496");
-
-        //创建配置内容，两种风格都可以。
-        GlobalConfig globalConfig = createGlobalConfigUseStyle1();
-        //GlobalConfig globalConfig = createGlobalConfigUseStyle2();
-
-        //通过 datasource 和 globalConfig 创建代码生成器
-        Generator generator = new Generator(dataSource, globalConfig);
-
-        //生成代码
-        generator.generate();
-    }
-
-    public static GlobalConfig createGlobalConfigUseStyle1() {
-        //创建配置内容
-        GlobalConfig globalConfig = new GlobalConfig();
-
-        //设置根包
-        globalConfig.setBasePackage("com.mybatisfle.test.mybatisflexspringbootseata");
-
-        //设置表前缀和只生成哪些表
-        globalConfig.setGenerateSchema("db_stock");
-//        globalConfig.setTablePrefix("tb_");
-        globalConfig.setGenerateTable("stock_tbl");
-
-        //设置生成 entity 并启用 Lombok
-        globalConfig.setEntityGenerateEnable(true);
-        globalConfig.setEntityWithLombok(true);
-
-        //设置生成 mapper
-        globalConfig.setMapperGenerateEnable(true);
-
-        //可以单独配置某个列
-//        ColumnConfig columnConfig = new ColumnConfig();
-//        columnConfig.setColumnName("tenant_id");
-//        columnConfig.setLarge(true);
-//        columnConfig.setVersion(true);
-//        globalConfig.setColumnConfig("account", columnConfig);
-
-        return globalConfig;
-    }
-
-    public static GlobalConfig createGlobalConfigUseStyle2() {
-        //创建配置内容
-        GlobalConfig globalConfig = new GlobalConfig();
-
-        //设置根包
-        globalConfig.getPackageConfig()
-                .setBasePackage("com.test");
-
-        //设置表前缀和只生成哪些表，setGenerateTable 未配置时，生成所有表
-        globalConfig.getStrategyConfig()
-                .setGenerateSchema("schema")
-                .setTablePrefix("tb_")
-                .setGenerateTable("account", "account_session");
-
-        //设置生成 entity 并启用 Lombok
-        globalConfig.enableEntity()
-                .setWithLombok(true);
-
-        //设置生成 mapper
-        globalConfig.enableMapper();
-
-        //可以单独配置某个列
-        ColumnConfig columnConfig = new ColumnConfig();
-        columnConfig.setColumnName("tenant_id");
-        columnConfig.setLarge(true);
-        columnConfig.setVersion(true);
-        globalConfig.getStrategyConfig()
-                .setColumnConfig("account", columnConfig);
-
-        return globalConfig;
-    }
-}
diff --git a/mybatis-flex-test/mybatis-flex-spring-boot-seata/src/test/java/com/mybatisfle/test/mybatisflexspringbootseata/MybatisFlexSpringBootSeataApplicationTests.java b/mybatis-flex-test/mybatis-flex-spring-boot-seata/src/test/java/com/mybatisfle/test/mybatisflexspringbootseata/MybatisFlexSpringBootSeataApplicationTests.java
deleted file mode 100644
index f763ac31..00000000
--- a/mybatis-flex-test/mybatis-flex-spring-boot-seata/src/test/java/com/mybatisfle/test/mybatisflexspringbootseata/MybatisFlexSpringBootSeataApplicationTests.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.mybatisfle.test.mybatisflexspringbootseata;
-
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-
-@SpringBootTest
-class MybatisFlexSpringBootSeataApplicationTests {
-
-	@Test
-	void contextLoads() {
-	}
-
-}
diff --git a/mybatis-flex-test/pom.xml b/mybatis-flex-test/pom.xml
index af9c75ff..0643868e 100644
--- a/mybatis-flex-test/pom.xml
+++ b/mybatis-flex-test/pom.xml
@@ -15,10 +15,10 @@
 
     <modules>
         <module>mybatis-flex-native-test</module>
+        <module>mybatis-flex-seata-test</module>
         <module>mybatis-flex-spring-test</module>
         <module>mybatis-flex-spring-boot-test</module>
         <module>mybatis-flex-spring-cloud-test</module>
-        <module>mybatis-flex-spring-boot-seata</module>
     </modules>
 
     <properties>

From 2d998d6202d0c04246c885c92c24048bedd938dd Mon Sep 17 00:00:00 2001
From: Suomm <1474983351@qq.com>
Date: Wed, 9 Aug 2023 16:33:35 +0800
Subject: [PATCH 16/22] =?UTF-8?q?feat:=20Lambda=20=E6=94=AF=E6=8C=81=20set?=
 =?UTF-8?q?=20join=20=E5=88=97=E7=9A=84=E5=80=BC=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/mybatisflex/core/update/UpdateChain.java     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/update/UpdateChain.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/update/UpdateChain.java
index f8192e4d..99dc62e6 100644
--- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/update/UpdateChain.java
+++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/update/UpdateChain.java
@@ -92,12 +92,12 @@ public class UpdateChain<T> extends QueryWrapperAdapter<UpdateChain<T>> {
         return this;
     }
 
-    public UpdateChain<T> set(LambdaGetter<T> getter, Object value, boolean condition) {
+    public <L> UpdateChain<T> set(LambdaGetter<L> getter, Object value, boolean condition) {
         entityWrapper.set(getter, value, condition);
         return this;
     }
 
-    public UpdateChain<T> set(LambdaGetter<T> getter, Object value) {
+    public <L> UpdateChain<T> set(LambdaGetter<L> getter, Object value) {
         entityWrapper.set(getter, value);
         return this;
     }
@@ -123,12 +123,12 @@ public class UpdateChain<T> extends QueryWrapperAdapter<UpdateChain<T>> {
         return this;
     }
 
-    public UpdateChain<T> setRaw(LambdaGetter<T> getter, Object value, boolean condition) {
+    public <L> UpdateChain<T> setRaw(LambdaGetter<L> getter, Object value, boolean condition) {
         entityWrapper.setRaw(getter, value, condition);
         return this;
     }
 
-    public UpdateChain<T> setRaw(LambdaGetter<T> getter, Object value) {
+    public <L> UpdateChain<T> setRaw(LambdaGetter<L> getter, Object value) {
         entityWrapper.setRaw(getter, value);
         return this;
     }

From 68fa591c6097f4f53f95e197b13bb24d89137af8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=80=E6=BA=90=E6=B5=B7=E5=93=A5?= <fuhai999@gmail.com>
Date: Wed, 9 Aug 2023 16:33:39 +0800
Subject: [PATCH 17/22] doc: update docs

---
 docs/zh/base/querywrapper.md | 2 +-
 docs/zh/faq.md               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/zh/base/querywrapper.md b/docs/zh/base/querywrapper.md
index 9c003f13..7c4346dc 100644
--- a/docs/zh/base/querywrapper.md
+++ b/docs/zh/base/querywrapper.md
@@ -1017,7 +1017,7 @@ QueryWrapper query2 = QueryWrapper.create()
 在以上的 `query1` 中，由于 `userName` 和 `id` 都为 null，MyBatis-Flex 会自动忽略 null 值的条件，因此，它们构建出来的 SQL 条件是和 `query2` 完全一致的 。
 
 
-## QueryColumnBehavior <Badge type="tip" text="^ v1.5.6" />
+## QueryColumnBehavior <Badge type="tip" text="^ v1.5.7" />
 
 在以上的内容中，我们知道 MyBatis-Flex 会自动忽略 `null` 值的条件，但是在实际开发中，有的开发者希望除了自动忽略 `null`
 值以外，还可以自动忽略其他值，比如 `空字符串` 等。
diff --git a/docs/zh/faq.md b/docs/zh/faq.md
index 3127fc62..f672b110 100644
--- a/docs/zh/faq.md
+++ b/docs/zh/faq.md
@@ -21,7 +21,7 @@
   就可以了，不需要再添加其他 MyBatis 依赖。
 - 3、是否与 `mybatis-plus-boot-starter` 共用，使 MyBatis 被优先初始化，而导致 MyBatis-Flex 没有被加载。
 - 4、是否添加了 `pagehelper-spring-boot-starter` 依赖，导致传递了 `mybatis-spring-boot-starter` 依赖。如还想继续使用 pagehelper 插件，点击 [这里](#与-pagehelper-集成出现错误) 查看解决方案。
-- 5、是否 Spring Boot 版本过低，请使用 Spring Boot 2.2 及其以上版本，点击 [这里](#springboot-项目启动报错-javalangclassnotfoundexception-orgspringframeworktransactiontransactionmanager) 获取详细信息。
+- 5、是否 Spring Boot 版本过低，请使用 Spring Boot 2.2 及其以上版本，点击 [这里](#springboot-项目-启动报错-java-lang-classnotfoundexception-org-springframework-transaction-transactionmanager) 获取详细信息。
 
 ## 示例中的 AccountMapper 和 "ACCOUNT" 在哪里，报错了。
 

From a79911b294911d76d7cf74e9f5e62a17134fa71b Mon Sep 17 00:00:00 2001
From: Suomm <1474983351@qq.com>
Date: Wed, 9 Aug 2023 16:33:49 +0800
Subject: [PATCH 18/22] =?UTF-8?q?test:=20Lambda=20set=20join=20=E5=88=97?=
 =?UTF-8?q?=E7=9A=84=E5=80=BC=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/mybatisflex/test/UpdateChainTest.java | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/mybatis-flex-test/mybatis-flex-native-test/src/main/java/com/mybatisflex/test/UpdateChainTest.java b/mybatis-flex-test/mybatis-flex-native-test/src/main/java/com/mybatisflex/test/UpdateChainTest.java
index 50eabe41..f1e13e48 100644
--- a/mybatis-flex-test/mybatis-flex-native-test/src/main/java/com/mybatisflex/test/UpdateChainTest.java
+++ b/mybatis-flex-test/mybatis-flex-native-test/src/main/java/com/mybatisflex/test/UpdateChainTest.java
@@ -1,3 +1,19 @@
+/*
+ *  Copyright (c) 2022-2023, Mybatis-Flex (fuhai999@gmail.com).
+ *  <p>
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *  <p>
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *  <p>
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
 package com.mybatisflex.test;
 
 import com.mybatisflex.core.MybatisFlexBootstrap;
@@ -15,6 +31,7 @@ import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
 import javax.sql.DataSource;
 
 import static com.mybatisflex.test.table.AccountTableDef.ACCOUNT;
+import static com.mybatisflex.test.table.ArticleTableDef.ARTICLE;
 
 public class UpdateChainTest {
 
@@ -69,4 +86,17 @@ public class UpdateChainTest {
             .list()
             .forEach(System.out::println);
     }
+
+    @Test
+    public void testUpdateChainToSql() {
+        String sql = UpdateChain.of(Account.class)
+            .set(ACCOUNT.AGE, 18)
+            .set(Article::getAccountId, 4, 1 == 1)
+            .leftJoin(ARTICLE).on(ACCOUNT.ID.eq(ARTICLE.ACCOUNT_ID))
+            .where(ACCOUNT.ID.eq(4))
+            .toSQL();
+
+        System.out.println(sql);
+    }
+
 }

From 6f2c13be3eabe33f59eec58dcb703a772f6d0c28 Mon Sep 17 00:00:00 2001
From: Suomm <1474983351@qq.com>
Date: Wed, 9 Aug 2023 16:51:29 +0800
Subject: [PATCH 19/22] =?UTF-8?q?doc:=20=E5=B1=95=E7=A4=BA=20Gradle=20?=
 =?UTF-8?q?=E7=9A=84=E7=9B=B8=E5=85=B3=E9=85=8D=E7=BD=AE=E8=AF=B4=E6=98=8E?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/.vitepress/config.ts          |  2 ++
 docs/zh/intro/gradle.md            | 22 ++++++++++++++--------
 docs/zh/intro/maven.md             |  2 +-
 docs/zh/{kotlin => others}/kapt.md | 18 ++++++++++--------
 4 files changed, 27 insertions(+), 17 deletions(-)
 rename docs/zh/{kotlin => others}/kapt.md (65%)

diff --git a/docs/.vitepress/config.ts b/docs/.vitepress/config.ts
index 238c4834..af2d6832 100644
--- a/docs/.vitepress/config.ts
+++ b/docs/.vitepress/config.ts
@@ -46,6 +46,7 @@ export default defineConfig({
                     {text: 'MyBatis-Flex 是什么', link: '/zh/intro/what-is-mybatisflex'},
                     {text: '快速开始', link: '/zh/intro/getting-started'},
                     {text: 'Maven 依赖', link: '/zh/intro/maven'},
+                    {text: 'Gradle 依赖', link: '/zh/intro/gradle'},
                     {text: '和同类框架「功能」对比', link: '/zh/intro/comparison'},
                     {text: '和同类框架「性能」对比', link: '/zh/intro/benchmark'},
                     {text: '使用 Mybatis 原生功能', link: '/zh/intro/use-mybatis-native'},
@@ -100,6 +101,7 @@ export default defineConfig({
                 items: [
                     {text: '代码生成器', link: '/zh/others/codegen'},
                     {text: 'APT 设置', link: '/zh/others/apt'},
+                    {text: 'KAPT 设置', link: '/zh/others/kapt'},
                 ]
             }
         ],
diff --git a/docs/zh/intro/gradle.md b/docs/zh/intro/gradle.md
index fac729e1..b61084ef 100644
--- a/docs/zh/intro/gradle.md
+++ b/docs/zh/intro/gradle.md
@@ -1,14 +1,14 @@
 # Gradle 依赖
 
-> 以下的 xml gradle 依赖示例中，可能并非最新的 MyBatis-Flex 版本，请自行查看最新版本，并修改版本号。
->
-> 建议配置 annotationProcessor，那么可以省略mybatis-flex-processor的依赖
->
+> 以下的 gradle 依赖示例中，可能并非最新的 MyBatis-Flex 版本，请自行查看最新版本，并修改版本号。
+
+> 建议配置 annotationProcessor，那么可以省略 mybatis-flex-processor 的依赖
 
 
 1、只用到了 MyBatis，没用到 Spring 的场景：
 
 **【Kotlin】**
+
 ```kotlin
 dependencies {
     implementation("com.mybatis-flex:mybatis-flex-core:1.5.6")
@@ -17,6 +17,7 @@ dependencies {
 ```
 
 **【Groovy】**
+
 ```groovy
 dependencies {
     implementation 'com.mybatis-flex:mybatis-flex-core:1.5.6'
@@ -41,9 +42,11 @@ dependencies {
     compileOnly 'com.mybatis-flex:mybatis-flex-processor:1.5.6'
 }
 ```
+
 3、用到了 Spring Boot 的场景
 
 **【Kotlin】**
+
 ```kotlin
 dependencies {
     implementation("com.mybatis-flex:mybatis-flex-spring-boot-starter:1.5.6")
@@ -52,6 +55,7 @@ dependencies {
 ```
 
 **【Groovy】**
+
 ```groovy
 dependencies {
     implementation 'com.mybatis-flex:mybatis-flex-spring-boot-starter:1.5.6'
@@ -59,15 +63,16 @@ dependencies {
 }
 ```
 
-4. 配置 annotationProcessor
+4、配置 annotationProcessor
 
-   `mybatis-flex-processor`提供APT服务，可以配置到annotationProcessorPaths，配置后，无需在依赖中声明`mybatis-flex-processor`依赖。
+`mybatis-flex-processor` 提供 APT 服务，可以配置到 annotationProcessorPaths 中，配置后，无需在依赖中声明 `mybatis-flex-processor` 依赖。
 
-   参考：[APT 设置-和 Lombok、Mapstruct 整合](../others/apt.md)
+参考：[APT 设置-和 Lombok、Mapstruct 整合](../others/apt.md)
 
-> 在Kotlin中使用时，请参考[在Kotlin中使用注解处理器](../kotlin/kapt.md)
+> 在 Kotlin 中使用时，请参考[在 Kotlin 中使用注解处理器](../others/kapt.md)
 
 **【Kotlin】**
+
 ```kotlin
 dependencies {
     annotationProcessor("org.springframework.boot:spring-boot-configuration-processor:1.5.6")
@@ -75,6 +80,7 @@ dependencies {
 ```
 
 **【Groovy】**
+
 ```groovy
 dependencies {
     annotationProcessor 'org.springframework.boot:spring-boot-configuration-processor:1.5.6'
diff --git a/docs/zh/intro/maven.md b/docs/zh/intro/maven.md
index c49f0978..05e66370 100644
--- a/docs/zh/intro/maven.md
+++ b/docs/zh/intro/maven.md
@@ -60,7 +60,7 @@
 
    参考：[APT 设置-和 Lombok、Mapstruct 整合](../others/apt.md)
 
-> 在Kotlin中使用时，请参考[在Kotlin中使用注解处理器](../kotlin/kapt.md)
+> 在Kotlin中使用时，请参考[在Kotlin中使用注解处理器](../others/kapt.md)
 
 ```xml
 <plugin>
diff --git a/docs/zh/kotlin/kapt.md b/docs/zh/others/kapt.md
similarity index 65%
rename from docs/zh/kotlin/kapt.md
rename to docs/zh/others/kapt.md
index 454d082b..5077f5a1 100644
--- a/docs/zh/kotlin/kapt.md
+++ b/docs/zh/others/kapt.md
@@ -1,11 +1,10 @@
-# 在Kotlin中使用注解处理器
+# 在 Kotlin 中使用注解处理器
 
-> 在Kotlin中想要使`@Table`等注解生效十分简单。只需要使用kapt即可。
->
+> 在 Kotlin 中想要使 `@Table` 等注解生效十分简单。只需要使用 KAPT 即可。
 
-## 在Gradle中使用
+## 在 Gradle 中使用
 
-1. 应用Gradle插件：kotlin-kapt
+1、应用 Gradle 插件：`kotlin-kapt`
 
 **【Kotlin】**
 
@@ -23,7 +22,9 @@ plugins {
 }
 ```
 
-2. 在 dependencies 块中使用 kapt 配置添加相应的依赖项
+2、在 dependencies 块中使用 KAPT 配置添加相应的依赖项
+
+
 **【Kotlin】**
 
 ```kotlin
@@ -39,7 +40,8 @@ dependencies {
 }
 ```
 
-## 在Maven中使用
+## 在 Maven 中使用
+
 在 compile 之前在 kotlin-maven-plugin 中添加 kapt 目标的执行：
 
 ```xml
@@ -60,4 +62,4 @@ dependencies {
 </execution>
 ```
 
-> 关于Kapt更详细的说明，请看[Kotlin官网说明](https://book.kotlincn.net/text/kapt.html)，或[Kotlin语言中文站](https://www.kotlincn.net/docs/reference/kapt.html)。
+> 关于 KAPT 更详细的说明，请看 [Kotlin 官网说明](https://book.kotlincn.net/text/kapt.html)，或 [Kotlin 语言中文站](https://www.kotlincn.net/docs/reference/kapt.html)。

From d05347ee8bf8c8873bf3790ee15c6483b18dfb45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=80=E6=BA=90=E6=B5=B7=E5=93=A5?= <fuhai999@gmail.com>
Date: Wed, 9 Aug 2023 16:55:25 +0800
Subject: [PATCH 20/22] doc: update docs

---
 docs/zh/faq.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/zh/faq.md b/docs/zh/faq.md
index f672b110..baf844b9 100644
--- a/docs/zh/faq.md
+++ b/docs/zh/faq.md
@@ -167,7 +167,7 @@ spring:
 <dependency>
     <groupId>com.github.pagehelper</groupId>
     <artifactId>pagehelper</artifactId>
-    <version>版本号</version>
+    <version>5.3.3</version>
 </dependency>
 ```
 解决方案：https://gitee.com/mybatis-flex/mybatis-flex/issues/I71AUE

From 521ea2458d4a1009e330a80b9566fee2b9b0471c Mon Sep 17 00:00:00 2001
From: Suomm <1474983351@qq.com>
Date: Wed, 9 Aug 2023 17:09:39 +0800
Subject: [PATCH 21/22] =?UTF-8?q?doc:=20=E6=B7=BB=E5=8A=A0=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E7=94=9F=E6=88=90=E5=99=A8=E8=8E=B7=E5=8F=96=E4=B8=8D?=
 =?UTF-8?q?=E5=88=B0=E6=B3=A8=E9=87=8A=E8=AF=B4=E6=98=8E=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/zh/faq.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/zh/faq.md b/docs/zh/faq.md
index f672b110..a3ccf70e 100644
--- a/docs/zh/faq.md
+++ b/docs/zh/faq.md
@@ -173,7 +173,9 @@ spring:
 解决方案：https://gitee.com/mybatis-flex/mybatis-flex/issues/I71AUE
 
 
+## 代码生成器获取不到注释
 
+如果是 MySQL 数据库的话，可能是因为数据库版本太低，解决办法：MySQL 5.* 需要在 jdbcUrl 设置参数 `useInformationSchema=true` 才能获取到注释。
 
 ## 如何自定义 MyBatis 的 Configuration?
 

From 6c0927ffff4f9a6e9f7c04b3cb98bce9aecc8aaf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=80=E6=BA=90=E6=B5=B7=E5=93=A5?= <fuhai999@gmail.com>
Date: Wed, 9 Aug 2023 19:07:31 +0800
Subject: [PATCH 22/22] doc: update docs

---
 docs/zh/faq.md | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/docs/zh/faq.md b/docs/zh/faq.md
index 57e23b54..a2a8383b 100644
--- a/docs/zh/faq.md
+++ b/docs/zh/faq.md
@@ -1,5 +1,7 @@
 # 常见问题
 
+[[toc]]
+
 ## MyBatis-Flex 没有启动或者启动出错怎么办？
 
 正常情况下，MyBatis-Flex 在启动时，会在控制台打印如下 Banner 信息，包含版本与官方网址，如果在项目启动中没有发现 MyBatis-Flex 的 Banner 打印，那就说明 MyBatis-Flex 没有被正常加载。
@@ -94,6 +96,18 @@ SpringBoot v3.x 添加 hikariCP 的内容如下：
 
 > 如果使用的是 druid 数据库连接池，则需要添加数据源类型的配置 `spring.datasource.type=com.alibaba.druid.pool.DruidDataSource`。
 
+## SpringBoot 项目中出现 class "com.xxx" cannot be cast class "com.xxx" 的错误
+这个问题是由于 Spring 的 devtools 热加载引起的，可以在项目的 `resources/META-INF`
+目录下创建一个名为 `spring-devtools.properties` 的配置文件，配置内容如下：
+
+```properties
+restart.include.mapper=/mapper-[\\w-\\.].jar
+restart.include.pagehelper=/pagehelper-[\\w-\\.].jar
+restart.include.mybatis-flex=/mybatis-flex-[\\w-\\.]+jar
+```
+相关文档参考 Spring 的官方网站：https://docs.spring.io/spring-boot/docs/current/reference/htmlsingle/#using.devtools.restart.customizing-the-classload
+
+
 ## java.sql.SQLException: No value specified for parameter x
 出现这个问题，原因是 MyBatis-Flex 未能正常启动，SQL 执行没有经过 MyBatis-Flex 导致的。其直接是因为和其他第三方增强框架整合使用了，
 比如和 MyBatis-Plus、或者 PageHelper 等整合造成的。
@@ -177,6 +191,20 @@ spring:
 
 如果是 MySQL 数据库的话，可能是因为数据库版本太低，解决办法：MySQL 5.* 需要在 jdbcUrl 设置参数 `useInformationSchema=true` 才能获取到注释。
 
+例如：`jdbc:mysql://127.0.0.1:3306/mybatis-flex?characterEncoding=UTF-8&useInformationSchema=true`
+
+## 与 Nacos 集成时出错，无法正常启动 MyBatis-Flex
+
+一般请看下是缺少 Nacos 的相关 Maven，注意添加如下的 Nacos 依赖：
+
+```xml
+<dependency>
+    <groupId>com.alibaba.cloud</groupId>
+    <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+    <version>2022.0.0.0</version>
+</dependency>
+```
+
 ## 如何自定义 MyBatis 的 Configuration?
 
 1、在不使用 Spring 的场景下：