24282 vor 2 Jahren
Ursprung
Commit
72d62d6dfe
41 geänderte Dateien mit 155 neuen und 40 gelöschten Zeilen
  1. 3 0
      hx-base/src/main/java/com/fjhx/base/common/CaptchaController.java
  2. 3 0
      hx-base/src/main/java/com/fjhx/base/common/CommonController.java
  3. 3 0
      hx-base/src/main/java/com/fjhx/base/monitor/SysLogininforController.java
  4. 3 0
      hx-base/src/main/java/com/fjhx/base/monitor/SysOperlogController.java
  5. 3 0
      hx-base/src/main/java/com/fjhx/base/system/SysConfigController.java
  6. 3 0
      hx-base/src/main/java/com/fjhx/base/system/SysDeptController.java
  7. 3 0
      hx-base/src/main/java/com/fjhx/base/system/SysDictDataController.java
  8. 3 0
      hx-base/src/main/java/com/fjhx/base/system/SysDictTypeController.java
  9. 3 0
      hx-base/src/main/java/com/fjhx/base/system/SysIndexController.java
  10. 3 0
      hx-base/src/main/java/com/fjhx/base/system/SysLoginController.java
  11. 3 0
      hx-base/src/main/java/com/fjhx/base/system/SysMenuController.java
  12. 3 0
      hx-base/src/main/java/com/fjhx/base/system/SysNoticeController.java
  13. 3 0
      hx-base/src/main/java/com/fjhx/base/system/SysPostController.java
  14. 3 0
      hx-base/src/main/java/com/fjhx/base/system/SysProfileController.java
  15. 3 0
      hx-base/src/main/java/com/fjhx/base/system/SysRegisterController.java
  16. 3 0
      hx-base/src/main/java/com/fjhx/base/system/SysRoleController.java
  17. 3 0
      hx-base/src/main/java/com/fjhx/base/system/SysUserController.java
  18. 4 0
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java
  19. 4 0
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
  20. 4 0
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java
  21. 3 0
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/ServerController.java
  22. 4 0
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java
  23. 4 0
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java
  24. 11 11
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java
  25. 4 0
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java
  26. 4 0
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java
  27. 4 0
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
  28. 4 0
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java
  29. 3 0
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
  30. 4 0
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
  31. 4 0
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java
  32. 4 0
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java
  33. 3 0
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
  34. 3 0
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java
  35. 3 0
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
  36. 13 16
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
  37. 6 6
      ruoyi-admin/src/main/resources/application-dev.yml
  38. 1 1
      ruoyi-framework/src/main/java/com/ruoyi/framework/aspect/LogicAspect.java
  39. 1 1
      ruoyi-framework/src/main/java/com/ruoyi/framework/aspect/TenantAspect.java
  40. 4 2
      ruoyi-framework/src/main/java/com/ruoyi/framework/mybatis/interceptor/LogicInterceptor.java
  41. 5 3
      ruoyi-framework/src/main/java/com/ruoyi/framework/mybatis/interceptor/TenantInterceptor.java

+ 3 - 0
hx-base/src/main/java/com/fjhx/base/common/CaptchaController.java

@@ -1,11 +1,13 @@
 package com.fjhx.base.common;
 
 import com.google.code.kaptcha.Producer;
+import com.ruoyi.common.annotation.DataSource;
 import com.ruoyi.common.config.RuoYiConfig;
 import com.ruoyi.common.constant.CacheConstants;
 import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.redis.RedisCache;
+import com.ruoyi.common.enums.DataSourceType;
 import com.ruoyi.common.utils.sign.Base64;
 import com.ruoyi.common.utils.uuid.IdUtils;
 import com.ruoyi.system.service.ISysConfigService;
@@ -26,6 +28,7 @@ import java.util.concurrent.TimeUnit;
  * @author ruoyi
  */
 @RestController
