Merge branch 'master' into 1027-master

liusheng

9 天以前 0f22f66ae9d2156b983f533beb17a0062a949524

 ruoyi-admin/src/main/resources/mybatis/mybatis-config.xml

@@ -1,20 +1,25 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE configuration
PUBLIC "-//mybatis.org//DTD Config 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-config.dtd">
        PUBLIC "-//mybatis.org//DTD Config 3.0//EN"
        "http://mybatis.org/dtd/mybatis-3-config.dtd">
<configuration>
    <!-- 全局参数 -->
    <settings>
        <!-- 使全局的映射器启用或禁用缓存 -->
        <setting name="cacheEnabled"             value="true"   />
        <setting name="cacheEnabled" value="true"/>
        <!-- 允许JDBC 支持自动生成主键 -->
        <setting name="useGeneratedKeys"         value="true"   />
        <setting name="useGeneratedKeys" value="true"/>
        <!-- 配置默认的执行器.SIMPLE就是普通执行器;REUSE执行器会重用预处理语句(prepared statements);BATCH执行器将重用语句并执行批量更新 -->
        <setting name="defaultExecutorType"      value="SIMPLE" />
      <!-- 指定 MyBatis 所用日志的具体实现 -->
        <setting name="logImpl"                  value="SLF4J"  />
        <setting name="defaultExecutorType" value="SIMPLE"/>
        <!-- 指定 MyBatis 所用日志的具体实现 -->
        <setting name="logImpl" value="STDOUT_LOGGING"/>
        <!-- 使用驼峰命名法转换字段 -->
      <!-- <setting name="mapUnderscoreToCamelCase" value="true"/> -->
   </settings>
	
        <!-- <setting name="mapUnderscoreToCamelCase" value="true"/> -->
    </settings>

    <plugins>
        <!-- SQL转换拦截器 -->
        <plugin interceptor="com.ruoyi.common.mybatis.SqlConverterInterceptor"/>
    </plugins>

</configuration>