From b3e9cb6208f8cea9bad42e3e3f49e288a479b90e Mon Sep 17 00:00:00 2001 From: wangxy <1356089412@qq.com> Date: Wed, 5 Jun 2024 15:20:03 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E8=87=AA=E5=AE=9A=E4=B9=89sql=E4=B8=AD?= =?UTF-8?q?=E8=A1=A8=E5=90=8D=E5=B8=A6=E5=89=8D=E7=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application.yml | 10 +- .../ruoyi/framework/config/MyBatisConfig.java | 134 ------------------ .../framework/config/MybatisPlusConfig.java | 65 +++++++++ .../mapper/system/SysConfigMapper.xml | 10 +- .../resources/mapper/system/SysDeptMapper.xml | 20 +-- .../resources/mapper/system/SysPostMapper.xml | 14 +- .../resources/mapper/system/SysRoleMapper.xml | 10 +- .../resources/mapper/system/SysUserMapper.xml | 48 +++---- .../mapper/system/SysUserPostMapper.xml | 8 +- .../mapper/system/TdFileReceiveMapper.xml | 10 +- 10 files changed, 133 insertions(+), 196 deletions(-) delete mode 100644 ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/framework/config/MybatisPlusConfig.java diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 393953b..7b3f1cd 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -73,14 +73,20 @@ spring: # 热部署开关 enabled: true -# MyBatis -mybatis: +# MyBatis Plus配置 +mybatis-plus: # 搜索指定包别名 typeAliasesPackage: com.ruoyi.**.domain # 配置mapper的扫描，找到所有的mapper.xml映射文件 mapperLocations: classpath*:mapper/**/*Mapper.xml # 加载全局的配置文件 configLocation: classpath:mybatis/mybatis-config.xml + global-config: + db-config: + # 表名前缀 + table-prefix: zhky."public". + configuration-properties: + prefix: zhky."public". # 自定义sql中表名带前缀 # PageHelper分页插件 pagehelper: diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java deleted file mode 100644 index 5cd1b7f..0000000 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java +++ /dev/null @@ -1,134 +0,0 @@ -package com.ruoyi.framework.config; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashSet; -import java.util.List; -import javax.sql.DataSource; - -import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean; -import org.apache.ibatis.io.VFS; -import org.apache.ibatis.session.SqlSessionFactory; -import org.mybatis.spring.SqlSessionFactoryBean; -import org.mybatis.spring.boot.autoconfigure.SpringBootVFS; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.core.env.Environment; -import org.springframework.core.io.DefaultResourceLoader; -import org.springframework.core.io.Resource; -import org.springframework.core.io.support.PathMatchingResourcePatternResolver; -import org.springframework.core.io.support.ResourcePatternResolver; -import org.springframework.core.type.classreading.CachingMetadataReaderFactory; -import org.springframework.core.type.classreading.MetadataReader; -import org.springframework.core.type.classreading.MetadataReaderFactory; -import org.springframework.util.ClassUtils; -import com.ruoyi.common.utils.StringUtils; - -/** - * Mybatis支持*匹配扫描包 - * - * @author ruoyi - */ -@Configuration -public class MyBatisConfig -{ - @Autowired - private Environment env; - - static final String DEFAULT_RESOURCE_PATTERN = "**/*.class"; - - public static String setTypeAliasesPackage(String typeAliasesPackage) - { - ResourcePatternResolver resolver = (ResourcePatternResolver) new PathMatchingResourcePatternResolver(); - MetadataReaderFactory metadataReaderFactory = new CachingMetadataReaderFactory(resolver); - List allResult = new ArrayList(); - try - { - for (String aliasesPackage : typeAliasesPackage.split(",")) - { - List result = new ArrayList(); - aliasesPackage = ResourcePatternResolver.CLASSPATH_ALL_URL_PREFIX - + ClassUtils.convertClassNameToResourcePath(aliasesPackage.trim()) + "/" + DEFAULT_RESOURCE_PATTERN; - Resource[] resources = resolver.getResources(aliasesPackage); - if (resources != null && resources.length > 0) - { - MetadataReader metadataReader = null; - for (Resource resource : resources) - { - if (resource.isReadable()) - { - metadataReader = metadataReaderFactory.getMetadataReader(resource); - try - { - result.add(Class.forName(metadataReader.getClassMetadata().getClassName()).getPackage().getName()); - } - catch (ClassNotFoundException e) - { - e.printStackTrace(); - } - } - } - } - if (result.size() > 0) - { - HashSet hashResult = new HashSet(result); - allResult.addAll(hashResult); - } - } - if (allResult.size() > 0) - { - typeAliasesPackage = String.join(",", (String[]) allResult.toArray(new String[0])); - } - else - { - throw new RuntimeException("mybatis typeAliasesPackage 路径扫描错误,参数typeAliasesPackage:" + typeAliasesPackage + "未找到任何包"); - } - } - catch (IOException e) - { - e.printStackTrace(); - } - return typeAliasesPackage; - } - - public Resource[] resolveMapperLocations(String[] mapperLocations) - { - ResourcePatternResolver resourceResolver = new PathMatchingResourcePatternResolver(); - List resources = new ArrayList(); - if (mapperLocations != null) - { - for (String mapperLocation : mapperLocations) - { - try - { - Resource[] mappers = resourceResolver.getResources(mapperLocation); - resources.addAll(Arrays.asList(mappers)); - } - catch (IOException e) - { - // ignore - } - } - } - return resources.toArray(new Resource[resources.size()]); - } - - @Bean - public SqlSessionFactory sqlSessionFactory(DataSource dataSource) throws Exception - { - String typeAliasesPackage = env.getProperty("mybatis.typeAliasesPackage"); - String mapperLocations = env.getProperty("mybatis.mapperLocations"); - String configLocation = env.getProperty("mybatis.configLocation"); - typeAliasesPackage = setTypeAliasesPackage(typeAliasesPackage); - VFS.addImplClass(SpringBootVFS.class); - - final MybatisSqlSessionFactoryBean sessionFactory = new MybatisSqlSessionFactoryBean(); - sessionFactory.setDataSource(dataSource); - sessionFactory.setTypeAliasesPackage(typeAliasesPackage); - sessionFactory.setMapperLocations(resolveMapperLocations(StringUtils.split(mapperLocations, ","))); - sessionFactory.setConfigLocation(new DefaultResourceLoader().getResource(configLocation)); - return sessionFactory.getObject(); - } -} \ No newline at end of file diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MybatisPlusConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MybatisPlusConfig.java new file mode 100644 index 0000000..5b0a17d --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MybatisPlusConfig.java @@ -0,0 +1,65 @@ +package com.ruoyi.framework.config; + +import org.springframework.context.annotation.Configuration; +import org.springframework.transaction.annotation.EnableTransactionManagement; +import com.baomidou.mybatisplus.annotation.DbType; +import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; +import com.baomidou.mybatisplus.extension.plugins.inner.BlockAttackInnerInterceptor; +import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInterceptor; +import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; +import org.springframework.context.annotation.Bean; +/** + * packageName com.ruoyi.framework.config + * + * @author wangxy + * @version JDK 8 + * @className MybatisPlusConfig + * @date 2024/6/5 + * @description + */ +@EnableTransactionManagement(proxyTargetClass = true) +@Configuration +public class MybatisPlusConfig { + + @Bean + public MybatisPlusInterceptor mybatisPlusInterceptor() + { + MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor(); + // 分页插件 + interceptor.addInnerInterceptor(paginationInnerInterceptor()); + // 乐观锁插件 + interceptor.addInnerInterceptor(optimisticLockerInnerInterceptor()); + // 阻断插件 + interceptor.addInnerInterceptor(blockAttackInnerInterceptor()); + return interceptor; + } + + /** + * 分页插件，自动识别数据库类型 https://baomidou.com/guide/interceptor-pagination.html + */ + public PaginationInnerInterceptor paginationInnerInterceptor() + { + PaginationInnerInterceptor paginationInnerInterceptor = new PaginationInnerInterceptor(); + // 设置数据库类型为mysql + paginationInnerInterceptor.setDbType(DbType.MYSQL); + // 设置最大单页限制数量，默认 500 条，-1 不受限制 + paginationInnerInterceptor.setMaxLimit(-1L); + return paginationInnerInterceptor; + } + + /** + * 乐观锁插件 https://baomidou.com/guide/interceptor-optimistic-locker.html + */ + public OptimisticLockerInnerInterceptor optimisticLockerInnerInterceptor() + { + return new OptimisticLockerInnerInterceptor(); + } + + /** + * 如果是对全表的删除或更新操作，就会终止该操作 https://baomidou.com/guide/interceptor-block-attack.html + */ + public BlockAttackInnerInterceptor blockAttackInnerInterceptor() + { + return new BlockAttackInnerInterceptor(); + } +} diff --git a/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml index d09ef9e..5465191 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml @@ -18,7 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select config_id, config_name, config_key, config_value, config_type, create_by, create_time, update_by, update_time, remark - from zhky."public".sys_config + from ${prefix}sys_config @@ -70,7 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - insert into zhky."public".sys_config ( + insert into ${prefix}sys_config ( config_name, config_key, config_value, @@ -90,7 +90,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update zhky."public".sys_config + update ${prefix}sys_config config_name = #{configName}, config_key = #{configKey}, @@ -104,11 +104,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from zhky."public".sys_config where config_id = #{configId} + delete from ${prefix}sys_config where config_id = #{configId} - delete from zhky."public".sys_config where config_id in + delete from ${prefix}sys_config where config_id in #{configId} diff --git a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml index ac10a6e..818be86 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml @@ -64,11 +64,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select d.dept_id, d.parent_id, d.ancestors, d.dept_name,d.framework,d.area, d.order_num, d.leader, d.phone, d.email, d.status, - (select dept_name from zhky."public".sys_dept where dept_id = d.parent_id) parent_name + (select dept_name from ${prefix}sys_dept where dept_id = d.parent_id) parent_name from sys_dept d where d.dept_id = #{deptId} - insert into sys_dept( + insert into ${prefix}sys_dept( dept_id, parent_id, dept_name, @@ -127,7 +127,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update sys_dept + update ${prefix}sys_dept parent_id = #{parentId}, dept_name = #{deptName}, @@ -146,7 +146,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update sys_dept set ancestors = + update ${prefix}sys_dept set ancestors = when #{item.deptId} then #{item.ancestors} @@ -159,11 +159,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update sys_dept set del_flag = '2' where dept_id = #{deptId} + update ${prefix}sys_dept set del_flag = '2' where dept_id = #{deptId} - update sys_dept set status = '0' where dept_id in + update ${prefix}sys_dept set status = '0' where dept_id in #{deptId} diff --git a/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml index eb977b4..ca2fb49 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml @@ -19,7 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select post_id, post_code, post_name, post_sort, status, create_by, create_time, remark - from zhky."public".sys_post + from ${prefix}sys_post SELECT p.post_id, p.post_name, p.post_code - FROM zhky."public".sys_user u - LEFT JOIN zhky."public".sys_user_post up ON u.user_id = up.user_id - LEFT JOIN zhky."public".sys_post p ON up.post_id = p.post_id + FROM ${prefix}sys_user u + LEFT JOIN ${prefix}sys_user_post up ON u.user_id = up.user_id + LEFT JOIN ${prefix}sys_post p ON up.post_id = p.post_id WHERE up.user_id = #{userId} @@ -65,14 +65,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from zhky."public".sys_post where post_id in + delete from ${prefix}sys_post where post_id in #{postId} - update zhky."public".sys_post + update ${prefix}sys_post post_code = #{postCode}, post_name = #{postName}, @@ -86,7 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - insert into zhky."public".sys_post( + insert into ${prefix}sys_post( post_id, post_code, post_name, diff --git a/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml index 2668b52..764be6a 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml @@ -22,15 +22,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select distinct r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status, r.del_flag, r.create_time, r.remark - from zhky."public".sys_role r - left join zhky."public".sys_user_role ur on ur.role_id = r.role_id - left join zhky."public".sys_user u on u.user_id = ur.user_id - left join zhky."public".sys_dept d on u.dept_id = d.dept_id + from ${prefix}sys_role r + left join ${prefix}sys_user_role ur on ur.role_id = r.role_id + left join ${prefix}sys_user u on u.user_id = ur.user_id + left join ${prefix}sys_dept d on u.dept_id = d.dept_id select r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status, r.del_flag, r.create_time, r.remark - from zhky."public".sys_role r + from ${prefix}sys_role r - select u.user_id, u.dept_id, u.login_name, u.user_name, u.user_type, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.salt, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, userarea, nation, birthday, politics, shemichengdu, graduate, startdate, enddate, helthy,examine,examineuser,examinedate,d.dept_name, d.leader from zhky."public".sys_user u - left join zhky."public".sys_dept d on u.dept_id = d.dept_id + select u.user_id, u.dept_id, u.login_name, u.user_name, u.user_type, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.salt, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, userarea, nation, birthday, politics, shemichengdu, graduate, startdate, enddate, helthy,examine,examineuser,examinedate,d.dept_name, d.leader from ${prefix}sys_user u + left join ${prefix}sys_dept d on u.dept_id = d.dept_id where u.del_flag = '0' AND u.user_id = #{userId} @@ -107,10 +107,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select distinct u.user_id, u.dept_id, u.login_name, u.user_name, u.user_type, u.email, u.avatar, u.phonenumber, u.status, u.create_time,userarea, nation, birthday, politics, shemichengdu, graduate, startdate, enddate, helthy,examine,examineuser,examinedate - from zhky."public".sys_user u - left join zhky."public".sys_dept d on u.dept_id = d.dept_id - left join zhky."public".sys_user_role ur on u.user_id = ur.user_id - left join zhky."public".sys_role r on r.role_id = ur.role_id + from ${prefix}sys_user u + left join ${prefix}sys_dept d on u.dept_id = d.dept_id + left join ${prefix}sys_user_role ur on u.user_id = ur.user_id + left join ${prefix}sys_role r on r.role_id = ur.role_id where u.del_flag = '0' and (r.role_id != #{roleId} or r.role_id IS NULL) - and u.user_id not in (select u.user_id from zhky."public".sys_user u inner join zhky."public".sys_user_role ur on u.user_id = ur.user_id and ur.role_id = #{roleId}) + and u.user_id not in (select u.user_id from ${prefix}sys_user u inner join ${prefix}sys_user_role ur on u.user_id = ur.user_id and ur.role_id = #{roleId}) AND u.login_name like concat('%', #{loginName}, '%') @@ -147,8 +147,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -164,15 +164,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update zhky."public".sys_user set del_flag = '2' where user_id = #{userId} + update ${prefix}sys_user set del_flag = '2' where user_id = #{userId} - update zhky."public".sys_user set del_flag = '2' where user_id in + update ${prefix}sys_user set del_flag = '2' where user_id in #{userId} - update zhky."public".sys_user + update ${prefix}sys_user dept_id = #{deptId}, login_name = #{loginName}, @@ -226,7 +226,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - insert into zhky."public".sys_user( + insert into ${prefix}sys_user( user_id, dept_id, login_name, diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml index 03c9b9a..8921c46 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml @@ -10,22 +10,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from zhky."public".sys_user_post where user_id=#{userId} + delete from ${prefix}sys_user_post where user_id=#{userId} - delete from zhky."public".sys_user_post where user_id in + delete from ${prefix}sys_user_post where user_id in #{userId} - insert into zhky."public".sys_user_post(user_id, post_id) values + insert into ${prefix}sys_user_post(user_id, post_id) values (#{item.userId},#{item.postId}) diff --git a/ruoyi-system/src/main/resources/mapper/system/TdFileReceiveMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TdFileReceiveMapper.xml index 6cc9440..ebe345e 100644 --- a/ruoyi-system/src/main/resources/mapper/system/TdFileReceiveMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/TdFileReceiveMapper.xml @@ -29,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select receive_id, file_id, file_name, provide_depart, provide_date, receive_departid, receive_state, receive_userid, receive_date, extract_state, extract_departid, extract_userid, extract_date, destory_state,destory_address, destory_depart, destory_username, destory_style, destory_count, destory_date, remark from zhky."public".td_file_receive + select receive_id, file_id, file_name, provide_depart, provide_date, receive_departid, receive_state, receive_userid, receive_date, extract_state, extract_departid, extract_userid, extract_date, destory_state,destory_address, destory_depart, destory_username, destory_style, destory_count, destory_date, remark from ${prefix}td_file_receive - insert into zhky."public".td_file_receive + insert into ${prefix}td_file_receive file_id, file_name, @@ -123,7 +123,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update zhky."public".td_file_receive + update ${prefix}td_file_receive file_id = #{fileId}, file_name = #{fileName}, @@ -150,11 +150,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from zhky."public".td_file_receive where receive_id = #{receiveId} + delete from ${prefix}td_file_receive where receive_id = #{receiveId} - delete from zhky."public".td_file_receive where receive_id in + delete from ${prefix}td_file_receive where receive_id in #{receiveId}