Commit 95159b02579a4964ff40d17783cdc8340bb6d054

Authored by wangzhs
1 parent 7e0fb6cb

调整Mybaits Plus Join的SQL注入器到YudaoMybatisAutoConfiguration

yudao-framework/yudao-spring-boot-starter-test/src/main/java/cn/iocoder/yudao/framework/test/core/ut/BaseDbUnitTest.java
1 1 package cn.iocoder.yudao.framework.test.core.ut;
2 2  
3 3 import cn.iocoder.yudao.framework.datasource.config.YudaoDataSourceAutoConfiguration;
4   -import cn.iocoder.yudao.framework.mybatis.config.MybatisPlusJoinConfiguration;
5 4 import cn.iocoder.yudao.framework.mybatis.config.YudaoMybatisAutoConfiguration;
6 5 import cn.iocoder.yudao.framework.test.config.SqlInitializationTestConfiguration;
7 6 import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure;
... ... @@ -37,7 +36,6 @@ public class BaseDbUnitTest {
37 36 // MyBatis 配置类
38 37 YudaoMybatisAutoConfiguration.class, // 自己的 MyBatis 配置类
39 38 MybatisPlusAutoConfiguration.class, // MyBatis 的自动配置类
40   - MybatisPlusJoinConfiguration.class, // MyBatis 的自动配置类
41 39 // TODO @升平:看看有没可能去掉下面两个类
42 40 JoinInterceptor.class, // MyBatis 的Join配置类
43 41 JoinInterceptorConfig.class, // MyBatis 的Join配置类
... ...
yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImplTest.java
... ... @@ -776,7 +776,7 @@ public class AdminUserServiceImplTest extends BaseDbUnitTest {
776 776  
777 777 @Test
778 778 public void testSelectUserIncludeDept_success() {
779   - // 需设置 application-unit-test.yaml 文件中 spring.main.lazy-initialization: true
  779 + // 需设置 application-unit-test.yaml 文件中 spring.main.lazy-initialization: false
780 780  
781 781 // 准备部门数据
782 782 DeptDO dept = new DeptDO();
... ... @@ -798,6 +798,7 @@ public class AdminUserServiceImplTest extends BaseDbUnitTest {
798 798 // 断言
799 799 AdminUserDO user = Joins.of(AdminUserDO.class)
800 800 .leftJoin(DeptDO.class, DeptDO::getId, AdminUserDO::getDeptId)
  801 + .oneToOneSelect(AdminUserDO::getDept, DeptDO.class)
801 802 .end()
802 803 .eq(AdminUserDO::getId, userId)
803 804 .joinGetOne(AdminUserDO.class);
... ...