+@DataSource(DataSourceType.SLAVE)
 public class CaptchaController
 {
     @Resource(name = "captchaProducer")

+ 3 - 0
hx-base/src/main/java/com/fjhx/base/common/CommonController.java

@@ -1,8 +1,10 @@
 package com.fjhx.base.common;
 
+import com.ruoyi.common.annotation.DataSource;
 import com.ruoyi.common.config.RuoYiConfig;
 import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.DataSourceType;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.file.FileUploadUtils;
 import com.ruoyi.common.utils.file.FileUtils;
@@ -29,6 +31,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/common")
+@DataSource(DataSourceType.SLAVE)
 public class CommonController
 {
     private static final Logger log = LoggerFactory.getLogger(CommonController.class);

+ 3 - 0
hx-base/src/main/java/com/fjhx/base/monitor/SysLogininforController.java

@@ -1,10 +1,12 @@
 package com.fjhx.base.monitor;
 
+import com.ruoyi.common.annotation.DataSource;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.enums.DataSourceType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.web.service.SysPasswordService;
 import com.ruoyi.system.domain.SysLogininfor;
@@ -23,6 +25,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/monitor/logininfor")
+@DataSource(DataSourceType.SLAVE)
 public class SysLogininforController extends BaseController
 {
     @Autowired

+ 3 - 0
hx-base/src/main/java/com/fjhx/base/monitor/SysOperlogController.java

@@ -1,10 +1,12 @@
 package com.fjhx.base.monitor;
 
+import com.ruoyi.common.annotation.DataSource;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.enums.DataSourceType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.system.domain.SysOperLog;
 import com.ruoyi.system.service.ISysOperLogService;
@@ -22,6 +24,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/monitor/operlog")
+@DataSource(DataSourceType.SLAVE)
 public class SysOperlogController extends BaseController
 {
     @Autowired

+ 3 - 0
hx-base/src/main/java/com/fjhx/base/system/SysConfigController.java

@@ -1,10 +1,12 @@
 package com.fjhx.base.system;
 
+import com.ruoyi.common.annotation.DataSource;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.enums.DataSourceType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.system.domain.SysConfig;
 import com.ruoyi.system.service.ISysConfigService;
@@ -23,6 +25,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/system/config")
+@DataSource(DataSourceType.SLAVE)
 public class SysConfigController extends BaseController
 {
     @Autowired

+ 3 - 0
hx-base/src/main/java/com/fjhx/base/system/SysDeptController.java

@@ -1,11 +1,13 @@
 package com.fjhx.base.system;
 
+import com.ruoyi.common.annotation.DataSource;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.enums.DataSourceType;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.system.service.ISysDeptService;
 import org.apache.commons.lang3.ArrayUtils;
@@ -23,6 +25,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/system/dept")
+@DataSource(DataSourceType.SLAVE)
 public class SysDeptController extends BaseController
 {
     @Autowired

+ 3 - 0
hx-base/src/main/java/com/fjhx/base/system/SysDictDataController.java

@@ -1,11 +1,13 @@
 package com.fjhx.base.system;
 
+import com.ruoyi.common.annotation.DataSource;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysDictData;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.enums.DataSourceType;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.system.service.ISysDictDataService;
@@ -26,6 +28,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/system/dict/data")
+@DataSource(DataSourceType.SLAVE)
 public class SysDictDataController extends BaseController
 {
     @Autowired

+ 3 - 0
hx-base/src/main/java/com/fjhx/base/system/SysDictTypeController.java

@@ -1,11 +1,13 @@
 package com.fjhx.base.system;
 
+import com.ruoyi.common.annotation.DataSource;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysDictType;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.enums.DataSourceType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.system.service.ISysDictTypeService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -23,6 +25,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/system/dict/type")
+@DataSource(DataSourceType.SLAVE)
 public class SysDictTypeController extends BaseController
 {
     @Autowired

+ 3 - 0
hx-base/src/main/java/com/fjhx/base/system/SysIndexController.java

@@ -1,6 +1,8 @@
 package com.fjhx.base.system;
 
+import com.ruoyi.common.annotation.DataSource;
 import com.ruoyi.common.config.RuoYiConfig;
+import com.ruoyi.common.enums.DataSourceType;
 import com.ruoyi.common.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -12,6 +14,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @author ruoyi
  */
 @RestController
+@DataSource(DataSourceType.SLAVE)
 public class SysIndexController
 {
     /** 系统基础配置 */

+ 3 - 0
hx-base/src/main/java/com/fjhx/base/system/SysLoginController.java

@@ -1,10 +1,12 @@
 package com.fjhx.base.system;
 
+import com.ruoyi.common.annotation.DataSource;
 import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysMenu;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.domain.model.LoginBody;
+import com.ruoyi.common.enums.DataSourceType;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.framework.web.service.SysLoginService;
 import com.ruoyi.framework.web.service.SysPermissionService;
@@ -25,6 +27,7 @@ import java.util.Set;
  * @author ruoyi
  */
 @RestController
+@DataSource(DataSourceType.SLAVE)
 public class SysLoginController {
     @Autowired
     private SysLoginService loginService;

+ 3 - 0
hx-base/src/main/java/com/fjhx/base/system/SysMenuController.java

@@ -1,11 +1,13 @@
 package com.fjhx.base.system;
 
+import com.ruoyi.common.annotation.DataSource;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysMenu;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.enums.DataSourceType;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.system.service.ISysMenuService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -22,6 +24,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/system/menu")
+@DataSource(DataSourceType.SLAVE)
 public class SysMenuController extends BaseController
 {
     @Autowired

+ 3 - 0
hx-base/src/main/java/com/fjhx/base/system/SysNoticeController.java

@@ -1,10 +1,12 @@
 package com.fjhx.base.system;
 
+import com.ruoyi.common.annotation.DataSource;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.enums.DataSourceType;
 import com.ruoyi.system.domain.SysNotice;
 import com.ruoyi.system.service.ISysNoticeService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,6 +23,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/system/notice")
+@DataSource(DataSourceType.SLAVE)
 public class SysNoticeController extends BaseController
 {
     @Autowired

+ 3 - 0
hx-base/src/main/java/com/fjhx/base/system/SysPostController.java

@@ -1,10 +1,12 @@
 package com.fjhx.base.system;
 
+import com.ruoyi.common.annotation.DataSource;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.enums.DataSourceType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.system.domain.SysPost;
 import com.ruoyi.system.service.ISysPostService;
@@ -23,6 +25,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/system/post")
+@DataSource(DataSourceType.SLAVE)
 public class SysPostController extends BaseController
 {
     @Autowired

+ 3 - 0
hx-base/src/main/java/com/fjhx/base/system/SysProfileController.java

@@ -1,5 +1,6 @@
 package com.fjhx.base.system;
 
+import com.ruoyi.common.annotation.DataSource;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.config.RuoYiConfig;
 import com.ruoyi.common.core.controller.BaseController;
@@ -7,6 +8,7 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.enums.DataSourceType;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.file.FileUploadUtils;
@@ -24,6 +26,7 @@ import org.springframework.web.multipart.MultipartFile;
  */
 @RestController
 @RequestMapping("/system/user/profile")
+@DataSource(DataSourceType.SLAVE)
 public class SysProfileController extends BaseController
 {
     @Autowired

+ 3 - 0
hx-base/src/main/java/com/fjhx/base/system/SysRegisterController.java

@@ -1,8 +1,10 @@
 package com.fjhx.base.system;
 
+import com.ruoyi.common.annotation.DataSource;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.model.RegisterBody;
+import com.ruoyi.common.enums.DataSourceType;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.framework.web.service.SysRegisterService;
 import com.ruoyi.system.service.ISysConfigService;
@@ -17,6 +19,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @author ruoyi
  */
 @RestController
+@DataSource(DataSourceType.SLAVE)
 public class SysRegisterController extends BaseController
 {
     @Autowired

+ 3 - 0
hx-base/src/main/java/com/fjhx/base/system/SysRoleController.java

@@ -1,5 +1,6 @@
 package com.fjhx.base.system;
 
+import com.ruoyi.common.annotation.DataSource;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -9,6 +10,7 @@ import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.enums.DataSourceType;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.web.service.SysPermissionService;
@@ -32,6 +34,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/system/role")
+@DataSource(DataSourceType.SLAVE)
 public class SysRoleController extends BaseController
 {
     @Autowired

+ 3 - 0
hx-base/src/main/java/com/fjhx/base/system/SysUserController.java

@@ -1,5 +1,6 @@
 package com.fjhx.base.system;
 
+import com.ruoyi.common.annotation.DataSource;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -8,6 +9,7 @@ import com.ruoyi.common.core.domain.entity.SysRole;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.enums.DataSourceType;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -33,6 +35,7 @@ import java.util.stream.Collectors;
  */
 @RestController
 @RequestMapping("/system/user")
+@DataSource(DataSourceType.SLAVE)
 public class SysUserController extends BaseController
 {
     @Autowired

+ 4 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java

@@ -6,6 +6,9 @@ import java.util.concurrent.TimeUnit;
 import javax.annotation.Resource;
 import javax.imageio.ImageIO;
 import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.annotation.DataSource;
+import com.ruoyi.common.enums.DataSourceType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.FastByteArrayOutputStream;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -26,6 +29,7 @@ import com.ruoyi.system.service.ISysConfigService;
  * @author ruoyi
  */
 @RestController
+@DataSource(DataSourceType.SLAVE)
 public class CaptchaController
 {
     @Resource(name = "captchaProducer")

+ 4 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java

@@ -4,6 +4,9 @@ import java.util.ArrayList;
 import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.annotation.DataSource;
+import com.ruoyi.common.enums.DataSourceType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -28,6 +31,7 @@ import com.ruoyi.framework.config.ServerConfig;
  */
 @RestController
 @RequestMapping("/common")
+@DataSource(DataSourceType.SLAVE)
 public class CommonController
 {
     private static final Logger log = LoggerFactory.getLogger(CommonController.class);

+ 4 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java

@@ -7,6 +7,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
+
+import com.ruoyi.common.annotation.DataSource;
+import com.ruoyi.common.enums.DataSourceType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisCallback;
 import org.springframework.data.redis.core.RedisTemplate;
@@ -28,6 +31,7 @@ import com.ruoyi.system.domain.SysCache;
  */
 @RestController
 @RequestMapping("/monitor/cache")
+@DataSource(DataSourceType.SLAVE)
 public class CacheController
 {
     @Autowired

+ 3 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/ServerController.java

@@ -1,5 +1,7 @@
 package com.ruoyi.web.controller.monitor;
 
+import com.ruoyi.common.annotation.DataSource;
+import com.ruoyi.common.enums.DataSourceType;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -14,6 +16,7 @@ import com.ruoyi.framework.web.domain.Server;
  */
 @RestController
 @RequestMapping("/monitor/server")
+@DataSource(DataSourceType.SLAVE)
 public class ServerController
 {
     @PreAuthorize("@ss.hasPermi('monitor:server:list')")

+ 4 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java

@@ -2,6 +2,9 @@ package com.ruoyi.web.controller.monitor;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.annotation.DataSource;
+import com.ruoyi.common.enums.DataSourceType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -27,6 +30,7 @@ import com.ruoyi.system.service.ISysLogininforService;
  */
 @RestController
 @RequestMapping("/monitor/logininfor")
+@DataSource(DataSourceType.SLAVE)
 public class SysLogininforController extends BaseController
 {
     @Autowired

+ 4 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java

@@ -2,6 +2,9 @@ package com.ruoyi.web.controller.monitor;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.annotation.DataSource;
+import com.ruoyi.common.enums.DataSourceType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -26,6 +29,7 @@ import com.ruoyi.system.service.ISysOperLogService;
  */
 @RestController
 @RequestMapping("/monitor/operlog")
+@DataSource(DataSourceType.SLAVE)
 public class SysOperlogController extends BaseController
 {
     @Autowired

+ 11 - 11
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java

@@ -1,16 +1,6 @@
 package com.ruoyi.web.controller.monitor;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.DataSource;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.constant.CacheConstants;
 import com.ruoyi.common.core.controller.BaseController;
@@ -19,9 +9,18 @@ import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.enums.DataSourceType;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.system.domain.SysUserOnline;
 import com.ruoyi.system.service.ISysUserOnlineService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
 
 /**
  * 在线用户监控
@@ -30,6 +29,7 @@ import com.ruoyi.system.service.ISysUserOnlineService;
  */
 @RestController
 @RequestMapping("/monitor/online")
+@DataSource(DataSourceType.SLAVE)
 public class SysUserOnlineController extends BaseController
 {
     @Autowired

+ 4 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java

@@ -2,6 +2,9 @@ package com.ruoyi.web.controller.system;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.annotation.DataSource;
+import com.ruoyi.common.enums.DataSourceType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
@@ -29,6 +32,7 @@ import com.ruoyi.system.service.ISysConfigService;
  */
 @RestController
 @RequestMapping("/system/config")
+@DataSource(DataSourceType.SLAVE)
 public class SysConfigController extends BaseController
 {
     @Autowired

+ 4 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java

@@ -1,6 +1,9 @@
 package com.ruoyi.web.controller.system;
 
 import java.util.List;
+
+import com.ruoyi.common.annotation.DataSource;
+import com.ruoyi.common.enums.DataSourceType;
 import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -29,6 +32,7 @@ import com.ruoyi.system.service.ISysDeptService;
  */
 @RestController
 @RequestMapping("/system/dept")
+@DataSource(DataSourceType.SLAVE)
 public class SysDeptController extends BaseController
 {
     @Autowired

+ 4 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java

@@ -3,6 +3,9 @@ package com.ruoyi.web.controller.system;
 import java.util.ArrayList;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.annotation.DataSource;
+import com.ruoyi.common.enums.DataSourceType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
@@ -32,6 +35,7 @@ import com.ruoyi.system.service.ISysDictTypeService;
  */
 @RestController
 @RequestMapping("/system/dict/data")
+@DataSource(DataSourceType.SLAVE)
 public class SysDictDataController extends BaseController
 {
     @Autowired

+ 4 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java

@@ -2,6 +2,9 @@ package com.ruoyi.web.controller.system;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.annotation.DataSource;
+import com.ruoyi.common.enums.DataSourceType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
@@ -29,6 +32,7 @@ import com.ruoyi.system.service.ISysDictTypeService;
  */
 @RestController
 @RequestMapping("/system/dict/type")
+@DataSource(DataSourceType.SLAVE)
 public class SysDictTypeController extends BaseController
 {
     @Autowired

+ 3 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java

@@ -1,10 +1,12 @@
 package com.ruoyi.web.controller.system;
 
+import com.ruoyi.common.annotation.DataSource;
 import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysMenu;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.domain.model.LoginBody;
+import com.ruoyi.common.enums.DataSourceType;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.framework.web.service.SysLoginService;
 import com.ruoyi.framework.web.service.SysPermissionService;
@@ -25,6 +27,7 @@ import java.util.Set;
  * @author ruoyi
  */
 @RestController
+@DataSource(DataSourceType.SLAVE)
 public class SysLoginController {
     @Autowired
     private SysLoginService loginService;

+ 4 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java

@@ -1,6 +1,9 @@
 package com.ruoyi.web.controller.system;
 
 import java.util.List;
+
+import com.ruoyi.common.annotation.DataSource;
+import com.ruoyi.common.enums.DataSourceType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
@@ -28,6 +31,7 @@ import com.ruoyi.system.service.ISysMenuService;
  */
 @RestController
 @RequestMapping("/system/menu")
+@DataSource(DataSourceType.SLAVE)
 public class SysMenuController extends BaseController
 {
     @Autowired

+ 4 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java

@@ -1,6 +1,9 @@
 package com.ruoyi.web.controller.system;
 
 import java.util.List;
+
+import com.ruoyi.common.annotation.DataSource;
+import com.ruoyi.common.enums.DataSourceType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
@@ -27,6 +30,7 @@ import com.ruoyi.system.service.ISysNoticeService;
  */
 @RestController
 @RequestMapping("/system/notice")
+@DataSource(DataSourceType.SLAVE)
 public class SysNoticeController extends BaseController
 {
     @Autowired

+ 4 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java

@@ -2,6 +2,9 @@ package com.ruoyi.web.controller.system;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.annotation.DataSource;
+import com.ruoyi.common.enums.DataSourceType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
@@ -29,6 +32,7 @@ import com.ruoyi.system.service.ISysPostService;
  */
 @RestController
 @RequestMapping("/system/post")
+@DataSource(DataSourceType.SLAVE)
 public class SysPostController extends BaseController
 {
     @Autowired

+ 3 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java

@@ -1,5 +1,7 @@
 package com.ruoyi.web.controller.system;
 
+import com.ruoyi.common.annotation.DataSource;
+import com.ruoyi.common.enums.DataSourceType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -30,6 +32,7 @@ import com.ruoyi.system.service.ISysUserService;
  */
 @RestController
 @RequestMapping("/system/user/profile")
+@DataSource(DataSourceType.SLAVE)
 public class SysProfileController extends BaseController
 {
     @Autowired

+ 3 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java

@@ -1,5 +1,7 @@
 package com.ruoyi.web.controller.system;
 
+import com.ruoyi.common.annotation.DataSource;
+import com.ruoyi.common.enums.DataSourceType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -17,6 +19,7 @@ import com.ruoyi.system.service.ISysConfigService;
  * @author ruoyi
  */
 @RestController
+@DataSource(DataSourceType.SLAVE)
 public class SysRegisterController extends BaseController
 {
     @Autowired

+ 3 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java

@@ -1,5 +1,6 @@
 package com.ruoyi.web.controller.system;
 
+import com.ruoyi.common.annotation.DataSource;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -9,6 +10,7 @@ import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.enums.DataSourceType;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.web.service.SysPermissionService;
@@ -32,6 +34,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/system/role")
+@DataSource(DataSourceType.SLAVE)
 public class SysRoleController extends BaseController
 {
     @Autowired

+ 13 - 16
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -1,21 +1,6 @@
 package com.ruoyi.web.controller.system;
 
-import java.util.List;
-import java.util.stream.Collectors;
-import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.lang3.ArrayUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
+import com.ruoyi.common.annotation.DataSource;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -24,6 +9,7 @@ import com.ruoyi.common.core.domain.entity.SysRole;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.enums.DataSourceType;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -31,6 +17,16 @@ import com.ruoyi.system.service.ISysDeptService;
 import com.ruoyi.system.service.ISysPostService;
 import com.ruoyi.system.service.ISysRoleService;
 import com.ruoyi.system.service.ISysUserService;
+import org.apache.commons.lang3.ArrayUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 用户信息
@@ -39,6 +35,7 @@ import com.ruoyi.system.service.ISysUserService;
  */
 @RestController
 @RequestMapping("/system/user")
+@DataSource(DataSourceType.SLAVE)
 public class SysUserController extends BaseController
 {
     @Autowired

+ 6 - 6
ruoyi-admin/src/main/resources/application-dev.yml

@@ -6,16 +6,16 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://36.134.91.96:17330/ry_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://36.134.91.96:17330/winfaster_master?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: fjhx2012mysql
                 password: 3PN-Mzn#vnP&q6d
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭
-                enabled: false
-                url: 
-                username: 
-                password: 
+                enabled: true
+                url: jdbc:mysql://36.134.91.96:17330/winfaster_slave?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                username: fjhx2012mysql
+                password: 3PN-Mzn#vnP&q6d
             # 初始连接数
             initialSize: 5
             # 最小连接池数量
@@ -39,7 +39,7 @@ spring:
             testWhileIdle: true
             testOnBorrow: false
             testOnReturn: false
-            webStatFilter: 
+            webStatFilter:
                 enabled: true
             statViewServlet:
                 enabled: true

+ 1 - 1
ruoyi-framework/src/main/java/com/ruoyi/framework/aspect/LogicAspect.java

@@ -8,7 +8,7 @@ import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
 
 /**
- * 租户拦截器
+ * 逻辑删除切面
  */
 @Aspect
 public class LogicAspect {

+ 1 - 1
ruoyi-framework/src/main/java/com/ruoyi/framework/aspect/TenantAspect.java

@@ -7,7 +7,7 @@ import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
 
 /**
- * 租户拦截器
+ * 租户切面
  */
 @Aspect
 public class TenantAspect {

+ 4 - 2
ruoyi-framework/src/main/java/com/ruoyi/framework/mybatis/interceptor/LogicInterceptor.java

@@ -72,9 +72,11 @@ public class LogicInterceptor extends BaseMultiTableInnerInterceptor implements
 
     public LogicInterceptor() {
         // 获取主库数据源
-        DruidDataSource dataSource = SpringUtil.getBean("masterDataSource");
-        putTableMap(dataSource, DataSourceType.MASTER);
+        DruidDataSource masterDataSource = SpringUtil.getBean("masterDataSource");
+        putTableMap(masterDataSource, DataSourceType.MASTER);
 
+        DruidDataSource slaveDataSource = SpringUtil.getBean("slaveDataSource");
+        putTableMap(slaveDataSource, DataSourceType.SLAVE);
     }
 
     /**

+ 5 - 3
ruoyi-framework/src/main/java/com/ruoyi/framework/mybatis/interceptor/TenantInterceptor.java

@@ -27,10 +27,12 @@ public class TenantInterceptor extends TenantLineInnerInterceptor {
     public TenantInterceptor() {
 
         // 获取主库数据源
-        DruidDataSource dataSource = SpringUtil.getBean("masterDataSource");
-        putTableMap(dataSource, DataSourceType.MASTER);
+        DruidDataSource masterDataSource = SpringUtil.getBean("masterDataSource");
+        putTableMap(masterDataSource, DataSourceType.MASTER);
 
-        // TODO 暂未配置从库
+        // 从库数据
+        DruidDataSource slaveDataSource = SpringUtil.getBean("slaveDataSource");
+        putTableMap(slaveDataSource, DataSourceType.SLAVE);
 
         setTenantLineHandler(new TenantLineHandler() {