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

修改设置问题

Browse Source
This commit is contained in:
life 2023-08-19 10:09:23 +08:00
parent 0a2e2f9799
commit e5fecf7ed8
4 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mybatis-flex-core/pom.xml
View File

@ -71,11 +71,6 @@
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>transmittable-thread-local</artifactId>
<version>2.14.2</version>
</dependency>
<!--optional end-->
<dependency>

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

@ -15,7 +15,6 @@
*/
package com.mybatisflex.core.datasource;
import com.alibaba.ttl.TransmittableThreadLocal;
import java.util.function.Supplier;
/**
@ -26,12 +25,12 @@ public class DataSourceKey {
/**
* 通过注解设置的 key
*/
private static final ThreadLocal<String> annotationKeyThreadLocal = new TransmittableThreadLocal<>();
private static ThreadLocal<String> annotationKeyThreadLocal = new ThreadLocal<>();
/**
* 通过手动编码指定的 key
*/
private static final ThreadLocal<String> manualKeyThreadLocal = new TransmittableThreadLocal<>();
private static ThreadLocal<String> manualKeyThreadLocal = new ThreadLocal<>();
public static String manualKey;
@ -82,4 +81,11 @@ public class DataSourceKey {
return key != null ? key : annotationKeyThreadLocal.get();
}
public static void setAnnotationKeyThreadLocal(ThreadLocal<String> annotationKeyThreadLocal) {
DataSourceKey.annotationKeyThreadLocal = annotationKeyThreadLocal;
}
public static void setManualKeyThreadLocal(ThreadLocal<String> manualKeyThreadLocal) {
DataSourceKey.manualKeyThreadLocal = manualKeyThreadLocal;
}
}

6
mybatis-flex-test/mybatis-flex-native-test/pom.xml
View File

@ -108,6 +108,12 @@
<!-- <scope>test</scope>-->
<!-- </dependency>-->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>transmittable-thread-local</artifactId>
<version>2.14.2</version>
</dependency>
<dependency>
<groupId>org.assertj</groupId>

3
mybatis-flex-test/mybatis-flex-native-test/src/main/java/com/mybatisflex/test/MultiThreadsTest.java
View File

@ -1,5 +1,6 @@
package com.mybatisflex.test;
import com.alibaba.ttl.TransmittableThreadLocal;
import com.mybatisflex.core.MybatisFlexBootstrap;
import com.mybatisflex.core.audit.AuditManager;
import com.mybatisflex.core.audit.ConsoleMessageCollector;
@ -20,6 +21,8 @@ import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
public class MultiThreadsTest {
public static void main(String[] args) {
DataSourceKey.setAnnotationKeyThreadLocal(new TransmittableThreadLocal<>());
DataSourceKey.setManualKeyThreadLocal(new TransmittableThreadLocal<>());
DataSource dataSource = new EmbeddedDatabaseBuilder()
.setType(EmbeddedDatabaseType.H2)
.setName("db1")