diff --git a/net/src/main/java/com/zfoo/net/config/model/RegistryConfig.java b/net/src/main/java/com/zfoo/net/config/model/RegistryConfig.java index e0801573..18313d6e 100644 --- a/net/src/main/java/com/zfoo/net/config/model/RegistryConfig.java +++ b/net/src/main/java/com/zfoo/net/config/model/RegistryConfig.java @@ -89,14 +89,16 @@ public class RegistryConfig { } RegistryConfig that = (RegistryConfig) o; return Objects.equals(center, that.center) && + Objects.equals(path, that.path) && Objects.equals(user, that.user) && Objects.equals(password, that.password) && + Objects.equals(driverClassName, that.driverClassName) && Objects.equals(address, that.address); } @Override public int hashCode() { - return Objects.hash(center, user, password, address); + return Objects.hash(center, user, password, address, path, driverClassName); } public String getDriverClassName() { diff --git a/net/src/main/java/com/zfoo/net/schema/NetDefinitionParser.java b/net/src/main/java/com/zfoo/net/schema/NetDefinitionParser.java index d1bae09c..dfc7123b 100644 --- a/net/src/main/java/com/zfoo/net/schema/NetDefinitionParser.java +++ b/net/src/main/java/com/zfoo/net/schema/NetDefinitionParser.java @@ -152,6 +152,7 @@ public class NetDefinitionParser implements BeanDefinitionParser { resolvePlaceholder("path", "path", builder, element, parserContext); resolvePlaceholder("user", "user", builder, element, parserContext); resolvePlaceholder("password", "password", builder, element, parserContext); + resolvePlaceholder("driver-class-name", "driverClassName", builder, element, parserContext); var addressMap = parseAddress(element, parserContext); builder.addPropertyValue("address", addressMap); parserContext.getRegistry().registerBeanDefinition(clazz.getCanonicalName(), builder.getBeanDefinition()); diff --git a/net/src/main/resources/net-1.0.xsd b/net/src/main/resources/net-1.0.xsd index 3a2ee845..1e2193cf 100644 --- a/net/src/main/resources/net-1.0.xsd +++ b/net/src/main/resources/net-1.0.xsd @@ -22,6 +22,7 @@ +