diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/config/datasource/DynamicDataSourceContextHolder.java b/ruoyi-common/src/main/java/com/ruoyi/common/config/datasource/DynamicDataSourceContextHolder.java index 968a9692..6bc9e617 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/config/datasource/DynamicDataSourceContextHolder.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/config/datasource/DynamicDataSourceContextHolder.java @@ -21,7 +21,7 @@ public class DynamicDataSourceContextHolder /** * 设置数据源的变量 */ - public static void setDateSoureType(String dsType) + public static void setDataSourceType(String dsType) { log.info("切换到{}数据源", dsType); CONTEXT_HOLDER.set(dsType); @@ -30,7 +30,7 @@ public class DynamicDataSourceContextHolder /** * 获得数据源的变量 */ - public static String getDateSoureType() + public static String getDataSourceType() { return CONTEXT_HOLDER.get(); } @@ -38,7 +38,7 @@ public class DynamicDataSourceContextHolder /** * 清空数据源变量 */ - public static void clearDateSoureType() + public static void clearDataSourceType() { CONTEXT_HOLDER.remove(); } diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java index 27717680..89d28fac 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java @@ -43,7 +43,7 @@ public class DataSourceAspect if (StringUtils.isNotNull(dataSource)) { - DynamicDataSourceContextHolder.setDateSoureType(dataSource.value().name()); + DynamicDataSourceContextHolder.setDataSourceType(dataSource.value().name()); } try @@ -53,7 +53,7 @@ public class DataSourceAspect finally { // 销毁数据源 在执行方法之后 - DynamicDataSourceContextHolder.clearDateSoureType(); + DynamicDataSourceContextHolder.clearDataSourceType(); } } } diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/datasource/DynamicDataSource.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/datasource/DynamicDataSource.java index 675a335e..a5f76407 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/datasource/DynamicDataSource.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/datasource/DynamicDataSource.java @@ -22,6 +22,6 @@ public class DynamicDataSource extends AbstractRoutingDataSource @Override protected Object determineCurrentLookupKey() { - return DynamicDataSourceContextHolder.getDateSoureType(); + return DynamicDataSourceContextHolder.getDataSourceType(); } } \ No newline at end of file