v1.0.0 prepare

mybatis-flex-annotation/src/main/java/com/mybatisflex/annotation/Id.java

@@ -15,8 +15,6 @@
  */
 package com.mybatisflex.annotation;
 
-import com.mybatisflex.core.enums.KeyType;
-
 import java.lang.annotation.*;
 
 @Inherited

mybatis-flex-annotation/src/main/java/com/mybatisflex/annotation/KeyType.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.mybatisflex.core.enums;
+package com.mybatisflex.annotation;
 
 /**
  * ID 生成策略

mybatis-flex-annotation/src/main/java/com/mybatisflex/annotation/Table.java

@@ -32,11 +32,6 @@ public @interface Table {
      */
     String schema() default "";
 
-    /**
-     * 是否使用 mybatis 缓存
-     */
-    boolean useCached() default false;
-
     /**
      * 默认为 驼峰属性 转换为 下划线字段
      */

mybatis-flex-core/src/main/java/com/mybatisflex/core/FlexGlobalConfig.java

@@ -16,7 +16,7 @@
 package com.mybatisflex.core;
 
 import com.mybatisflex.core.dialect.DbType;
-import com.mybatisflex.core.enums.KeyType;
+import com.mybatisflex.annotation.KeyType;
 import org.apache.ibatis.session.Configuration;
 import org.apache.ibatis.session.SqlSessionFactory;
 

mybatis-flex-core/src/main/java/com/mybatisflex/core/key/CustomKeyGenerator.java

@@ -15,6 +15,7 @@
  */
 package com.mybatisflex.core.key;
 
+import com.mybatisflex.annotation.KeyType;
 import com.mybatisflex.core.FlexConsts;
 import com.mybatisflex.core.FlexGlobalConfig;
 import com.mybatisflex.core.exception.FlexExceptions;
