Browse Source

:art: 清理部分警告

Cat73 6 years ago
parent
commit
438d0cc5ba

+ 2 - 3
mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/spring/MybatisSqlSessionFactoryBean.java

@@ -16,7 +16,6 @@
 package com.baomidou.mybatisplus.extension.spring;
 
 import com.baomidou.mybatisplus.annotation.DbType;
-import com.baomidou.mybatisplus.annotation.EnumValue;
 import com.baomidou.mybatisplus.core.MybatisConfiguration;
 import com.baomidou.mybatisplus.core.MybatisXMLConfigBuilder;
 import com.baomidou.mybatisplus.core.config.GlobalConfig;
@@ -616,8 +615,8 @@ public class MybatisSqlSessionFactoryBean implements FactoryBean<SqlSessionFacto
         globalConfig.signGlobalConfig(sqlSessionFactory);
 
         if (!isEmpty(this.mapperLocations)) {
-            if (globalConfig.isRefresh()) {
-                //TODO 设置自动刷新配置 减少配置
+            if (GlobalConfigUtils.isRefresh(configuration)) {
+                // TODO 设置自动刷新配置 减少配置
                 new MybatisMapperRefresh(this.mapperLocations, sqlSessionFactory, 2,
                     2, true);
             }

+ 1 - 1
mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/engine/FreemarkerTemplateEngine.java

@@ -38,7 +38,7 @@ public class FreemarkerTemplateEngine extends AbstractTemplateEngine {
     @Override
     public FreemarkerTemplateEngine init(ConfigBuilder configBuilder) {
         super.init(configBuilder);
-        configuration = new Configuration();
+        configuration = new Configuration(Configuration.VERSION_2_3_28);
         configuration.setDefaultEncoding(ConstVal.UTF8);
         configuration.setClassForTemplateLoading(FreemarkerTemplateEngine.class, StringPool.SLASH);
         return this;

+ 1 - 1
mybatis-plus-generator/src/test/java/com/baomidou/mybatisplus/test/generator/CodeGeneratorTest.java

@@ -87,7 +87,7 @@ class CodeGeneratorTest {
             // .setDbColumnUnderline(true) 改为如下 2 个配置
             .setNaming(NamingStrategy.underline_to_camel)
             .setColumnNaming(NamingStrategy.underline_to_camel)
-            .entityTableFieldAnnotationEnable(enableTableFieldAnnotation)
+            .setEntityTableFieldAnnotationEnable(enableTableFieldAnnotation)
             .setFieldPrefix(fieldPrefix)//test_id -> id, test_type -> type
             .setInclude(tableNames);//修改替换成你需要的表名,多个表名传数组
         config.setActiveRecord(false)

+ 1 - 1
mybatis-plus-generator/src/test/java/com/baomidou/mybatisplus/test/generator/CodeGeneratorWithTemplateTest.java

@@ -63,7 +63,7 @@ class CodeGeneratorWithTemplateTest {
             // .setDbColumnUnderline(true) 改为如下 2 个配置
             .setNaming(NamingStrategy.underline_to_camel)
             .setColumnNaming(NamingStrategy.underline_to_camel)
-            .entityTableFieldAnnotationEnable(enableTableFieldAnnotation)
+            .setEntityTableFieldAnnotationEnable(enableTableFieldAnnotation)
             .setFieldPrefix(fieldPrefix)//test_id -> id, test_type -> type
             .setInclude(tableNames);//修改替换成你需要的表名,多个表名传数组
         config.setActiveRecord(false)

+ 1 - 1
mybatis-plus-generator/src/test/java/com/baomidou/mybatisplus/test/generator/DB2Generator.java

@@ -32,7 +32,7 @@ public class DB2Generator {
             // .setDbColumnUnderline(true) 改为如下 2 个配置
             .setNaming(NamingStrategy.underline_to_camel)
             .setColumnNaming(NamingStrategy.underline_to_camel)
-            .entityTableFieldAnnotationEnable(true)//实体属性上添加表字段映射
+            .setEntityTableFieldAnnotationEnable(true)//实体属性上添加表字段映射
             .setInclude(tableNames);//修改替换成你需要的表名,多个表名传数组
         config.setActiveRecord(true)
             .setEnableCache(false)// XML 二级缓存

+ 1 - 1
mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/GenerateCode4H2Database.java

@@ -47,7 +47,7 @@ class GenerateCode4H2Database extends BaseTest{
             // .setDbColumnUnderline(true) 改为如下 2 个配置
             .setNaming(NamingStrategy.underline_to_camel)
             .setColumnNaming(NamingStrategy.underline_to_camel)
-            .entityTableFieldAnnotationEnable(enableTableFieldAnnotation)
+            .setEntityTableFieldAnnotationEnable(enableTableFieldAnnotation)
             .setInclude(tableNames);//修改替换成你需要的表名,多个表名传数组
         config.setActiveRecord(false)
             .setAuthor("K神带你飞")