From ac07997faba2bd7ae51b4af43614f76383736529 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: Sat, 6 May 2023 15:33:48 +0800
Subject: [PATCH] v1.2.1 release (^.^)YYa!!

---
 .../src/main/java/com/mybatisflex/test/Account.java         | 2 +-
 .../src/main/java/com/mybatisflex/test/AccountMapper.java   | 4 +---
 .../src/main/java/com/mybatisflex/test/BaseEntity.java      | 4 ++++
 .../main/java/com/mybatisflex/test/EntityTestStarter.java   | 4 ++--
 .../java/com/mybatisflex/test/MultiDataSourceTester.java    | 6 +++---
 .../src/main/java/com/mybatisflex/test/MyBaseMapper.java    | 6 ++++++
 6 files changed, 17 insertions(+), 9 deletions(-)
 create mode 100644 mybatis-flex-test/mybatis-flex-native-test/src/main/java/com/mybatisflex/test/BaseEntity.java
 create mode 100644 mybatis-flex-test/mybatis-flex-native-test/src/main/java/com/mybatisflex/test/MyBaseMapper.java

diff --git a/mybatis-flex-test/mybatis-flex-native-test/src/main/java/com/mybatisflex/test/Account.java b/mybatis-flex-test/mybatis-flex-native-test/src/main/java/com/mybatisflex/test/Account.java
index ecc1ca35..b99b58ad 100644
--- a/mybatis-flex-test/mybatis-flex-native-test/src/main/java/com/mybatisflex/test/Account.java
+++ b/mybatis-flex-test/mybatis-flex-native-test/src/main/java/com/mybatisflex/test/Account.java
@@ -11,7 +11,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 @Table(value = "tb_account", dataSource = "ds2", onSet = AccountOnSetListener.class)
-public class Account extends BaseAccount implements Serializable, AgeAware {
+public class Account extends BaseEntity implements Serializable, AgeAware {
 
     private static final long serialVersionUID = 1L;
 
diff --git a/mybatis-flex-test/mybatis-flex-native-test/src/main/java/com/mybatisflex/test/AccountMapper.java b/mybatis-flex-test/mybatis-flex-native-test/src/main/java/com/mybatisflex/test/AccountMapper.java
index 249d1300..1ea07b93 100644
--- a/mybatis-flex-test/mybatis-flex-native-test/src/main/java/com/mybatisflex/test/AccountMapper.java
+++ b/mybatis-flex-test/mybatis-flex-native-test/src/main/java/com/mybatisflex/test/AccountMapper.java
@@ -1,6 +1,4 @@
 package com.mybatisflex.test;
 
-import com.mybatisflex.core.BaseMapper;
-
-public interface AccountMapper extends BaseMapper<Account> {
+public interface AccountMapper extends MyBaseMapper<Account> {
 }
diff --git a/mybatis-flex-test/mybatis-flex-native-test/src/main/java/com/mybatisflex/test/BaseEntity.java b/mybatis-flex-test/mybatis-flex-native-test/src/main/java/com/mybatisflex/test/BaseEntity.java
new file mode 100644
index 00000000..0ced2518
--- /dev/null
+++ b/mybatis-flex-test/mybatis-flex-native-test/src/main/java/com/mybatisflex/test/BaseEntity.java
@@ -0,0 +1,4 @@
+package com.mybatisflex.test;
+
+public class BaseEntity {
+}
diff --git a/mybatis-flex-test/mybatis-flex-native-test/src/main/java/com/mybatisflex/test/EntityTestStarter.java b/mybatis-flex-test/mybatis-flex-native-test/src/main/java/com/mybatisflex/test/EntityTestStarter.java
index 75cc27f7..acdd32eb 100644
--- a/mybatis-flex-test/mybatis-flex-native-test/src/main/java/com/mybatisflex/test/EntityTestStarter.java
+++ b/mybatis-flex-test/mybatis-flex-native-test/src/main/java/com/mybatisflex/test/EntityTestStarter.java
@@ -52,9 +52,9 @@ public class EntityTestStarter {
 
 
         AccountMapper accountMapper = bootstrap.getMapper(AccountMapper.class);
-        MyAccountMapper myAccountMapper = bootstrap.getMapper(MyAccountMapper.class);
+//        MyAccountMapper myAccountMapper = bootstrap.getMapper(MyAccountMapper.class);
 
-        List<Account> accounts1 = myAccountMapper.selectAll();
+//        List<Account> accounts1 = myAccountMapper.selectAll();
 
 //        QueryWrapper wrapper = QueryWrapper.create().select().from(ACCOUNT)
 //                .and(ACCOUNT.ID.ge(100).and(ACCOUNT.ID.ge(200)))
diff --git a/mybatis-flex-test/mybatis-flex-native-test/src/main/java/com/mybatisflex/test/MultiDataSourceTester.java b/mybatis-flex-test/mybatis-flex-native-test/src/main/java/com/mybatisflex/test/MultiDataSourceTester.java
index 1a8e6658..29f9cb16 100644
--- a/mybatis-flex-test/mybatis-flex-native-test/src/main/java/com/mybatisflex/test/MultiDataSourceTester.java
+++ b/mybatis-flex-test/mybatis-flex-native-test/src/main/java/com/mybatisflex/test/MultiDataSourceTester.java
@@ -71,9 +71,9 @@ public class MultiDataSourceTester {
         System.out.println("tx: " + success);
         DataSourceKey.clear();
 
-        AccountMapper mapper = MybatisFlexBootstrap.getInstance().getMapper(AccountMapper.class);
-        List<Account> accounts = mapper.selectAll();
-        System.out.println(accounts);
+//        AccountMapper mapper = MybatisFlexBootstrap.getInstance().getMapper(AccountMapper.class);
+//        List<Account> accounts = mapper.selectAll();
+//        System.out.println(accounts);
 
     }
 }
diff --git a/mybatis-flex-test/mybatis-flex-native-test/src/main/java/com/mybatisflex/test/MyBaseMapper.java b/mybatis-flex-test/mybatis-flex-native-test/src/main/java/com/mybatisflex/test/MyBaseMapper.java
new file mode 100644
index 00000000..c3bbd859
--- /dev/null
+++ b/mybatis-flex-test/mybatis-flex-native-test/src/main/java/com/mybatisflex/test/MyBaseMapper.java
@@ -0,0 +1,6 @@
+package com.mybatisflex.test;
+
+import com.mybatisflex.core.BaseMapper;
+
+public interface MyBaseMapper<T extends BaseEntity> extends BaseMapper<T> {
+}