From cb9d90f3d69e2fdc6e0716ba193f201e300823b0 Mon Sep 17 00:00:00 2001
From: haoxr <1490493387@qq.com>
Date: Sun, 23 Apr 2023 23:09:13 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E5=8A=A8=E6=80=81?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=BA=90=E5=8D=95=E5=85=83=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/SysRoleServiceImpl.java      |  1 -
 .../service/impl/SysUserServiceImpl.java      |  3 --
 .../youlai/system/DynamicDataSourceTest.java  | 45 +++++++++++++++++++
 .../service/impl/SysUserServiceImplTest.java  | 32 -------------
 4 files changed, 45 insertions(+), 36 deletions(-)
 create mode 100644 src/test/java/com/youlai/system/DynamicDataSourceTest.java
 delete mode 100644 src/test/java/com/youlai/system/service/impl/SysUserServiceImplTest.java

diff --git a/src/main/java/com/youlai/system/service/impl/SysRoleServiceImpl.java b/src/main/java/com/youlai/system/service/impl/SysRoleServiceImpl.java
index b06c7047..7b499bbf 100644
--- a/src/main/java/com/youlai/system/service/impl/SysRoleServiceImpl.java
+++ b/src/main/java/com/youlai/system/service/impl/SysRoleServiceImpl.java
@@ -100,7 +100,6 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
      * @return
      */
     @Override
-    //@DS("slave")
     public boolean saveRole(RoleForm roleForm) {
 
         Long roleId = roleForm.getId();
diff --git a/src/main/java/com/youlai/system/service/impl/SysUserServiceImpl.java b/src/main/java/com/youlai/system/service/impl/SysUserServiceImpl.java
index bb565abb..7fdc2d0e 100644
--- a/src/main/java/com/youlai/system/service/impl/SysUserServiceImpl.java
+++ b/src/main/java/com/youlai/system/service/impl/SysUserServiceImpl.java
@@ -154,9 +154,6 @@ 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());
         }
diff --git a/src/test/java/com/youlai/system/DynamicDataSourceTest.java b/src/test/java/com/youlai/system/DynamicDataSourceTest.java
new file mode 100644
index 00000000..e3914552
--- /dev/null
+++ b/src/test/java/com/youlai/system/DynamicDataSourceTest.java
@@ -0,0 +1,45 @@
+package com.youlai.system;
+
+import cn.hutool.core.util.RandomUtil;
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.youlai.system.pojo.form.RoleForm;
+import com.youlai.system.pojo.form.UserForm;
+import com.youlai.system.service.SysRoleService;
+import com.youlai.system.service.SysUserService;
+import lombok.extern.slf4j.Slf4j;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.transaction.annotation.Transactional;
+
+@SpringBootTest
+@Slf4j
+class DynamicDataSourceTest {
+
+    @Autowired
+    private SysUserService userService;
+
+    @Autowired
+    private SysRoleService roleService;
+
+    private static Long userId = 3L; // 测试用户
+    private static Long roleId = 3L;
+
+    @Test
+    @Transactional
+    void updateUser() {
+        UserForm userForm = userService.getUserFormData(userId);
+        userForm.setNickname("测试用户_" + RandomUtil.randomString(RandomUtil.BASE_CHAR, 1));
+        userService.updateUser(userId, userForm);
+
+        this.updateRole();
+    }
+
+
+    @DS("slave")
+    void updateRole() {
+        RoleForm roleForm = roleService.getRoleForm(roleId);
+        roleForm.setName("访问游客_" + RandomUtil.randomString(RandomUtil.BASE_CHAR, 1));
+        roleService.saveRole(roleForm);
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/com/youlai/system/service/impl/SysUserServiceImplTest.java b/src/test/java/com/youlai/system/service/impl/SysUserServiceImplTest.java
deleted file mode 100644
index a4f7ef12..00000000
--- a/src/test/java/com/youlai/system/service/impl/SysUserServiceImplTest.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.youlai.system.service.impl;
-
-import cn.hutool.core.util.RandomUtil;
-import com.youlai.system.converter.UserConverter;
-import com.youlai.system.pojo.entity.SysUser;
-import com.youlai.system.pojo.form.UserForm;
-import com.youlai.system.service.SysUserService;
-import lombok.extern.slf4j.Slf4j;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-
-@SpringBootTest
-@Slf4j
-class SysUserServiceImplTest {
-
-    @Autowired
-    private SysUserService userService;
-    @Autowired
-    private UserConverter userConverter;
-
-    @Test
-    void updateUser() {
-        Long userId = 3L;
-        SysUser entity = userService.getById(userId);
-        UserForm userForm = userConverter.entity2Form(entity);
-        String nickname = "测试小用户_" + RandomUtil.randomString(RandomUtil.BASE_CHAR, 1);
-        userForm.setNickname(nickname);
-
-        userService.updateUser(userId, userForm);
-    }
-}
\ No newline at end of file