数据源重命名

hx-area/src/main/java/com/fjhx/area/controller/AreaInfoController.java

@@ -3,7 +3,7 @@ package com.fjhx.area.controller;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.fjhx.area.entity.po.AreaInfo;
 import com.fjhx.area.service.AreaInfoService;
-import com.ruoyi.common.constant.DatasourceConstant;
+import com.ruoyi.common.constant.BaseSourceConstant;
 import org.springframework.web.bind.annotation.*;
 import com.fjhx.area.entity.dto.AreaInfoSelectDto;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -18,7 +18,7 @@ import java.util.List;
  * @author 
  * @since 2023-03-17
  */
-@DS(DatasourceConstant.BASE)
+@DS(BaseSourceConstant.BASE)
 @RestController
 @RequestMapping("/areaInfo")
 public class AreaInfoController {

hx-area/src/main/java/com/fjhx/area/service/impl/AreaInfoServiceImpl.java

@@ -10,7 +10,7 @@ import com.fjhx.area.entity.po.AreaInfo;
 import com.fjhx.area.mapper.AreaInfoMapper;
 import com.fjhx.area.service.AreaInfoService;
 import com.fjhx.area.service.ISetAreaName;
-import com.ruoyi.common.constant.DatasourceConstant;
+import com.ruoyi.common.constant.BaseSourceConstant;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
@@ -39,7 +39,7 @@ public class AreaInfoServiceImpl extends ServiceImpl<AreaInfoMapper, AreaInfo> i
     }
 
     @Transactional(propagation = Propagation.REQUIRES_NEW)
