Skip to content

Commit 2190df2

Browse files
qq592304796jiangxinjun
andauthored
fix(dynamic-datasource-creator):解决当存在publicKey时,druid数据源创建异常问题 (#605)
Co-authored-by: jiangxinjun <[email protected]>
1 parent 0218196 commit 2190df2

File tree

1 file changed

+9
-2
lines changed
  • dynamic-datasource-creator/src/main/java/com/baomidou/dynamic/datasource/creator/druid

1 file changed

+9
-2
lines changed

dynamic-datasource-creator/src/main/java/com/baomidou/dynamic/datasource/creator/druid/DruidConfigUtil.java

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,13 @@
2525
import java.beans.Introspector;
2626
import java.beans.PropertyDescriptor;
2727
import java.lang.reflect.Method;
28-
import java.util.*;
28+
import java.util.ArrayList;
29+
import java.util.HashMap;
30+
import java.util.List;
31+
import java.util.Map;
32+
import java.util.Optional;
33+
import java.util.Properties;
34+
import java.util.Set;
2935

3036
/**
3137
* Druid配置工具类
@@ -85,7 +91,8 @@ public static Properties toProperties(@NonNull DruidConfig config) {
8591
}
8692
properties.setProperty(FILTERS, filters);
8793

88-
Properties connectProperties = config.getConnectionProperties();
94+
Properties connectProperties = Optional.ofNullable(config.getConnectionProperties())
95+
.orElse(new Properties());
8996
if (configFilterExist) {
9097
connectProperties.setProperty("config.decrypt", Boolean.TRUE.toString());
9198
connectProperties.setProperty("config.decrypt.key", publicKey);

0 commit comments

Comments
 (0)