From 95436855c1ef0e881d272a6185669d8da83901bf Mon Sep 17 00:00:00 2001 From: Mark Date: Sun, 17 Feb 2019 18:03:54 +0800 Subject: [PATCH] v4.0.0 --- .../java/io/renren/DynamicDataSourceTest.java | 2 +- .../service/DynamicDataSourceTestService.java | 23 ++++++++----------- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/renren-admin/src/test/java/io/renren/DynamicDataSourceTest.java b/renren-admin/src/test/java/io/renren/DynamicDataSourceTest.java index 2139a668..2038be57 100644 --- a/renren-admin/src/test/java/io/renren/DynamicDataSourceTest.java +++ b/renren-admin/src/test/java/io/renren/DynamicDataSourceTest.java @@ -32,7 +32,7 @@ public void test(){ dynamicDataSourceTestService.updateUser(id); dynamicDataSourceTestService.updateUserBySlave1(id); - //dynamicDataSourceTestService.updateUserBySlave2(id); + dynamicDataSourceTestService.updateUserBySlave2(id); } } diff --git a/renren-admin/src/test/java/io/renren/service/DynamicDataSourceTestService.java b/renren-admin/src/test/java/io/renren/service/DynamicDataSourceTestService.java index 267deb7e..de10a1cd 100644 --- a/renren-admin/src/test/java/io/renren/service/DynamicDataSourceTestService.java +++ b/renren-admin/src/test/java/io/renren/service/DynamicDataSourceTestService.java @@ -41,20 +41,17 @@ public void updateUserBySlave1(Long id){ user.setUserId(id); user.setMobile("13500000001"); sysUserDao.updateById(user); + } + + @DataSource("slave2") + @Transactional + public void updateUserBySlave2(Long id){ + SysUserEntity user = new SysUserEntity(); + user.setUserId(id); + user.setMobile("13500000002"); + sysUserDao.updateById(user); //测试事物 - //int i = 1/0; + int i = 1/0; } - -// @DataSource("slave2") -// @Transactional -// public void updateUserBySlave2(Long id){ -// SysUserEntity user = new SysUserEntity(); -// user.setId(id); -// user.setMobile("13500000002"); -// sysUserDao.updateById(user); -// -// //测试事物 -// int i = 1/0; -// } } \ No newline at end of file