优化代码.

mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/DataSourceConfig.java

@@ -95,12 +95,9 @@ public class DataSourceConfig {
      */
     public DbType getDbType() {
         if (null == this.dbType) {
-            this.dbType = this.getDbType(this.driverName);
+            this.dbType = this.getDbType(this.url.toLowerCase());
             if (null == this.dbType) {
-                this.dbType = this.getDbType(this.url.toLowerCase());
-                if (null == this.dbType) {
-                    throw ExceptionUtils.mpe("Unknown type of database!");
-                }
+                throw ExceptionUtils.mpe("Unknown type of database!");
             }
         }
 

mybatis-plus-generator/src/test/java/com/baomidou/mybatisplus/test/generator/CodeGeneratorTest.java

@@ -24,6 +24,7 @@ import com.baomidou.mybatisplus.generator.config.PackageConfig;
 import com.baomidou.mybatisplus.generator.config.StrategyConfig;
 import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
 import com.mysql.cj.jdbc.Driver;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 /**
@@ -45,7 +46,7 @@ class CodeGeneratorTest {
     /**
      * 是否去掉生成实体的属性名前缀
      */
-    private String[] fieldPrefix = null;
+    private String[] fieldPrefix = new String[]{};
     /**
      * 生成的Service 接口类名是否以I开头
      * <p>默认是以I开头</p>
@@ -54,6 +55,7 @@ class CodeGeneratorTest {
     private boolean serviceClassNameStartWithI = true;
 
     @Test
+    @Disabled
     void generateCode() {
         String packageName = "com.baomidou.springboot";
         enableTableFieldAnnotation = false;

mybatis-plus-generator/src/test/java/com/baomidou/mybatisplus/test/generator/CodeGeneratorWithTemplateTest.java

@@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.generator.InjectionConfig;
 import com.baomidou.mybatisplus.generator.config.*;
 import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
 import com.mysql.cj.jdbc.Driver;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import java.util.HashMap;
@@ -46,7 +47,7 @@ class CodeGeneratorWithTemplateTest {
     /**
      * 是否去掉生成实体的属性名前缀
      */
-    private String[] fieldPrefix = null;
+    private String[] fieldPrefix = new String[]{};
     /**
      * 生成的Service 接口类名是否以I开头
      * <p>默认是以I开头</p>
@@ -55,6 +56,7 @@ class CodeGeneratorWithTemplateTest {
     private boolean serviceClassNameStartWithI = true;
 
     @Test
+    @Disabled
     void generateCode() {
         String packageName = "com.baomidou.springboot";
         enableTableFieldAnnotation = false;