tongtong/youlai-boot
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 新增@Transaction和@DS同时使用导致无法动态切换数据源单元测试

Browse Source
This commit is contained in:
郝先瑞
2023-04-23 07:48:09 +08:00
parent 71835c9217
commit fe4809c256
3 changed files with 39 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/youlai/system/service/impl/SysRoleServiceImpl.java
View File

@@ -3,6 +3,7 @@ package com.youlai.system.service.impl;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.StrUtil;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -99,6 +100,7 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
* @return
*/
@Override
//@DS("slave")
public boolean saveRole(RoleForm roleForm) {
Long roleId = roleForm.getId();

5
src/main/java/com/youlai/system/service/impl/SysUserServiceImpl.java
View File

@@ -2,6 +2,7 @@ package com.youlai.system.service.impl;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.RandomUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -16,6 +17,7 @@ import com.youlai.system.pojo.bo.UserAuthInfo;
import com.youlai.system.pojo.bo.UserBO;
import com.youlai.system.pojo.bo.UserFormBO;
import com.youlai.system.pojo.entity.SysUser;
import com.youlai.system.pojo.form.RoleForm;
import com.youlai.system.pojo.form.UserForm;
import com.youlai.system.pojo.query.UserPageQuery;
import com.youlai.system.pojo.vo.UserExportVO;
@@ -152,6 +154,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
boolean result = this.updateById(entity);
if (result) {
/* RoleForm roleForm = roleService.getRoleForm(12l);
roleForm.setName("测试角色_" + RandomUtil.randomString(RandomUtil.BASE_CHAR, 1));
roleService.saveRole(roleForm);*/
// 保存用户角色
userRoleService.saveUserRoles(entity.getId(), userForm.getRoleIds());
}