From c969ee388de0fa5ff7a5fd338d6dae03febe9b26 Mon Sep 17 00:00:00 2001
From: wcc1433 <37837522+wcc1433@users.noreply.github.com>
Date: Sun, 25 May 2025 15:40:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E7=8E=AF=E5=A2=83=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E7=9B=B8=E5=90=8C=20Mapper=20=E5=86=B2=E7=AA=81=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

创建多个环境，每个环境加载相同 Mapper （例如 RowMapper）会导致环境冲突。
代码：
// 环境实例1
MybatisFlexBootstrap client1 = ...;
client1.addMapper(RowMapper.class);
// 环境实例2：
MybatisFlexBootstrap client2 = // ;
client2.addMapper(RowMapper.class);

client1.getMapper(RowMapper.class);
// client2 拿到的永远都是 client1 的 RowMapper
client2.getMapper(RowMapper.class);
---
 .../main/java/com/mybatisflex/core/mybatis/Mappers.java  | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

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<Class<?>, Object> MAPPER_OBJECTS = new ConcurrentHashMap<>();
+    private static final Map<String, Map<Class<?>, Object>> MAPPER_OBJECTS_OF_ENV = new ConcurrentHashMap<>();
 
     private static final Map<Class<?>, Class<?>> ENTITY_MAPPER_MAP = new ConcurrentHashMap<>();
 
@@ -79,14 +80,16 @@ public class Mappers {
      * @return {@link BaseMapper} 对象
      */
     public static <M> M ofMapperClass(Class<M> mapperClass) {
-        Object mapperObject = MapUtil.computeIfAbsent(MAPPER_OBJECTS, mapperClass, clazz ->
+        Map<Class<?>, 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> M ofMapperClass(String environmentId, Class<M> mapperClass) {
-        Object mapperObject = MapUtil.computeIfAbsent(MAPPER_OBJECTS, mapperClass, clazz ->
+        Map<Class<?>, 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)));