sync code from master branch

2021-06-26 13:25:11 +08:00 · 2019-03-27 14:09:37 +08:00
parent 7e35e71119
commit fa71593248
29 changed files with 216 additions and 256 deletions
--- a/spring-cloud-alibaba-nacos-config/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ b/spring-cloud-alibaba-nacos-config/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -32,6 +32,12 @@
      "name": "spring.cloud.nacos.config.ext-config",
      "type": "java.util.List",
      "description": "a set of extended configurations ."
+    },
+    {
+      "name": "spring.cloud.nacos.config.enabled",
+      "type": "java.lang.Boolean",
+      "defaultValue": true,
+      "description": "enable nacos config or not."
    }
  ]
 }