格式调整

hx-base/src/main/java/com/fjhx/base/Config.java

@@ -1,13 +1,13 @@
 package com.fjhx.base;
 
+import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.stereotype.Component;
 
 @Component
 @ComponentScan("com.ruoyi.**")
-@EnableAutoConfiguration(exclude = {DataSourceAutoConfiguration.class})
+@EnableAutoConfiguration(exclude = {DruidDataSourceAutoConfigure.class})
 public class Config {
 
 }

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

@@ -1,13 +1,13 @@
 package com.fjhx.base.common;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 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.constant.DatasourceConstant;
 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;
@@ -27,8 +27,8 @@ import java.util.concurrent.TimeUnit;
  *
  * @author ruoyi
  */
+@DS(DatasourceConstant.SLAVE_NAME)
 @RestController
-@DataSource(DataSourceType.SLAVE)
 public class CaptchaController {
     @Resource(name = "captchaProducer")
     private Producer captchaProducer;

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

@@ -1,10 +1,10 @@
 package com.fjhx.base.common;
 
-import com.ruoyi.common.annotation.DataSource;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.ruoyi.common.config.RuoYiConfig;
 import com.ruoyi.common.constant.Constants;
+import com.ruoyi.common.constant.DatasourceConstant;
 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,9 +29,9 @@ import java.util.List;
  *
  * @author ruoyi
  */
+@DS(DatasourceConstant.SLAVE_NAME)
 @RestController
 @RequestMapping("/common")
-@DataSource(DataSourceType.SLAVE)
 public class CommonController {
     private static final Logger log = LoggerFactory.getLogger(CommonController.class);
     private static final String FILE_DELIMETER = ",";

hx-base/src/main/java/com/fjhx/base/monitor/CacheController.java

@@ -1,6 +1,8 @@
 package com.fjhx.base.monitor;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.ruoyi.common.constant.CacheConstants;
+import com.ruoyi.common.constant.DatasourceConstant;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.system.domain.SysCache;
@@ -17,6 +19,7 @@ import java.util.*;
  *
  * @author ruoyi
  */
+@DS(DatasourceConstant.SLAVE_NAME)
 @RestController
 @RequestMapping("/monitor/cache")
 public class CacheController {

hx-base/src/main/java/com/fjhx/base/monitor/ServerController.java

@@ -1,5 +1,7 @@
 package com.fjhx.base.monitor;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.ruoyi.common.constant.DatasourceConstant;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.framework.web.domain.Server;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -12,6 +14,7 @@ import org.springframework.web.bind.annotation.RestController;
  *
  * @author ruoyi
  */
+@DS(DatasourceConstant.SLAVE_NAME)
 @RestController
 @RequestMapping("/monitor/server")
 public class ServerController {

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

@@ -1,12 +1,12 @@
 package com.fjhx.base.monitor;
 
-import com.ruoyi.common.annotation.DataSource;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.constant.DatasourceConstant;
 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,9 +23,9 @@ import java.util.List;
  *
  * @author ruoyi
  */
+@DS(DatasourceConstant.SLAVE_NAME)
 @RestController
 @RequestMapping("/monitor/logininfor")
-@DataSource(DataSourceType.SLAVE)
 public class SysLogininforController extends BaseController {
     @Autowired
     private ISysLogininforService logininforService;

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

@@ -1,12 +1,12 @@
 package com.fjhx.base.monitor;
 
-import com.ruoyi.common.annotation.DataSource;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.constant.DatasourceConstant;
 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,9 +22,9 @@ import java.util.List;
  *
  * @author ruoyi
  */
+@DS(DatasourceConstant.SLAVE_NAME)
 @RestController
 @RequestMapping("/monitor/operlog")
-@DataSource(DataSourceType.SLAVE)
 public class SysOperlogController extends BaseController {
     @Autowired
     private ISysOperLogService operLogService;

hx-base/src/main/java/com/fjhx/base/monitor/SysUserOnlineController.java

@@ -1,7 +1,9 @@
 package com.fjhx.base.monitor;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.constant.CacheConstants;
+import com.ruoyi.common.constant.DatasourceConstant;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.model.LoginUser;
@@ -25,6 +27,7 @@ import java.util.List;
  *
  * @author ruoyi
  */
+@DS(DatasourceConstant.SLAVE_NAME)
 @RestController
 @RequestMapping("/monitor/online")
 public class SysUserOnlineController extends BaseController {

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

@@ -1,12 +1,12 @@
 package com.fjhx.base.system;
 
-import com.ruoyi.common.annotation.DataSource;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.constant.DatasourceConstant;
 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,9 +23,9 @@ import java.util.List;
  *
  * @author ruoyi
  */
+@DS(DatasourceConstant.SLAVE_NAME)
 @RestController
 @RequestMapping("/system/config")
-@DataSource(DataSourceType.SLAVE)
 public class SysConfigController extends BaseController {
     @Autowired
     private ISysConfigService configService;

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

@@ -1,13 +1,13 @@
 package com.fjhx.base.system;
 
-import com.ruoyi.common.annotation.DataSource;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.constant.DatasourceConstant;
 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,9 +23,9 @@ import java.util.List;
  *
  * @author ruoyi
  */
+@DS(DatasourceConstant.SLAVE_NAME)
 @RestController
 @RequestMapping("/system/dept")
-@DataSource(DataSourceType.SLAVE)
 public class SysDeptController extends BaseController {
     @Autowired
     private ISysDeptService deptService;

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

@@ -1,13 +1,13 @@
 package com.fjhx.base.system;
 
-import com.ruoyi.common.annotation.DataSource;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.constant.DatasourceConstant;
 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,10 +26,11 @@ import java.util.List;
  *
  * @author ruoyi
  */
+@DS(DatasourceConstant.SLAVE_NAME)
 @RestController
 @RequestMapping("/system/dict/data")
-@DataSource(DataSourceType.SLAVE)
 public class SysDictDataController extends BaseController {
+
     @Autowired
     private ISysDictDataService dictDataService;
 

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

@@ -1,13 +1,13 @@
 package com.fjhx.base.system;
 
-import com.ruoyi.common.annotation.DataSource;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.constant.DatasourceConstant;
 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,10 +23,11 @@ import java.util.List;
  *
  * @author ruoyi
  */
+@DS(DatasourceConstant.SLAVE_NAME)
 @RestController
 @RequestMapping("/system/dict/type")
-@DataSource(DataSourceType.SLAVE)
 public class SysDictTypeController extends BaseController {
+
     @Autowired
     private ISysDictTypeService dictTypeService;
 

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

@@ -1,8 +1,8 @@
 package com.fjhx.base.system;
 
-import com.ruoyi.common.annotation.DataSource;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.ruoyi.common.config.RuoYiConfig;
-import com.ruoyi.common.enums.DataSourceType;
+import com.ruoyi.common.constant.DatasourceConstant;
 import com.ruoyi.common.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -13,9 +13,10 @@ import org.springframework.web.bind.annotation.RestController;
  *
  * @author ruoyi
  */
+@DS(DatasourceConstant.SLAVE_NAME)
 @RestController
-@DataSource(DataSourceType.SLAVE)
 public class SysIndexController {
+
     /**
      * 系统基础配置
      */
@@ -29,4 +30,5 @@ public class SysIndexController {
     public String index() {
         return StringUtils.format("欢迎使用{}后台管理框架，当前版本：v{}，请通过前端地址访问。", ruoyiConfig.getName(), ruoyiConfig.getVersion());
     }
+
 }

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

@@ -1,12 +1,13 @@
 package com.fjhx.base.system;
 
-import com.ruoyi.common.annotation.DataSource;
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
 import com.ruoyi.common.constant.Constants;
+import com.ruoyi.common.constant.DatasourceConstant;
 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;
@@ -26,9 +27,10 @@ import java.util.Set;
  *
  * @author ruoyi
  */
+@DS(DatasourceConstant.SLAVE_NAME)
 @RestController
-@DataSource(DataSourceType.SLAVE)
 public class SysLoginController {
+
     @Autowired
     private SysLoginService loginService;
 

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

@@ -1,13 +1,13 @@
 package com.fjhx.base.system;
 
-import com.ruoyi.common.annotation.DataSource;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.constant.DatasourceConstant;
 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,10 +22,11 @@ import java.util.List;
  *
  * @author ruoyi
  */
+@DS(DatasourceConstant.SLAVE_NAME)
 @RestController
 @RequestMapping("/system/menu")
-@DataSource(DataSourceType.SLAVE)
 public class SysMenuController extends BaseController {
+
     @Autowired
     private ISysMenuService menuService;
 

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

@@ -1,12 +1,12 @@
 package com.fjhx.base.system;
 
-import com.ruoyi.common.annotation.DataSource;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.constant.DatasourceConstant;
 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,10 +21,11 @@ import java.util.List;
  *
  * @author ruoyi
  */
+@DS(DatasourceConstant.SLAVE_NAME)
 @RestController
 @RequestMapping("/system/notice")
-@DataSource(DataSourceType.SLAVE)
 public class SysNoticeController extends BaseController {
+
     @Autowired
     private ISysNoticeService noticeService;
 

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

@@ -1,12 +1,12 @@
 package com.fjhx.base.system;
 
-import com.ruoyi.common.annotation.DataSource;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.constant.DatasourceConstant;
 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,10 +23,11 @@ import java.util.List;
  *
  * @author ruoyi
  */
+@DS(DatasourceConstant.SLAVE_NAME)
 @RestController
 @RequestMapping("/system/post")
-@DataSource(DataSourceType.SLAVE)
 public class SysPostController extends BaseController {
+
     @Autowired
     private ISysPostService postService;
 

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

@@ -1,14 +1,14 @@
 package com.fjhx.base.system;
 
-import com.ruoyi.common.annotation.DataSource;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.config.RuoYiConfig;
+import com.ruoyi.common.constant.DatasourceConstant;
 import com.ruoyi.common.core.controller.BaseController;
 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,10 +24,11 @@ import org.springframework.web.multipart.MultipartFile;
  *
  * @author ruoyi
  */
+@DS(DatasourceConstant.SLAVE_NAME)
 @RestController
 @RequestMapping("/system/user/profile")
-@DataSource(DataSourceType.SLAVE)
 public class SysProfileController extends BaseController {
+
     @Autowired
     private ISysUserService userService;
 

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

@@ -1,10 +1,10 @@
 package com.fjhx.base.system;
 
-import com.ruoyi.common.annotation.DataSource;
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.ruoyi.common.constant.DatasourceConstant;
 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;
@@ -18,9 +18,10 @@ import org.springframework.web.bind.annotation.RestController;
  *
  * @author ruoyi
  */
+@DS(DatasourceConstant.SLAVE_NAME)
 @RestController
-@DataSource(DataSourceType.SLAVE)
 public class SysRegisterController extends BaseController {
+
     @Autowired
     private SysRegisterService registerService;
 

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

@@ -1,7 +1,8 @@
 package com.fjhx.base.system;
 
-import com.ruoyi.common.annotation.DataSource;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.constant.DatasourceConstant;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysDept;
@@ -10,7 +11,6 @@ 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,10 +32,11 @@ import java.util.List;
  *
  * @author ruoyi
  */
+@DS(DatasourceConstant.SLAVE_NAME)
 @RestController
 @RequestMapping("/system/role")
-@DataSource(DataSourceType.SLAVE)
 public class SysRoleController extends BaseController {
+
     @Autowired
     private ISysRoleService roleService;
 

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

@@ -1,7 +1,8 @@
 package com.fjhx.base.system;
 
-import com.ruoyi.common.annotation.DataSource;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.constant.DatasourceConstant;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysDept;
@@ -9,7 +10,6 @@ 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,10 +33,11 @@ import java.util.stream.Collectors;
  *
  * @author ruoyi
  */
+@DS(DatasourceConstant.SLAVE_NAME)
 @RestController
 @RequestMapping("/system/user")
-@DataSource(DataSourceType.SLAVE)
 public class SysUserController extends BaseController {
+
     @Autowired
     private ISysUserService userService;