admin/mybatis-flex
1
0
Fork 0
mirror of https://gitee.com/mybatis-flex/mybatis-flex.git synced 2025-12-07 00:58:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

!206 fix：多数据源嵌套使用问题

Browse Source 
Merge pull request !206 from barql/272378774@qq.com
This commit is contained in:
Michael Yang 2023-07-29 02:36:53 +00:00 committed by Gitee
commit 0aa5443ccf
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
mybatis-flex-core/src/main/java/com/mybatisflex/core/datasource/DataSourceKey.java
View File

@ -19,13 +19,24 @@ import java.util.function.Supplier;
public class DataSourceKey {
private static final ThreadLocal<String> keyThreadLocal = new ThreadLocal<>();
public static String manualKey;
private DataSourceKey() {
}
private static final ThreadLocal<String> keyThreadLocal = new ThreadLocal<>();
public static void use(String dataSourceKey) {
keyThreadLocal.set(dataSourceKey.trim());
manualKey = dataSourceKey;
}
public static void use(String dataSourceKey, boolean isManual) {
if (isManual)
use(dataSourceKey);
else {
keyThreadLocal.set(dataSourceKey.trim());
}
}
public static <T> T use(String dataSourceKey, Supplier<T> supplier) {
@ -48,6 +59,7 @@ public class DataSourceKey {
public static void clear() {
keyThreadLocal.remove();
manualKey = null;
}
public static String get() {

4
mybatis-flex-spring/src/main/java/com/mybatisflex/spring/datasource/DataSourceInterceptor.java
View File

@ -43,7 +43,7 @@ public class DataSourceInterceptor implements MethodInterceptor {
@Override
public Object invoke(MethodInvocation invocation) throws Throwable {
String dsKey = DataSourceKey.get();
String dsKey = DataSourceKey.manualKey;
if (StringUtil.isNotBlank(dsKey)) {
return invocation.proceed();
}
@ -53,7 +53,7 @@ public class DataSourceInterceptor implements MethodInterceptor {
return invocation.proceed();
}
DataSourceKey.use(dsKey);
DataSourceKey.use(dsKey, false);
try {
return invocation.proceed();
} finally {