dataSourceType修改

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

@@ -18,7 +18,7 @@ import java.util.List;
  * @author 
  * @since 2023-03-17
  */
-@DS(DatasourceConstant.SLAVE_NAME)
+@DS(DatasourceConstant.BASE)
 @RestController
 @RequestMapping("/areaInfo")
 public class AreaInfoController {

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

@@ -39,7 +39,7 @@ public class AreaInfoServiceImpl extends ServiceImpl<AreaInfoMapper, AreaInfo> i
     }
 
     @Transactional(propagation = Propagation.REQUIRES_NEW)
-    @DS(DatasourceConstant.SLAVE_NAME)
+    @DS(DatasourceConstant.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

@@ -27,7 +27,7 @@ import java.util.concurrent.TimeUnit;
  *
  * @author ruoyi
  */
-@DS(DatasourceConstant.SLAVE_NAME)
+@DS(DatasourceConstant.BASE)
 @RestController
 public class CaptchaController {
     @Resource(name = "captchaProducer")

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

@@ -29,7 +29,7 @@ import java.util.List;
  *
  * @author ruoyi
  */
-@DS(DatasourceConstant.SLAVE_NAME)
+@DS(DatasourceConstant.BASE)
 @RestController
 @RequestMapping("/common")
 public class CommonController {

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

@@ -19,7 +19,7 @@ import java.util.*;
  *
  * @author ruoyi
  */
-@DS(DatasourceConstant.SLAVE_NAME)
+@DS(DatasourceConstant.BASE)
 @RestController
 @RequestMapping("/monitor/cache")
 public class CacheController {

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

@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RestController;
  *
  * @author ruoyi
  */
-@DS(DatasourceConstant.SLAVE_NAME)
+@DS(DatasourceConstant.BASE)
 @RestController
 @RequestMapping("/monitor/server")
 public class ServerController {

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

@@ -23,7 +23,7 @@ import java.util.List;
  *
  * @author ruoyi
  */
-@DS(DatasourceConstant.SLAVE_NAME)
+@DS(DatasourceConstant.BASE)
 @RestController
 @RequestMapping("/monitor/logininfor")
 public class SysLogininforController extends BaseController {

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

@@ -22,7 +22,7 @@ import java.util.List;
  *
  * @author ruoyi
  */
-@DS(DatasourceConstant.SLAVE_NAME)
+@DS(DatasourceConstant.BASE)
 @RestController
 @RequestMapping("/monitor/operlog")
 public class SysOperlogController extends BaseController {

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

@@ -27,7 +27,7 @@ import java.util.List;
  *
  * @author ruoyi
  */
-@DS(DatasourceConstant.SLAVE_NAME)
+@DS(DatasourceConstant.BASE)
 @RestController
 @RequestMapping("/monitor/online")
 public class SysUserOnlineController extends BaseController {

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

@@ -23,7 +23,7 @@ import java.util.List;
  *
  * @author ruoyi
  */
-@DS(DatasourceConstant.SLAVE_NAME)
+@DS(DatasourceConstant.BASE)
 @RestController
 @RequestMapping("/system/config")
 public class SysConfigController extends BaseController {

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

@@ -23,7 +23,7 @@ import java.util.List;
  *
  * @author ruoyi
  */
-@DS(DatasourceConstant.SLAVE_NAME)
+@DS(DatasourceConstant.BASE)
 @RestController
 @RequestMapping("/system/dept")
 public class SysDeptController extends BaseController {

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

@@ -26,7 +26,7 @@ import java.util.List;
  *
  * @author ruoyi
  */
-@DS(DatasourceConstant.SLAVE_NAME)
+@DS(DatasourceConstant.BASE)
 @RestController
 @RequestMapping("/system/dict/data")
 public class SysDictDataController extends BaseController {

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

@@ -23,7 +23,7 @@ import java.util.List;
  *
  * @author ruoyi
  */
-@DS(DatasourceConstant.SLAVE_NAME)
+@DS(DatasourceConstant.BASE)
 @RestController
 @RequestMapping("/system/dict/type")
 public class SysDictTypeController extends BaseController {

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

@@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RestController;
  *
  * @author ruoyi
  */
-@DS(DatasourceConstant.SLAVE_NAME)
+@DS(DatasourceConstant.BASE)
 @RestController
 public class SysIndexController {
 

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

@@ -26,7 +26,7 @@ import java.util.Set;
  *
  * @author ruoyi
  */
-@DS(DatasourceConstant.SLAVE_NAME)
+@DS(DatasourceConstant.BASE)
 @RestController
 public class SysLoginController {
 

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

@@ -22,7 +22,7 @@ import java.util.List;
  *
  * @author ruoyi
  */
-@DS(DatasourceConstant.SLAVE_NAME)
+@DS(DatasourceConstant.BASE)
 @RestController
 @RequestMapping("/system/menu")
 public class SysMenuController extends BaseController {

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

@@ -21,7 +21,7 @@ import java.util.List;
  *
  * @author ruoyi
  */
-@DS(DatasourceConstant.SLAVE_NAME)
+@DS(DatasourceConstant.BASE)
 @RestController
 @RequestMapping("/system/notice")
 public class SysNoticeController extends BaseController {

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

@@ -23,7 +23,7 @@ import java.util.List;
  *
  * @author ruoyi
  */
-@DS(DatasourceConstant.SLAVE_NAME)
+@DS(DatasourceConstant.BASE)
 @RestController
 @RequestMapping("/system/post")
 public class SysPostController extends BaseController {

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

@@ -24,7 +24,7 @@ import org.springframework.web.multipart.MultipartFile;
  *
  * @author ruoyi
  */
-@DS(DatasourceConstant.SLAVE_NAME)
+@DS(DatasourceConstant.BASE)
 @RestController
 @RequestMapping("/system/user/profile")
 public class SysProfileController extends BaseController {

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

@@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.RestController;
  *
  * @author ruoyi
  */
-@DS(DatasourceConstant.SLAVE_NAME)
+@DS(DatasourceConstant.BASE)
 @RestController
 public class SysRegisterController extends BaseController {
 

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

@@ -32,7 +32,7 @@ import java.util.List;
  *
  * @author ruoyi
  */
-@DS(DatasourceConstant.SLAVE_NAME)
+@DS(DatasourceConstant.BASE)
 @RestController
 @RequestMapping("/system/role")
 public class SysRoleController extends BaseController {

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

@@ -33,7 +33,7 @@ import java.util.stream.Collectors;
  *
  * @author ruoyi
  */
-@DS(DatasourceConstant.SLAVE_NAME)
+@DS(DatasourceConstant.BASE)
 @RestController
 @RequestMapping("/system/user")
 public class SysUserController extends BaseController {

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

@@ -23,7 +23,7 @@ import java.util.List;
  * @author zlj
  * @since 2023-03-14
  */
-@DS(DatasourceConstant.SLAVE_NAME)
+@DS(DatasourceConstant.BASE)
 @RestController
 @RequestMapping("/fileInfo")
 public class FileInfoController {

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

@@ -142,7 +142,7 @@ public class FileInfoServiceImpl extends ServiceImpl<FileInfoMapper, FileInfo> i
      * @param businessType 业务文件类型
      */
     @Transactional(propagation = Propagation.REQUIRES_NEW)
-    @DS(DatasourceConstant.SLAVE_NAME)
+    @DS(DatasourceConstant.BASE)
     @Override
     public void saveFile(List<ObsFile> obsFileList, Long businessId, Integer businessType) {
         // 切换到从库
@@ -167,7 +167,7 @@ public class FileInfoServiceImpl extends ServiceImpl<FileInfoMapper, FileInfo> i
      * @param businessType 业务文件类型
      */
     @Transactional(propagation = Propagation.REQUIRES_NEW)
-    @DS(DatasourceConstant.SLAVE_NAME)
+    @DS(DatasourceConstant.BASE)
     @Override
     public void editFile(List<ObsFile> obsFileList, Long businessId, Integer businessType) {
         if (obsFileList.size() == 0) {
@@ -189,7 +189,7 @@ public class FileInfoServiceImpl extends ServiceImpl<FileInfoMapper, FileInfo> i
      * @param businessType 业务文件类型
      */
     @Transactional(propagation = Propagation.REQUIRES_NEW)
-    @DS(DatasourceConstant.SLAVE_NAME)
+    @DS(DatasourceConstant.BASE)
     @Override
     public void removeFile(Long businessId, Integer businessType) {
         this.remove(q -> q
@@ -203,7 +203,7 @@ public class FileInfoServiceImpl extends ServiceImpl<FileInfoMapper, FileInfo> i
      * @param businessId 业务id
      */
     @Transactional(propagation = Propagation.REQUIRES_NEW)
-    @DS(DatasourceConstant.SLAVE_NAME)
+    @DS(DatasourceConstant.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

@@ -5,23 +5,12 @@ 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.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.expression.MapAccessor;
-import org.springframework.expression.ExpressionParser;
-import org.springframework.expression.common.TemplateParserContext;
-import org.springframework.expression.spel.standard.SpelExpression;
-import org.springframework.expression.spel.standard.SpelExpressionParser;
-import org.springframework.expression.spel.support.StandardEvaluationContext;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
 
 /**
  * <p>
@@ -31,7 +20,7 @@ import java.util.Map;
  * @author
  * @since 2023-03-15
  */
-@DS(DatasourceConstant.SLAVE_NAME)
+@DS(DatasourceConstant.BASE)
 @RestController
 @RequestMapping("/flowDefinition")
 public class FlowDefinitionController {

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

@@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.*;
  * @author 
  * @since 2023-03-15
  */
-@DS(DatasourceConstant.SLAVE_NAME)
+@DS(DatasourceConstant.BASE)
 @RestController
 @RequestMapping("/flowDefinitionNode")
 public class FlowDefinitionNodeController {

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

@@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @author
  * @since 2023-03-15
  */
-@DS(DatasourceConstant.SLAVE_NAME)
+@DS(DatasourceConstant.BASE)
 @RestController
 @RequestMapping("/flowInfo")
 public class FlowInfoController {

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

@@ -10,7 +10,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-@DS(DatasourceConstant.SLAVE_NAME)
+@DS(DatasourceConstant.BASE)
 @RestController
 @RequestMapping("/flowProcess")
 public class FlowProcessController {

hx-flow/src/main/java/com/fjhx/flow/service/flow/impl/FlowProcessServiceImpl.java

@@ -112,7 +112,7 @@ public class FlowProcessServiceImpl implements FlowProcessService {
             FlowThreadLocalUtil.setFlowId(flowId);
 
             // 切换到主库执行流程开始节点逻辑
-            DynamicDataSourceContextHolder.push(DatasourceConstant.MASTER_NAME);
+            // DynamicDataSourceContextHolder.push(DatasourceConstant.MASTER_NAME);
 
             FlowExample flowExample = new FlowExample();
             List<FlowExampleDetail> flowExampleDetailList = new ArrayList<>();
@@ -156,7 +156,7 @@ public class FlowProcessServiceImpl implements FlowProcessService {
             }
 
             // 切换到从库执行流程信息保存
-            DynamicDataSourceContextHolder.push(DatasourceConstant.SLAVE_NAME);
+            DynamicDataSourceContextHolder.push(DatasourceConstant.BASE);
 
             flowExample.setTitle(StrUtil.format(flowDefinition.getTitleTemplate(), templateMap, false));
             flowExample.setDefinitionId(flowDefinition.getId());

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

@@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.*;
 import java.util.List;
 
 @TenantIgnore
-@DS(DatasourceConstant.SLAVE_NAME)
+@DS(DatasourceConstant.BASE)
 @RestController
 @RequestMapping("/tenantDept")
 public class DetpTenantController {

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

@@ -28,7 +28,7 @@ import org.springframework.web.bind.annotation.*;
 import java.util.List;
 
 @TenantIgnore
-@DS(DatasourceConstant.SLAVE_NAME)
+@DS(DatasourceConstant.BASE)
 @RestController
 @RequestMapping("/tenantRole")
 public class RoleTenantController extends BaseController {

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

@@ -34,7 +34,7 @@ import java.util.List;
  * @since 2023-03-15
  */
 @TenantIgnore
-@DS(DatasourceConstant.SLAVE_NAME)
+@DS(DatasourceConstant.BASE)
 @RestController
 @RequestMapping("/tenantInfo")
 public class TenantInfoController {

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

@@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.*;
 import java.util.List;
 
 @TenantIgnore
-@DS(DatasourceConstant.SLAVE_NAME)
+@DS(DatasourceConstant.BASE)
 @RestController
 @RequestMapping("/tenantUser")
 public class UserTenantController extends BaseController {

ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java

@@ -2,7 +2,6 @@ package com.ruoyi;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 
 /**
  * 启动程序

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

@@ -27,7 +27,7 @@ import java.util.concurrent.TimeUnit;
  *
  * @author ruoyi
  */
-@DS(DatasourceConstant.SLAVE_NAME)
+@DS(DatasourceConstant.BASE)
 @RestController
 public class CaptchaController {
     @Resource(name = "captchaProducer")

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

@@ -29,7 +29,7 @@ import java.util.List;
  *
  * @author ruoyi
  */
-@DS(DatasourceConstant.SLAVE_NAME)
+@DS(DatasourceConstant.BASE)
 @RestController
 @RequestMapping("/common")
 public class CommonController {

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

@@ -19,7 +19,7 @@ import java.util.*;
  *
  * @author ruoyi
  */
-@DS(DatasourceConstant.SLAVE_NAME)
+@DS(DatasourceConstant.BASE)
 @RestController
 @RequestMapping("/monitor/cache")
 public class CacheController {

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

@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RestController;
  *
  * @author ruoyi
  */
-@DS(DatasourceConstant.SLAVE_NAME)
+@DS(DatasourceConstant.BASE)
 @RestController
 @RequestMapping("/monitor/server")
 public class ServerController {

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

@@ -23,7 +23,7 @@ import java.util.List;
  *
  * @author ruoyi
  */
-@DS(DatasourceConstant.SLAVE_NAME)
+@DS(DatasourceConstant.BASE)
 @RestController
 @RequestMapping("/monitor/logininfor")
 public class SysLogininforController extends BaseController {

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

@@ -22,7 +22,7 @@ import java.util.List;
  *
  * @author ruoyi
  */
-@DS(DatasourceConstant.SLAVE_NAME)
+@DS(DatasourceConstant.BASE)
 @RestController
 @RequestMapping("/monitor/operlog")
 public class SysOperlogController extends BaseController {

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

@@ -27,7 +27,7 @@ import java.util.List;
  *
  * @author ruoyi
  */
-@DS(DatasourceConstant.SLAVE_NAME)
+@DS(DatasourceConstant.BASE)
 @RestController
 @RequestMapping("/monitor/online")
 public class SysUserOnlineController extends BaseController {

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

@@ -23,7 +23,7 @@ import java.util.List;
  *
  * @author ruoyi
  */
-@DS(DatasourceConstant.SLAVE_NAME)
+@DS(DatasourceConstant.BASE)
 @RestController
 @RequestMapping("/system/config")
 public class SysConfigController extends BaseController {

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

@@ -23,7 +23,7 @@ import java.util.List;
  *
  * @author ruoyi
  */
-@DS(DatasourceConstant.SLAVE_NAME)
+@DS(DatasourceConstant.BASE)
 @RestController
 @RequestMapping("/system/dept")
 public class SysDeptController extends BaseController {

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

@@ -26,7 +26,7 @@ import java.util.List;
  *
  * @author ruoyi
  */
-@DS(DatasourceConstant.SLAVE_NAME)
+@DS(DatasourceConstant.BASE)
 @RestController
 @RequestMapping("/system/dict/data")
 public class SysDictDataController extends BaseController {

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

@@ -23,7 +23,7 @@ import java.util.List;
  *
  * @author ruoyi
  */
-@DS(DatasourceConstant.SLAVE_NAME)
+@DS(DatasourceConstant.BASE)
 @RestController
 @RequestMapping("/system/dict/type")
 public class SysDictTypeController extends BaseController {

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

@@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RestController;
  *
  * @author ruoyi
  */
-@DS(DatasourceConstant.SLAVE_NAME)
+@DS(DatasourceConstant.BASE)
 @RestController
 public class SysIndexController {
     /**

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

@@ -26,7 +26,7 @@ import java.util.Set;
  *
  * @author ruoyi
  */
-@DS(DatasourceConstant.SLAVE_NAME)
+@DS(DatasourceConstant.BASE)
 @RestController
 public class SysLoginController {
     @Autowired

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

@@ -22,7 +22,7 @@ import java.util.List;
  *
  * @author ruoyi
  */
-@DS(DatasourceConstant.SLAVE_NAME)
+@DS(DatasourceConstant.BASE)
 @RestController
 @RequestMapping("/system/menu")
 public class SysMenuController extends BaseController {

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

@@ -21,7 +21,7 @@ import java.util.List;
  *
  * @author ruoyi
  */
-@DS(DatasourceConstant.SLAVE_NAME)
+@DS(DatasourceConstant.BASE)
 @RestController
 @RequestMapping("/system/notice")
 public class SysNoticeController extends BaseController {

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

@@ -23,7 +23,7 @@ import java.util.List;
  *
  * @author ruoyi
  */
-@DS(DatasourceConstant.SLAVE_NAME)
+@DS(DatasourceConstant.BASE)
 @RestController
 @RequestMapping("/system/post")
 public class SysPostController extends BaseController {

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

@@ -24,7 +24,7 @@ import org.springframework.web.multipart.MultipartFile;
  *
  * @author ruoyi
  */
-@DS(DatasourceConstant.SLAVE_NAME)
+@DS(DatasourceConstant.BASE)
 @RestController
 @RequestMapping("/system/user/profile")
 public class SysProfileController extends BaseController {

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

@@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.RestController;
  *
  * @author ruoyi
  */
-@DS(DatasourceConstant.SLAVE_NAME)
+@DS(DatasourceConstant.BASE)
 @RestController
 public class SysRegisterController extends BaseController {
     @Autowired

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

@@ -32,7 +32,7 @@ import java.util.List;
  *
  * @author ruoyi
  */
-@DS(DatasourceConstant.SLAVE_NAME)
+@DS(DatasourceConstant.BASE)
 @RestController
 @RequestMapping("/system/role")
 public class SysRoleController extends BaseController {

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

@@ -33,7 +33,7 @@ import java.util.stream.Collectors;
  *
  * @author ruoyi
  */
-@DS(DatasourceConstant.SLAVE_NAME)
+@DS(DatasourceConstant.BASE)
 @RestController
 @RequestMapping("/system/user")
 public class SysUserController extends BaseController {

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

@@ -5,14 +5,14 @@ package com.ruoyi.common.constant;
  */
 public interface DatasourceConstant {
 
-    /**
-     * 主数据源
-     */
-    String MASTER_NAME = "master";
+    // /**
+    //  * 主数据源
+    //  */
+    // String MASTER_NAME = "master";
 
     /**
      * 从数据源
      */
-    String SLAVE_NAME = "slave";
+    String BASE = "base";
 
 }

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

@@ -65,7 +65,7 @@ public class AsyncFactory {
                 logininfor.setOs(os);
                 logininfor.setMsg(message);
 
-                DynamicDataSourceContextHolder.push(DatasourceConstant.SLAVE_NAME);
+                DynamicDataSourceContextHolder.push(DatasourceConstant.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.SLAVE_NAME);
+                DynamicDataSourceContextHolder.push(DatasourceConstant.BASE);
                 // 远程查询操作地点
                 operLog.setOperLocation(AddressUtils.getRealAddressByIP(operLog.getOperIp()));
                 SpringUtils.getBean(ISysOperLogService.class).insertOperlog(operLog);

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

@@ -1,6 +1,6 @@
 package com.ruoyi.framework.mybatis.interceptor;
 
-import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.druid.pool.DruidDataSource;
 import com.alibaba.druid.stat.JdbcDataSourceStat;
 import com.baomidou.dynamic.datasource.DynamicRoutingDataSource;
@@ -12,7 +12,7 @@ import com.baomidou.mybatisplus.core.toolkit.PluginUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.baomidou.mybatisplus.extension.plugins.inner.BaseMultiTableInnerInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.inner.InnerInterceptor;
-import com.ruoyi.common.constant.DatasourceConstant;
+import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.framework.mybatis.holder.LogicHolder;
 import lombok.extern.slf4j.Slf4j;
 import net.sf.jsqlparser.JSQLParserException;
@@ -295,9 +295,17 @@ public class LogicInterceptor extends BaseMultiTableInnerInterceptor implements
         }
 
         // 执行sql的数据源名称
-        String dataSourceType = ObjectUtil.defaultIfBlank(DynamicDataSourceContextHolder.peek(), DatasourceConstant.MASTER_NAME);
+        String dataSourceType = DynamicDataSourceContextHolder.peek();
+        if (StrUtil.isBlank(dataSourceType)) {
+            throw new ServiceException("未指定数据源");
+        }
+
         // 获取数据源中包含逻辑删除字段的表名
         List<String> tableNameList = includeLogicIdTableNameMap.get(dataSourceType);
+        if (tableNameList == null) {
+            throw new ServiceException("未找到DS数据源");
+        }
+
         // 如果不包涵则跳过拼接逻辑删除
         return !tableNameList.contains(name);
     }

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

@@ -1,6 +1,6 @@
 package com.ruoyi.framework.mybatis.interceptor;
 
-import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.druid.pool.DruidDataSource;
 import com.alibaba.druid.stat.JdbcDataSourceStat;
 import com.baomidou.dynamic.datasource.DynamicRoutingDataSource;
@@ -8,7 +8,7 @@ import com.baomidou.dynamic.datasource.ds.ItemDataSource;
 import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
 import com.baomidou.mybatisplus.extension.plugins.handler.TenantLineHandler;
 import com.baomidou.mybatisplus.extension.plugins.inner.TenantLineInnerInterceptor;
-import com.ruoyi.common.constant.DatasourceConstant;
+import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.framework.mybatis.holder.TenantHolder;
 import net.sf.jsqlparser.expression.Expression;
@@ -68,9 +68,17 @@ public class TenantInterceptor extends TenantLineInnerInterceptor {
                 }
 
                 // 获取当前线程处理的数据源类型
-                String dataSourceType = ObjectUtil.defaultIfBlank(DynamicDataSourceContextHolder.peek(), DatasourceConstant.MASTER_NAME);
+                String dataSourceType = DynamicDataSourceContextHolder.peek();
+                if (StrUtil.isBlank(dataSourceType)) {
+                    throw new ServiceException("未指定数据源");
+                }
+
                 // 获取当前数据原中包涵租户字段的表名
                 List<String> tableNameList = includeTenantIdTableNameMap.get(dataSourceType);
+                if (tableNameList == null) {
+                    throw new ServiceException("未找到DS数据源");
+                }
+
                 return !tableNameList.contains(tableName);
             }
 

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

@@ -35,7 +35,7 @@ public class SysConfigServiceImpl extends ServiceImpl<SysConfigMapper, SysConfig
      */
     @PostConstruct
     public void init() {
-        DynamicDataSourceContextHolder.push(DatasourceConstant.SLAVE_NAME);
+        DynamicDataSourceContextHolder.push(DatasourceConstant.BASE);
         loadingConfigCache();
         DynamicDataSourceContextHolder.clear();
     }

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

@@ -41,7 +41,7 @@ public class SysDictTypeServiceImpl extends ServiceImpl<SysDictTypeMapper, SysDi
      */
     @PostConstruct
     public void init() {
-        DynamicDataSourceContextHolder.push(DatasourceConstant.SLAVE_NAME);
+        DynamicDataSourceContextHolder.push(DatasourceConstant.BASE);
         loadingDictCache();
         DynamicDataSourceContextHolder.clear();
     }

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

@@ -485,7 +485,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     }
 
     @Transactional(propagation = Propagation.REQUIRES_NEW)
-    @DS(DatasourceConstant.SLAVE_NAME)
+    @DS(DatasourceConstant.BASE)
     @Override
     public List<SysUser> getListByUserId(List<Long> userIdList) {
         return listByIds(userIdList);