Selaa lähdekoodia

先这么处理下吧,晚点再看.

聂秋秋 6 vuotta sitten
vanhempi
commit
059a8d03ff

+ 4 - 1
mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/toolkit/GlobalConfigUtils.java

@@ -20,6 +20,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
+import com.baomidou.mybatisplus.core.metadata.TableInfo;
 import org.apache.ibatis.logging.Log;
 import org.apache.ibatis.logging.LogFactory;
 import org.apache.ibatis.session.Configuration;
@@ -60,7 +61,9 @@ public class GlobalConfigUtils {
      * @param clazz 实体类
      */
     public static SqlSessionFactory currentSessionFactory(Class<?> clazz) {
-        String configMark = TableInfoHelper.getTableInfo(clazz).getConfigMark();
+        TableInfo tableInfo = TableInfoHelper.getTableInfo(clazz);
+        Assert.notNull(tableInfo, ClassUtils.getUserClass(clazz).getName() + "Not Found TableInfoCache.");
+        String configMark = tableInfo.getConfigMark();
         GlobalConfig mybatisGlobalConfig = getGlobalConfig(configMark);
         return mybatisGlobalConfig.getSqlSessionFactory();
     }

+ 1 - 1
mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/toolkit/TableInfoHelper.java

@@ -85,7 +85,7 @@ public class TableInfoHelper {
         }
         if (null == tableInfo) {
             //找不到了,我也很绝望呀
-            throw ExceptionUtils.mpe(ClassUtils.getUserClass(clazz).getName() + "Not Found TableInfoCache.");
+            logger.warn(ClassUtils.getUserClass(clazz).getName() + "Not Found TableInfoCache.");
         } else {
             TABLE_INFO_CACHE.put(ClassUtils.getUserClass(clazz).getName(), tableInfo);
         }

+ 3 - 3
mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/ActiveRecordTest.java

@@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.test.h2.config.H2Db;
 import com.baomidou.mybatisplus.test.h2.entity.persistent.H2Student;
 import com.baomidou.mybatisplus.test.h2.service.IH2StudentService;
 import org.junit.Assert;
-import org.junit.BeforeClass;
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.internal.matchers.GreaterThan;
@@ -37,8 +37,8 @@ public class ActiveRecordTest {
     @Autowired
     private IH2StudentService h2StudentService;
 
-    @BeforeClass
-    public static void InitDB() throws SQLException, IOException {
+    @Before
+    public void initDB() throws SQLException, IOException {
         H2Db.initH2Student();
     }