-    @DS(DatasourceConstant.BASE)
+    @DS(BaseSourceConstant.BASE)
     @Override
     public void setAreaName(List<? extends ISetAreaName> areaList) {
         Set<String> areaIdList = new HashSet<>();

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

@@ -5,7 +5,7 @@ import com.google.code.kaptcha.Producer;
 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.constant.BaseSourceConstant;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.common.utils.sign.Base64;
@@ -27,7 +27,7 @@ import java.util.concurrent.TimeUnit;
  *
  * @author ruoyi
  */
-@DS(DatasourceConstant.BASE)
+@DS(BaseSourceConstant.BASE)
 @RestController
 public class CaptchaController {
     @Resource(name = "captchaProducer")

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

@@ -3,7 +3,7 @@ package com.fjhx.base.common;
 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.constant.BaseSourceConstant;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.file.FileUploadUtils;
@@ -29,7 +29,7 @@ import java.util.List;
  *
  * @author ruoyi
  */
-@DS(DatasourceConstant.BASE)
+@DS(BaseSourceConstant.BASE)
 @RestController
 @RequestMapping("/common")
 public class CommonController {

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

@@ -2,7 +2,7 @@ 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.constant.BaseSourceConstant;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.system.domain.SysCache;
@@ -19,7 +19,7 @@ import java.util.*;
  *
  * @author ruoyi
  */
-@DS(DatasourceConstant.BASE)
+@DS(BaseSourceConstant.BASE)
 @RestController
 @RequestMapping("/monitor/cache")
 public class CacheController {

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

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

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

@@ -2,7 +2,7 @@ package com.fjhx.base.monitor;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.constant.DatasourceConstant;
+import com.ruoyi.common.constant.BaseSourceConstant;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
@@ -23,7 +23,7 @@ import java.util.List;
  *
  * @author ruoyi
  */
-@DS(DatasourceConstant.BASE)
+@DS(BaseSourceConstant.BASE)
 @RestController
 @RequestMapping("/monitor/logininfor")
 public class SysLogininforController extends BaseController {

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

@@ -2,7 +2,7 @@ package com.fjhx.base.monitor;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.constant.DatasourceConstant;
+import com.ruoyi.common.constant.BaseSourceConstant;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
@@ -22,7 +22,7 @@ import java.util.List;
  *
  * @author ruoyi
  */
-@DS(DatasourceConstant.BASE)
+@DS(BaseSourceConstant.BASE)
 @RestController
 @RequestMapping("/monitor/operlog")
 public class SysOperlogController extends BaseController {

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

@@ -3,7 +3,7 @@ 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.constant.BaseSourceConstant;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.model.LoginUser;
@@ -27,7 +27,7 @@ import java.util.List;
  *
  * @author ruoyi
  */
-@DS(DatasourceConstant.BASE)
+@DS(BaseSourceConstant.BASE)
 @RestController
 @RequestMapping("/monitor/online")
 public class SysUserOnlineController extends BaseController {

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

@@ -2,7 +2,7 @@ package com.fjhx.base.system;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.constant.DatasourceConstant;
+import com.ruoyi.common.constant.BaseSourceConstant;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
@@ -23,7 +23,7 @@ import java.util.List;
  *
  * @author ruoyi
  */
-@DS(DatasourceConstant.BASE)
+@DS(BaseSourceConstant.BASE)
 @RestController
 @RequestMapping("/system/config")
 public class SysConfigController extends BaseController {

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

@@ -2,7 +2,7 @@ package com.fjhx.base.system;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.constant.DatasourceConstant;
+import com.ruoyi.common.constant.BaseSourceConstant;
 import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -23,7 +23,7 @@ import java.util.List;
  *
  * @author ruoyi
  */
-@DS(DatasourceConstant.BASE)
+@DS(BaseSourceConstant.BASE)
 @RestController
 @RequestMapping("/system/dept")
 public class SysDeptController extends BaseController {

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

@@ -2,7 +2,7 @@ package com.fjhx.base.system;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.constant.DatasourceConstant;
+import com.ruoyi.common.constant.BaseSourceConstant;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysDictData;
@@ -26,7 +26,7 @@ import java.util.List;
  *
  * @author ruoyi
  */
-@DS(DatasourceConstant.BASE)
+@DS(BaseSourceConstant.BASE)
 @RestController
 @RequestMapping("/system/dict/data")
 public class SysDictDataController extends BaseController {

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

@@ -2,7 +2,7 @@ package com.fjhx.base.system;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.constant.DatasourceConstant;
+import com.ruoyi.common.constant.BaseSourceConstant;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysDictType;
@@ -23,7 +23,7 @@ import java.util.List;
  *
  * @author ruoyi
  */
-@DS(DatasourceConstant.BASE)
+@DS(BaseSourceConstant.BASE)
 @RestController
 @RequestMapping("/system/dict/type")
 public class SysDictTypeController extends BaseController {

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

@@ -2,7 +2,7 @@ package com.fjhx.base.system;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.ruoyi.common.config.RuoYiConfig;
-import com.ruoyi.common.constant.DatasourceConstant;
+import com.ruoyi.common.constant.BaseSourceConstant;
 import com.ruoyi.common.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RestController;
  *
  * @author ruoyi
  */
-@DS(DatasourceConstant.BASE)
+@DS(BaseSourceConstant.BASE)
 @RestController
 public class SysIndexController {
 

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

@@ -5,7 +5,7 @@ import com.fjhx.tenant.entity.tenant.po.TenantInfo;
 import com.fjhx.tenant.service.tenant.TenantInfoService;
 import com.ruoyi.common.annotation.TenantIgnore;
 import com.ruoyi.common.constant.Constants;
-import com.ruoyi.common.constant.DatasourceConstant;
+import com.ruoyi.common.constant.BaseSourceConstant;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysMenu;
 import com.ruoyi.common.core.domain.entity.SysUser;
@@ -30,7 +30,7 @@ import java.util.Set;
  *
  * @author ruoyi
  */
-@DS(DatasourceConstant.BASE)
+@DS(BaseSourceConstant.BASE)
 @RestController
 public class SysLoginController {
 

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

@@ -2,7 +2,7 @@ package com.fjhx.base.system;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.constant.DatasourceConstant;
+import com.ruoyi.common.constant.BaseSourceConstant;
 import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -22,7 +22,7 @@ import java.util.List;
  *
  * @author ruoyi
  */
-@DS(DatasourceConstant.BASE)
+@DS(BaseSourceConstant.BASE)
 @RestController
 @RequestMapping("/system/menu")
 public class SysMenuController extends BaseController {

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

@@ -2,7 +2,7 @@ package com.fjhx.base.system;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.constant.DatasourceConstant;
+import com.ruoyi.common.constant.BaseSourceConstant;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
@@ -21,7 +21,7 @@ import java.util.List;
  *
  * @author ruoyi
  */
-@DS(DatasourceConstant.BASE)
+@DS(BaseSourceConstant.BASE)
 @RestController
 @RequestMapping("/system/notice")
 public class SysNoticeController extends BaseController {

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

@@ -2,7 +2,7 @@ package com.fjhx.base.system;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.constant.DatasourceConstant;
+import com.ruoyi.common.constant.BaseSourceConstant;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
@@ -23,7 +23,7 @@ import java.util.List;
  *
  * @author ruoyi
  */
-@DS(DatasourceConstant.BASE)
+@DS(BaseSourceConstant.BASE)
 @RestController
 @RequestMapping("/system/post")
 public class SysPostController extends BaseController {

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

@@ -3,7 +3,7 @@ package com.fjhx.base.system;
 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.constant.BaseSourceConstant;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysUser;
@@ -24,7 +24,7 @@ import org.springframework.web.multipart.MultipartFile;
  *
  * @author ruoyi
  */
-@DS(DatasourceConstant.BASE)
+@DS(BaseSourceConstant.BASE)
 @RestController
 @RequestMapping("/system/user/profile")
 public class SysProfileController extends BaseController {

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

@@ -1,7 +1,7 @@
 package com.fjhx.base.system;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
-import com.ruoyi.common.constant.DatasourceConstant;
+import com.ruoyi.common.constant.BaseSourceConstant;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.model.RegisterBody;
@@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.RestController;
  *
  * @author ruoyi
  */
-@DS(DatasourceConstant.BASE)
+@DS(BaseSourceConstant.BASE)
 @RestController
 public class SysRegisterController extends BaseController {
 

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

@@ -2,7 +2,7 @@ package com.fjhx.base.system;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.constant.DatasourceConstant;
+import com.ruoyi.common.constant.BaseSourceConstant;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysDept;
@@ -32,7 +32,7 @@ import java.util.List;
  *
  * @author ruoyi
  */
-@DS(DatasourceConstant.BASE)
+@DS(BaseSourceConstant.BASE)
 @RestController
 @RequestMapping("/system/role")
 public class SysRoleController extends BaseController {

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

@@ -2,7 +2,7 @@ package com.fjhx.base.system;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.constant.DatasourceConstant;
+import com.ruoyi.common.constant.BaseSourceConstant;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysDept;
@@ -33,7 +33,7 @@ import java.util.stream.Collectors;
  *
  * @author ruoyi
  */
-@DS(DatasourceConstant.BASE)
+@DS(BaseSourceConstant.BASE)
 @RestController
 @RequestMapping("/system/user")
 public class SysUserController extends BaseController {

hx-file/src/main/java/com/fjhx/file/controller/FileInfoController.java

@@ -6,7 +6,7 @@ import com.fjhx.file.entity.FileInfoVo;
 import com.fjhx.file.entity.SingDto;
 import com.fjhx.file.entity.SingVo;
 import com.fjhx.file.service.FileInfoService;
-import com.ruoyi.common.constant.DatasourceConstant;
+import com.ruoyi.common.constant.BaseSourceConstant;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -25,7 +25,7 @@ import java.util.Map;
  * @author zlj
  * @since 2023-03-14
  */
-@DS(DatasourceConstant.BASE)
+@DS(BaseSourceConstant.BASE)
 @RestController
 @RequestMapping("/fileInfo")
 public class FileInfoController {

hx-file/src/main/java/com/fjhx/file/service/impl/FileInfoServiceImpl.java

@@ -15,7 +15,7 @@ import com.fjhx.file.service.FileInfoService;
 import com.obs.services.ObsClient;
 import com.obs.services.model.PostSignatureRequest;
 import com.obs.services.model.PostSignatureResponse;
-import com.ruoyi.common.constant.DatasourceConstant;
+import com.ruoyi.common.constant.BaseSourceConstant;
 import com.ruoyi.common.core.domain.BaseIdPo;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.wrapper.IWrapper;
@@ -140,7 +140,7 @@ public class FileInfoServiceImpl extends ServiceImpl<FileInfoMapper, FileInfo> i
      * @param businessType 业务文件类型
      */
     @Transactional(propagation = Propagation.REQUIRES_NEW)
-    @DS(DatasourceConstant.BASE)
+    @DS(BaseSourceConstant.BASE)
     @Override
     public void saveFile(List<ObsFile> obsFileList, Long businessId, Integer businessType) {
         // 切换到从库
@@ -165,7 +165,7 @@ public class FileInfoServiceImpl extends ServiceImpl<FileInfoMapper, FileInfo> i
      * @param businessType 业务文件类型
      */
     @Transactional(propagation = Propagation.REQUIRES_NEW)
-    @DS(DatasourceConstant.BASE)
+    @DS(BaseSourceConstant.BASE)
     @Override
     public void editFile(List<ObsFile> obsFileList, Long businessId, Integer businessType) {
         if (obsFileList == null || obsFileList.size() == 0) {
@@ -187,7 +187,7 @@ public class FileInfoServiceImpl extends ServiceImpl<FileInfoMapper, FileInfo> i
      * @param businessType 业务文件类型
      */
     @Transactional(propagation = Propagation.REQUIRES_NEW)
-    @DS(DatasourceConstant.BASE)
+    @DS(BaseSourceConstant.BASE)
     @Override
     public void removeFile(Long businessId, Integer businessType) {
         this.remove(q -> q
@@ -201,7 +201,7 @@ public class FileInfoServiceImpl extends ServiceImpl<FileInfoMapper, FileInfo> i
      * @param businessId 业务id
      */
     @Transactional(propagation = Propagation.REQUIRES_NEW)
-    @DS(DatasourceConstant.BASE)
+    @DS(BaseSourceConstant.BASE)
     @Override
     public void removeFile(Long businessId) {
         this.remove(q -> q.eq(FileInfo::getBusinessId, businessId));

hx-flow/src/main/java/com/fjhx/flow/controller/flow/FlowDefinitionController.java

@@ -4,7 +4,7 @@ import com.baomidou.dynamic.datasource.annotation.DS;
 import com.fjhx.flow.entity.flow.dto.FlowDefinitionDto;
 import com.fjhx.flow.entity.flow.po.FlowDefinition;
 import com.fjhx.flow.service.flow.FlowDefinitionService;
-import com.ruoyi.common.constant.DatasourceConstant;
+import com.ruoyi.common.constant.BaseSourceConstant;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @author
  * @since 2023-03-15
  */
-@DS(DatasourceConstant.BASE)
+@DS(BaseSourceConstant.BASE)
 @RestController
 @RequestMapping("/flowDefinition")
 public class FlowDefinitionController {

hx-flow/src/main/java/com/fjhx/flow/controller/flow/FlowDefinitionNodeController.java

@@ -1,7 +1,7 @@
 package com.fjhx.flow.controller.flow;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
-import com.ruoyi.common.constant.DatasourceConstant;
+import com.ruoyi.common.constant.BaseSourceConstant;
 import org.springframework.web.bind.annotation.*;
 
 
@@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.*;
  * @author 
  * @since 2023-03-15
  */
-@DS(DatasourceConstant.BASE)
+@DS(BaseSourceConstant.BASE)
 @RestController
 @RequestMapping("/flowDefinitionNode")
 public class FlowDefinitionNodeController {

hx-flow/src/main/java/com/fjhx/flow/controller/flow/FlowInfoController.java

@@ -6,7 +6,7 @@ import com.fjhx.flow.entity.flow.dto.FlowInfoDto;
 import com.fjhx.flow.entity.flow.dto.FlowInfoSelectDto;
 import com.fjhx.flow.entity.flow.vo.FlowInfoVo;
 import com.fjhx.flow.service.flow.FlowInfoService;
-import com.ruoyi.common.constant.DatasourceConstant;
+import com.ruoyi.common.constant.BaseSourceConstant;
 import com.ruoyi.common.core.domain.BaseSelectDto;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @author
  * @since 2023-03-15
  */
-@DS(DatasourceConstant.BASE)
+@DS(BaseSourceConstant.BASE)
 @RestController
 @RequestMapping("/flowInfo")
 public class FlowInfoController {

hx-flow/src/main/java/com/fjhx/flow/controller/flow/FlowProcessController.java

@@ -4,7 +4,7 @@ import com.baomidou.dynamic.datasource.annotation.DS;
 import com.fjhx.flow.entity.flow.dto.InitiateDto;
 import com.fjhx.flow.entity.flow.dto.JumpDto;
 import com.fjhx.flow.service.flow.FlowProcessService;
-import com.ruoyi.common.constant.DatasourceConstant;
+import com.ruoyi.common.constant.BaseSourceConstant;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-@DS(DatasourceConstant.BASE)
+@DS(BaseSourceConstant.BASE)
 @RestController
 @RequestMapping("/flowProcess")
 public class FlowProcessController {

hx-tenant/src/main/java/com/fjhx/tenant/controller/dict/DictCommonTypeController.java

@@ -7,7 +7,7 @@ import com.fjhx.tenant.entity.dict.dto.DictCommonTypeSelectDto;
 import com.fjhx.tenant.entity.dict.vo.DictCommonTypeVo;
 import com.fjhx.tenant.service.dict.DictCommonTypeService;
 import com.ruoyi.common.annotation.TenantIgnore;
-import com.ruoyi.common.constant.DatasourceConstant;
+import com.ruoyi.common.constant.BaseSourceConstant;
 import com.ruoyi.common.core.domain.BaseSelectDto;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
@@ -26,7 +26,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2023-03-30
  */
 @TenantIgnore
-@DS(DatasourceConstant.BASE)
+@DS(BaseSourceConstant.BASE)
 @RestController
 @RequestMapping("/dictCommonType")
 public class DictCommonTypeController {

hx-tenant/src/main/java/com/fjhx/tenant/controller/dict/DictTenantTypeController.java

@@ -8,7 +8,7 @@ import com.fjhx.tenant.entity.dict.dto.DictTenantTypeSelectDto;
 import com.fjhx.tenant.entity.dict.vo.DictTenantTypeVo;
 import com.fjhx.tenant.service.dict.DictTenantTypeService;
 import com.ruoyi.common.annotation.TenantIgnore;
-import com.ruoyi.common.constant.DatasourceConstant;
+import com.ruoyi.common.constant.BaseSourceConstant;
 import com.ruoyi.common.core.domain.BaseSelectDto;
 import com.ruoyi.common.exception.ServiceException;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -28,7 +28,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2023-03-30
  */
 @TenantIgnore
-@DS(DatasourceConstant.BASE)
+@DS(BaseSourceConstant.BASE)
 @RestController
 @RequestMapping("/dictTenantType")
 public class DictTenantTypeController {

hx-tenant/src/main/java/com/fjhx/tenant/controller/tenant/DetpTenantController.java

@@ -4,7 +4,7 @@ import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.TenantIgnore;
-import com.ruoyi.common.constant.DatasourceConstant;
+import com.ruoyi.common.constant.BaseSourceConstant;
 import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.enums.BusinessType;
@@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.*;
 import java.util.List;
 
 @TenantIgnore
-@DS(DatasourceConstant.BASE)
+@DS(BaseSourceConstant.BASE)
 @RestController
 @RequestMapping("/tenantDept")
 public class DetpTenantController {

hx-tenant/src/main/java/com/fjhx/tenant/controller/tenant/RoleTenantController.java

@@ -4,7 +4,7 @@ import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.TenantIgnore;
-import com.ruoyi.common.constant.DatasourceConstant;
+import com.ruoyi.common.constant.BaseSourceConstant;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysMenu;
@@ -28,7 +28,7 @@ import org.springframework.web.bind.annotation.*;
 import java.util.List;
 
 @TenantIgnore
-@DS(DatasourceConstant.BASE)
+@DS(BaseSourceConstant.BASE)
 @RestController
 @RequestMapping("/tenantRole")
 public class RoleTenantController extends BaseController {

hx-tenant/src/main/java/com/fjhx/tenant/controller/tenant/TenantInfoController.java

@@ -10,7 +10,7 @@ import com.fjhx.tenant.entity.tenant.po.TenantInfo;
 import com.fjhx.tenant.entity.tenant.vo.TenantInfoVo;
 import com.fjhx.tenant.service.tenant.TenantInfoService;
 import com.ruoyi.common.annotation.TenantIgnore;
-import com.ruoyi.common.constant.DatasourceConstant;
+import com.ruoyi.common.constant.BaseSourceConstant;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.BaseSelectDto;
 import com.ruoyi.common.core.domain.entity.SysMenu;
@@ -34,7 +34,7 @@ import java.util.List;
  * @since 2023-03-15
  */
 @TenantIgnore
-@DS(DatasourceConstant.BASE)
+@DS(BaseSourceConstant.BASE)
 @RestController
 @RequestMapping("/tenantInfo")
 public class TenantInfoController {

hx-tenant/src/main/java/com/fjhx/tenant/controller/tenant/UserTenantController.java

@@ -5,7 +5,7 @@ import com.baomidou.dynamic.datasource.annotation.DS;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.annotation.TenantIgnore;
-import com.ruoyi.common.constant.DatasourceConstant;
+import com.ruoyi.common.constant.BaseSourceConstant;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysUser;
@@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.*;
 import java.util.List;
 
 @TenantIgnore
-@DS(DatasourceConstant.BASE)
+@DS(BaseSourceConstant.BASE)
 @RestController
 @RequestMapping("/tenantUser")
 public class UserTenantController extends BaseController {

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

@@ -6,7 +6,7 @@ import com.google.code.kaptcha.Producer;
 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.constant.BaseSourceConstant;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.common.utils.sign.Base64;
@@ -31,7 +31,7 @@ import java.util.concurrent.TimeUnit;
  * @author ruoyi
  */
 @Slf4j
-@DS(DatasourceConstant.BASE)
+@DS(BaseSourceConstant.BASE)
 @RestController
 public class CaptchaController {
     @Resource(name = "captchaProducer")

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

@@ -3,7 +3,7 @@ package com.ruoyi.web.controller.common;
 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.constant.BaseSourceConstant;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.file.FileUploadUtils;
@@ -29,7 +29,7 @@ import java.util.List;
  *
  * @author ruoyi
  */
-@DS(DatasourceConstant.BASE)
+@DS(BaseSourceConstant.BASE)
 @RestController
 @RequestMapping("/common")
 public class CommonController {

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

@@ -2,7 +2,7 @@ package com.ruoyi.web.controller.monitor;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.ruoyi.common.constant.CacheConstants;
-import com.ruoyi.common.constant.DatasourceConstant;
+import com.ruoyi.common.constant.BaseSourceConstant;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.system.domain.SysCache;
@@ -19,7 +19,7 @@ import java.util.*;
  *
  * @author ruoyi
  */
-@DS(DatasourceConstant.BASE)
+@DS(BaseSourceConstant.BASE)
 @RestController
 @RequestMapping("/monitor/cache")
 public class CacheController {

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

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

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

@@ -2,7 +2,7 @@ package com.ruoyi.web.controller.monitor;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.constant.DatasourceConstant;
+import com.ruoyi.common.constant.BaseSourceConstant;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
@@ -23,7 +23,7 @@ import java.util.List;
  *
  * @author ruoyi
  */
-@DS(DatasourceConstant.BASE)
+@DS(BaseSourceConstant.BASE)
 @RestController
 @RequestMapping("/monitor/logininfor")
 public class SysLogininforController extends BaseController {

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

@@ -2,7 +2,7 @@ package com.ruoyi.web.controller.monitor;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.constant.DatasourceConstant;
+import com.ruoyi.common.constant.BaseSourceConstant;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
@@ -22,7 +22,7 @@ import java.util.List;
  *
  * @author ruoyi
  */
-@DS(DatasourceConstant.BASE)
+@DS(BaseSourceConstant.BASE)
 @RestController
 @RequestMapping("/monitor/operlog")
 public class SysOperlogController extends BaseController {

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

@@ -3,7 +3,7 @@ package com.ruoyi.web.controller.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.constant.BaseSourceConstant;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.model.LoginUser;
@@ -27,7 +27,7 @@ import java.util.List;
  *
  * @author ruoyi
  */
-@DS(DatasourceConstant.BASE)
+@DS(BaseSourceConstant.BASE)
 @RestController
 @RequestMapping("/monitor/online")
 public class SysUserOnlineController extends BaseController {

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

@@ -2,7 +2,7 @@ package com.ruoyi.web.controller.system;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.constant.DatasourceConstant;
+import com.ruoyi.common.constant.BaseSourceConstant;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
@@ -23,7 +23,7 @@ import java.util.List;
  *
  * @author ruoyi
  */
-@DS(DatasourceConstant.BASE)
+@DS(BaseSourceConstant.BASE)
 @RestController
 @RequestMapping("/system/config")
 public class SysConfigController extends BaseController {

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

@@ -2,7 +2,7 @@ package com.ruoyi.web.controller.system;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.constant.DatasourceConstant;
+import com.ruoyi.common.constant.BaseSourceConstant;
 import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -23,7 +23,7 @@ import java.util.List;
  *
  * @author ruoyi
  */
-@DS(DatasourceConstant.BASE)
+@DS(BaseSourceConstant.BASE)
 @RestController
 @RequestMapping("/system/dept")
 public class SysDeptController extends BaseController {

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

@@ -2,7 +2,7 @@ package com.ruoyi.web.controller.system;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.constant.DatasourceConstant;
+import com.ruoyi.common.constant.BaseSourceConstant;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysDictData;
@@ -26,7 +26,7 @@ import java.util.List;
  *
  * @author ruoyi
  */
-@DS(DatasourceConstant.BASE)
+@DS(BaseSourceConstant.BASE)
 @RestController
 @RequestMapping("/system/dict/data")
 public class SysDictDataController extends BaseController {

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

@@ -2,7 +2,7 @@ package com.ruoyi.web.controller.system;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.constant.DatasourceConstant;
+import com.ruoyi.common.constant.BaseSourceConstant;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysDictType;
@@ -23,7 +23,7 @@ import java.util.List;
  *
  * @author ruoyi
  */
-@DS(DatasourceConstant.BASE)
+@DS(BaseSourceConstant.BASE)
 @RestController
 @RequestMapping("/system/dict/type")
 public class SysDictTypeController extends BaseController {

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java

@@ -2,7 +2,7 @@ package com.ruoyi.web.controller.system;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.ruoyi.common.config.RuoYiConfig;
-import com.ruoyi.common.constant.DatasourceConstant;
+import com.ruoyi.common.constant.BaseSourceConstant;
 import com.ruoyi.common.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RestController;
  *
  * @author ruoyi
  */
-@DS(DatasourceConstant.BASE)
+@DS(BaseSourceConstant.BASE)
 @RestController
 public class SysIndexController {
     /**

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

@@ -5,7 +5,7 @@ import com.fjhx.tenant.entity.tenant.po.TenantInfo;
 import com.fjhx.tenant.service.tenant.TenantInfoService;
 import com.ruoyi.common.annotation.TenantIgnore;
 import com.ruoyi.common.constant.Constants;
-import com.ruoyi.common.constant.DatasourceConstant;
+import com.ruoyi.common.constant.BaseSourceConstant;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysMenu;
 import com.ruoyi.common.core.domain.entity.SysUser;
@@ -30,7 +30,7 @@ import java.util.Set;
  *
  * @author ruoyi
  */
-@DS(DatasourceConstant.BASE)
+@DS(BaseSourceConstant.BASE)
 @RestController
 public class SysLoginController {
     @Autowired

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

@@ -2,7 +2,7 @@ package com.ruoyi.web.controller.system;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.constant.DatasourceConstant;
+import com.ruoyi.common.constant.BaseSourceConstant;
 import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -22,7 +22,7 @@ import java.util.List;
  *
  * @author ruoyi
  */
-@DS(DatasourceConstant.BASE)
+@DS(BaseSourceConstant.BASE)
 @RestController
 @RequestMapping("/system/menu")
 public class SysMenuController extends BaseController {

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

@@ -2,7 +2,7 @@ package com.ruoyi.web.controller.system;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.constant.DatasourceConstant;
+import com.ruoyi.common.constant.BaseSourceConstant;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
@@ -21,7 +21,7 @@ import java.util.List;
  *
  * @author ruoyi
  */
-@DS(DatasourceConstant.BASE)
+@DS(BaseSourceConstant.BASE)
 @RestController
 @RequestMapping("/system/notice")
 public class SysNoticeController extends BaseController {

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

@@ -2,7 +2,7 @@ package com.ruoyi.web.controller.system;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.constant.DatasourceConstant;
+import com.ruoyi.common.constant.BaseSourceConstant;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
@@ -23,7 +23,7 @@ import java.util.List;
  *
  * @author ruoyi
  */
-@DS(DatasourceConstant.BASE)
+@DS(BaseSourceConstant.BASE)
 @RestController
 @RequestMapping("/system/post")
 public class SysPostController extends BaseController {

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

@@ -3,7 +3,7 @@ package com.ruoyi.web.controller.system;
 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.constant.BaseSourceConstant;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysUser;
@@ -24,7 +24,7 @@ import org.springframework.web.multipart.MultipartFile;
  *
  * @author ruoyi
  */
-@DS(DatasourceConstant.BASE)
+@DS(BaseSourceConstant.BASE)
 @RestController
 @RequestMapping("/system/user/profile")
 public class SysProfileController extends BaseController {

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

@@ -1,7 +1,7 @@
 package com.ruoyi.web.controller.system;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
-import com.ruoyi.common.constant.DatasourceConstant;
+import com.ruoyi.common.constant.BaseSourceConstant;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.model.RegisterBody;
@@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.RestController;
  *
  * @author ruoyi
  */
-@DS(DatasourceConstant.BASE)
+@DS(BaseSourceConstant.BASE)
 @RestController
 public class SysRegisterController extends BaseController {
     @Autowired

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

@@ -2,7 +2,7 @@ package com.ruoyi.web.controller.system;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.constant.DatasourceConstant;
+import com.ruoyi.common.constant.BaseSourceConstant;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysDept;
@@ -32,7 +32,7 @@ import java.util.List;
  *
  * @author ruoyi
  */
-@DS(DatasourceConstant.BASE)
+@DS(BaseSourceConstant.BASE)
 @RestController
 @RequestMapping("/system/role")
 public class SysRoleController extends BaseController {

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

@@ -2,7 +2,7 @@ package com.ruoyi.web.controller.system;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.constant.DatasourceConstant;
+import com.ruoyi.common.constant.BaseSourceConstant;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysDept;
@@ -33,7 +33,7 @@ import java.util.stream.Collectors;
  *
  * @author ruoyi
  */
-@DS(DatasourceConstant.BASE)
+@DS(BaseSourceConstant.BASE)
 @RestController
 @RequestMapping("/system/user")
 public class SysUserController extends BaseController {

ruoyi-common/src/main/java/com/ruoyi/common/constant/BaseSourceConstant.java

@@ -0,0 +1,10 @@
+package com.ruoyi.common.constant;
+
+/**
+ * 数据源常量
+ */
+public interface BaseSourceConstant {
+
+    String BASE = "base";
+
+}

ruoyi-common/src/main/java/com/ruoyi/common/constant/DatasourceConstant.java

@@ -1,18 +0,0 @@
-package com.ruoyi.common.constant;
-
-/**
- * 数据源常量
- */
-public interface DatasourceConstant {
-
-    // /**
-    //  * 主数据源
-    //  */
-    // String MASTER_NAME = "master";
-
-    /**
-     * 从数据源
-     */
-    String BASE = "base";
-
-}

ruoyi-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java

@@ -2,7 +2,7 @@ package com.ruoyi.framework.manager.factory;
 
 import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
 import com.ruoyi.common.constant.Constants;
-import com.ruoyi.common.constant.DatasourceConstant;
+import com.ruoyi.common.constant.BaseSourceConstant;
 import com.ruoyi.common.utils.LogUtils;
 import com.ruoyi.common.utils.ServletUtils;
 import com.ruoyi.common.utils.StringUtils;
@@ -65,7 +65,7 @@ public class AsyncFactory {
                 logininfor.setOs(os);
                 logininfor.setMsg(message);
 
-                DynamicDataSourceContextHolder.push(DatasourceConstant.BASE);
+                DynamicDataSourceContextHolder.push(BaseSourceConstant.BASE);
                 // 日志状态
                 if (StringUtils.equalsAny(status, Constants.LOGIN_SUCCESS, Constants.LOGOUT, Constants.REGISTER)) {
                     logininfor.setStatus(Constants.SUCCESS);
@@ -90,7 +90,7 @@ public class AsyncFactory {
         return new TimerTask() {
             @Override
             public void run() {
-                DynamicDataSourceContextHolder.push(DatasourceConstant.BASE);
+                DynamicDataSourceContextHolder.push(BaseSourceConstant.BASE);
                 // 远程查询操作地点
                 operLog.setOperLocation(AddressUtils.getRealAddressByIP(operLog.getOperIp()));
                 SpringUtils.getBean(ISysOperLogService.class).insertOperlog(operLog);

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java

@@ -3,7 +3,7 @@ package com.ruoyi.system.service.impl;
 import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.constant.CacheConstants;
-import com.ruoyi.common.constant.DatasourceConstant;
+import com.ruoyi.common.constant.BaseSourceConstant;
 import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.common.core.text.Convert;
@@ -35,7 +35,7 @@ public class SysConfigServiceImpl extends ServiceImpl<SysConfigMapper, SysConfig
      */
     @PostConstruct
     public void init() {
-        DynamicDataSourceContextHolder.push(DatasourceConstant.BASE);
+        DynamicDataSourceContextHolder.push(BaseSourceConstant.BASE);
         loadingConfigCache();
         DynamicDataSourceContextHolder.clear();
     }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java

@@ -2,7 +2,7 @@ package com.ruoyi.system.service.impl;
 
 import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.common.constant.DatasourceConstant;
+import com.ruoyi.common.constant.BaseSourceConstant;
 import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.domain.entity.SysDictData;
 import com.ruoyi.common.core.domain.entity.SysDictType;
@@ -41,7 +41,7 @@ public class SysDictTypeServiceImpl extends ServiceImpl<SysDictTypeMapper, SysDi
      */
     @PostConstruct
     public void init() {
-        DynamicDataSourceContextHolder.push(DatasourceConstant.BASE);
+        DynamicDataSourceContextHolder.push(BaseSourceConstant.BASE);
         loadingDictCache();
         DynamicDataSourceContextHolder.clear();
     }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -4,7 +4,7 @@ import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.annotation.DataScope;
 import com.ruoyi.common.annotation.TenantIgnore;
-import com.ruoyi.common.constant.DatasourceConstant;
+import com.ruoyi.common.constant.BaseSourceConstant;
 import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.domain.entity.SysRole;
 import com.ruoyi.common.core.domain.entity.SysUser;
@@ -485,7 +485,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     }
 
     @Transactional(propagation = Propagation.REQUIRES_NEW)
-    @DS(DatasourceConstant.BASE)
+    @DS(BaseSourceConstant.BASE)
     @Override
     public List<SysUser> getListByUserId(List<Long> userIdList) {
         return listByIds(userIdList);