From 147eae09282d746830b83e56e65e6064a7122803 Mon Sep 17 00:00:00 2001
From: DigitalSonic <digitalsonic.dxf@gmail.com>
Date: Thu, 24 Sep 2020 16:41:33 +0800
Subject: [PATCH] add #{} support besides ${}

---
 .../com/alibaba/druid/pool/ha/node/ZookeeperNodeListener.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main/java/com/alibaba/druid/pool/ha/node/ZookeeperNodeListener.java b/src/main/java/com/alibaba/druid/pool/ha/node/ZookeeperNodeListener.java
index 5a82cb38f0..3be1594a6e 100644
--- a/src/main/java/com/alibaba/druid/pool/ha/node/ZookeeperNodeListener.java
+++ b/src/main/java/com/alibaba/druid/pool/ha/node/ZookeeperNodeListener.java
@@ -74,6 +74,7 @@ public class ZookeeperNodeListener extends NodeListener {
      * URL Template, e.g.
      * jdbc:mysql://${host}:${port}/${database}?useUnicode=true
      * ${host}, ${port} and ${database} will be replaced by values in ZK
+     * ${} can also be #{}
      */
     private String urlTemplate;
 
@@ -258,12 +259,15 @@ public class ZookeeperNodeListener extends NodeListener {
         String dataPrefix = getPrefix();
         if (properties.containsKey(dataPrefix + ".host")) {
             url = url.replace("${host}", properties.getProperty(dataPrefix + ".host"));
+            url = url.replace("#{host}", properties.getProperty(dataPrefix + ".host"));
         }
         if (properties.containsKey(dataPrefix + ".port")) {
             url = url.replace("${port}", properties.getProperty(dataPrefix + ".port"));
+            url = url.replace("#{port}", properties.getProperty(dataPrefix + ".port"));
         }
         if (properties.containsKey(dataPrefix + ".database")) {
             url = url.replace("${database}", properties.getProperty(dataPrefix + ".database"));
+            url = url.replace("#{database}", properties.getProperty(dataPrefix + ".database"));
         }
         return url;
     }