From e712bfdba55a2c408ec17a37da8c9c01e1085885 Mon Sep 17 00:00:00 2001 From: "Quinton.Xu" Date: Wed, 1 Nov 2017 10:17:04 +0800 Subject: [PATCH] fix typo --- README.md | 9 +++++---- lib/helper.js | 7 +++++-- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 195b846..540c2c2 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ Node.js >= 6.0.0 required. configServerUrl: 'http://example.com', appId: '', clusterName: 'default', - namespaceName: [ 'namespaceName1', 'namespaceName2' ], + namespaceName: [ 'namespaceName1', 'namespaceName2' ], // n1的配置会被n2配置覆盖 // clientIp: '', }; const result = await apollo.remoteConfigServiceFromCache(config); @@ -48,8 +48,9 @@ Node.js >= 6.0.0 required. configServerUrl: 'http://example.com', appId: '', clusterName: 'default', - namespaceName: [ 'namespaceName1', 'namespaceName2' ], - // clientIp: '', + namespaceName: [ 'namespaceName1', 'namespaceName2' ], // n1的配置会被n2配置覆盖 + // clientIp: '', // optional + // releaseKey: '', // optional }; const result = await apollo.remoteConfigServiceSikpCache(config); ``` @@ -60,7 +61,7 @@ Node.js >= 6.0.0 required. configServerUrl: 'http://example.com', appId: '', clusterName: 'default', - namespaceName: '', + namespaceName: '', //no surport multi namespace name, optional apolloEnv: 'dev', token: '' // clientIp: '', diff --git a/lib/helper.js b/lib/helper.js index e2d229b..73e094d 100644 --- a/lib/helper.js +++ b/lib/helper.js @@ -91,9 +91,10 @@ module.exports = { assert(appId, 'appId is required'); assert(clusterName, 'clusterName is required'); if (Array.isArray(namespaceName)) { + if (namespaceName.length === 0) return [`${configServerUrl}/configfiles/json/${appId}/${clusterName}/application?ip=${clientIp}`]; return namespaceName.map(n => `${configServerUrl}/configfiles/json/${appId}/${clusterName}/${namespaceName}?ip=${clientIp}`); } else { - return Arrary.from(`${configServerUrl}/configfiles/json/${appId}/${clusterName}/${namespaceName}?ip=${clientIp}`); + return [`${configServerUrl}/configfiles/json/${appId}/${clusterName}/${namespaceName}?ip=${clientIp}`]; } }, @@ -105,9 +106,11 @@ module.exports = { assert(appId, 'appId is required'); assert(clusterName, 'clusterName is required'); if (Array.isArray(namespaceName)) { + console.log( [`${configServerUrl}/configs/${appId}/${clusterName}/application?releaseKey=${releaseKey}&ip=${clientIp}`]) + if (namespaceName.length === 0) return [`${configServerUrl}/configs/${appId}/${clusterName}/application?releaseKey=${releaseKey}&ip=${clientIp}`]; return namespaceName.map(n => `${configServerUrl}/configs/${appId}/${clusterName}/${n}?releaseKey=${releaseKey}&ip=${clientIp}`); } else { - return Arrary.from(`${configServerUrl}/configs/${appId}/${clusterName}/${namespaceName}?releaseKey=${releaseKey}&ip=${clientIp}`); + return [`${configServerUrl}/configs/${appId}/${clusterName}/${namespaceName}?releaseKey=${releaseKey}&ip=${clientIp}`]; } } }; \ No newline at end of file -- GitLab