github
/
RuoYi
mirror of https://gitee.com/y_project/RuoYi.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

!79 修正DynamicDataSourceContextHolder类中三处DataSource拼写错误 

Merge pull request !79 from dhx920/master
pull/79/MERGE
dhx920 2019-03-18 11:18:31 +08:00 committed by 若依
parent f7a9f33882 316b126c8f
commit fc51f0ce80
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ruoyi-common/src/main/java/com/ruoyi/common/config/datasource/DynamicDataSourceContextHolder.java
View File

@ -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();
}

4
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java
View File

@ -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();
}
}
}

2
ruoyi-framework/src/main/java/com/ruoyi/framework/datasource/DynamicDataSource.java
View File

@ -22,6 +22,6 @@ public class DynamicDataSource extends AbstractRoutingDataSource
@Override
protected Object determineCurrentLookupKey()
{
return DynamicDataSourceContextHolder.getDateSoureType();
return DynamicDataSourceContextHolder.getDataSourceType();
}
}