diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/mybatis/Mappers.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/mybatis/Mappers.java index 89b1da1d..f30512ec 100644 --- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/mybatis/Mappers.java +++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/mybatis/Mappers.java @@ -28,6 +28,7 @@ import com.mybatisflex.core.util.MapUtil; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; import java.lang.reflect.Proxy; +import java.util.HashMap; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -43,7 +44,7 @@ public class Mappers { private Mappers() { } - private static final Map, Object> MAPPER_OBJECTS = new ConcurrentHashMap<>(); + private static final Map, Object>> MAPPER_OBJECTS_OF_ENV = new ConcurrentHashMap<>(); private static final Map, Class> ENTITY_MAPPER_MAP = new ConcurrentHashMap<>(); @@ -79,14 +80,16 @@ public class Mappers { * @return {@link BaseMapper} 对象 */ public static M ofMapperClass(Class mapperClass) { - Object mapperObject = MapUtil.computeIfAbsent(MAPPER_OBJECTS, mapperClass, clazz -> + Map, Object> mapperObjects = MapUtil.computeIfAbsent(MAPPER_OBJECTS_OF_ENV, "default", envId -> new HashMap<>()); + Object mapperObject = MapUtil.computeIfAbsent(mapperObjects, mapperClass, clazz -> Proxy.newProxyInstance(mapperClass.getClassLoader() , new Class[]{mapperClass} , new MapperHandler(mapperClass))); return (M) mapperObject; } public static M ofMapperClass(String environmentId, Class mapperClass) { - Object mapperObject = MapUtil.computeIfAbsent(MAPPER_OBJECTS, mapperClass, clazz -> + Map, Object> mapperObjects = MapUtil.computeIfAbsent(MAPPER_OBJECTS_OF_ENV, environmentId, envId -> new HashMap<>()); + Object mapperObject = MapUtil.computeIfAbsent(mapperObjects, mapperClass, clazz -> Proxy.newProxyInstance(mapperClass.getClassLoader() , new Class[]{mapperClass} , new MapperHandler(environmentId, mapperClass)));