浏览代码

jfinal 5.1.8 release ^_^

James 1 年之前
父节点
当前提交
d86208f044

+ 1 - 1
src/main/java/com/jfinal/plugin/activerecord/ActiveRecordPlugin.java

@@ -346,7 +346,7 @@ public class ActiveRecordPlugin implements IPlugin {
 	}
 
 	private void autoConfigDialect(String jdbcUrl) {
-		if (jdbcUrl.startsWith("jdbc:") && jdbcUrl.substring("jdbc:".length()).contains(":")) {
+		if (jdbcUrl != null && jdbcUrl.startsWith("jdbc:") && jdbcUrl.substring("jdbc:".length()).contains(":")) {
 			String dialect = jdbcUrl.substring("jdbc:".length(), jdbcUrl.indexOf(":", "jdbc:".length())).toLowerCase();
 			switch (dialect) {
 				case "h2":

+ 5 - 1
src/main/java/com/jfinal/plugin/activerecord/IDataSourceProvider.java

@@ -24,8 +24,12 @@ import javax.sql.DataSource;
  * ActiveRecordPlugin constructor accept DataSourceProvider and DataSource
  */
 public interface IDataSourceProvider {
-	String getJdbcUrl();
+
 	DataSource getDataSource();
+
+	default String getJdbcUrl() {
+		return null;
+	}
 }