@@ -33,7 +34,7 @@ import java.util.Map;
 /**
  * 通过 java 编码的方式生成主键
  * 当主键类型配置为 KeyType#Generator 时，使用此生成器生成
- * {@link com.mybatisflex.core.enums.KeyType#Generator}
+ * {@link KeyType#Generator}
  */
 public class CustomKeyGenerator implements KeyGenerator {
 

mybatis-flex-core/src/main/java/com/mybatisflex/core/key/MybatisKeyGeneratorUtil.java

@@ -17,7 +17,7 @@ package com.mybatisflex.core.key;
 
 import com.mybatisflex.core.FlexConsts;
 import com.mybatisflex.core.FlexGlobalConfig;
-import com.mybatisflex.core.enums.KeyType;
+import com.mybatisflex.annotation.KeyType;
 import com.mybatisflex.core.exception.FlexExceptions;
 import com.mybatisflex.core.table.IdInfo;
 import com.mybatisflex.core.table.TableInfo;

mybatis-flex-core/src/main/java/com/mybatisflex/core/key/RowCustomKeyGenerator.java

@@ -15,6 +15,7 @@
  */
 package com.mybatisflex.core.key;
 
+import com.mybatisflex.annotation.KeyType;
 import com.mybatisflex.core.FlexConsts;
 import com.mybatisflex.core.exception.FlexExceptions;
 import com.mybatisflex.core.row.Row;
@@ -29,7 +30,7 @@ import java.util.Map;
 /**
  * 通过 java 编码的方式生成主键
  * 当主键类型配置为 KeyType#Generator 时，使用此生成器生成
- * {@link com.mybatisflex.core.enums.KeyType#Generator}
+ * {@link KeyType#Generator}
  */
 public class RowCustomKeyGenerator implements KeyGenerator {
 

mybatis-flex-core/src/main/java/com/mybatisflex/core/key/RowKeyGenerator.java

@@ -16,7 +16,7 @@
 package com.mybatisflex.core.key;
 
 import com.mybatisflex.core.FlexConsts;
-import com.mybatisflex.core.enums.KeyType;
+import com.mybatisflex.annotation.KeyType;
 import com.mybatisflex.core.row.Row;
 import com.mybatisflex.core.row.RowKey;
 import com.mybatisflex.core.util.ArrayUtil;

mybatis-flex-core/src/main/java/com/mybatisflex/core/mybatis/FlexConfiguration.java

@@ -47,12 +47,10 @@ public class FlexConfiguration extends Configuration {
     public FlexConfiguration(Environment environment) {
         super(environment);
         setMapUnderscoreToCamelCase(true);
-//        setLogImpl(StdOutImpl.class);
         initDefaultMappers();
     }
 
     public FlexConfiguration() {
-//        setLogImpl(StdOutImpl.class);
         initDefaultMappers();
     }
 
@@ -93,7 +91,6 @@ public class FlexConfiguration extends Configuration {
     }
 
 
-
     @Override
     public void addMappedStatement(MappedStatement ms) {
         //替换 RowMapper.insertRow 的主键生成器

mybatis-flex-core/src/main/java/com/mybatisflex/core/row/RowKey.java

@@ -15,7 +15,7 @@
  */
 package com.mybatisflex.core.row;
 
-import com.mybatisflex.core.enums.KeyType;
+import com.mybatisflex.annotation.KeyType;
 import com.mybatisflex.core.util.SqlUtil;
 
 /**

mybatis-flex-core/src/main/java/com/mybatisflex/core/table/IdInfo.java

@@ -16,7 +16,7 @@
 package com.mybatisflex.core.table;
 
 import com.mybatisflex.annotation.Id;
-import com.mybatisflex.core.enums.KeyType;
+import com.mybatisflex.annotation.KeyType;
 
 public class IdInfo extends ColumnInfo {
 

mybatis-flex-core/src/main/java/com/mybatisflex/core/table/TableInfo.java

@@ -16,7 +16,7 @@
 package com.mybatisflex.core.table;
 
 import com.mybatisflex.core.FlexConsts;
-import com.mybatisflex.core.enums.KeyType;
+import com.mybatisflex.annotation.KeyType;
 import com.mybatisflex.core.javassist.ModifyAttrsRecord;
 import com.mybatisflex.core.row.Row;
 import com.mybatisflex.core.util.ArrayUtil;
@@ -38,7 +38,6 @@ public class TableInfo {
     private String schema; //schema
     private String tableName; //表名
     private Class<?> entityClass; //实体类
-    private boolean useCached = false;
     private boolean camelToUnderline = true;
 
     //逻辑删除数据库列名
@@ -105,14 +104,6 @@ public class TableInfo {
         this.entityClass = entityClass;
     }
 
-    public boolean isUseCached() {
-        return useCached;
-    }
-
-    public void setUseCached(boolean useCached) {
-        this.useCached = useCached;
-    }
-
     public boolean isCamelToUnderline() {
         return camelToUnderline;
     }

mybatis-flex-core/src/main/java/com/mybatisflex/core/table/TableInfos.java

@@ -95,7 +95,6 @@ public class TableInfos {
         if (table != null) {
             tableInfo.setTableName(table.value());
             tableInfo.setSchema(table.schema());
-            tableInfo.setUseCached(table.useCached());
             tableInfo.setCamelToUnderline(table.camelToUnderline());
         } else {
             //默认为类名转驼峰下划线

mybatis-flex-core/src/test/java/com/mybatisflex/test/Article.java

@@ -3,7 +3,7 @@ package com.mybatisflex.test;
 import com.mybatisflex.annotation.Column;
 import com.mybatisflex.annotation.Id;
 import com.mybatisflex.annotation.Table;
-import com.mybatisflex.core.enums.KeyType;
+import com.mybatisflex.annotation.KeyType;
 
 import java.util.Date;
 

mybatis-flex-test/mybatis-flex-native-test/src/main/java/com/mybatisflex/test/Account.java

@@ -2,7 +2,7 @@ package com.mybatisflex.test;
 
 import com.mybatisflex.annotation.Id;
 import com.mybatisflex.annotation.Table;
-import com.mybatisflex.core.enums.KeyType;
+import com.mybatisflex.annotation.KeyType;
 
 import java.util.Date;
 

mybatis-flex-test/mybatis-flex-spring-boot-test/src/main/java/com/mybatisflex/test/model/Account.java

@@ -17,7 +17,7 @@ package com.mybatisflex.test.model;
 
 import com.mybatisflex.annotation.Id;
 import com.mybatisflex.annotation.Table;
-import com.mybatisflex.core.enums.KeyType;
+import com.mybatisflex.annotation.KeyType;
 
 import java.util.Date;