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..95d5491c 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 @@ -43,7 +43,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 +79,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 ConcurrentHashMap<>()); + 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 ConcurrentHashMap<>()); + Object mapperObject = MapUtil.computeIfAbsent(mapperObjects, mapperClass, clazz -> Proxy.newProxyInstance(mapperClass.getClassLoader() , new Class[]{mapperClass} , new MapperHandler(environmentId, mapperClass)));