fix alibaba#2275

proXsp · Jan 14, 2020 · 58db0e2 · 58db0e2
1 parent 89760cd
commit 58db0e2
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/config/src/main/java/com/alibaba/nacos/config/server/controller/ConfigController.java b/config/src/main/java/com/alibaba/nacos/config/server/controller/ConfigController.java
@@ -177,6 +177,9 @@ public void getConfig(HttpServletRequest request, HttpServletResponse response,
                               String tenant,
                           @RequestParam(value = "tag", required = false) String tag)
         throws IOException, ServletException, NacosException {
+        if (NAMESPACE_PUBLIC_KEY.equalsIgnoreCase(tenant)) {
+            tenant = "";
+        }
         // check params
         ParamUtils.checkParam(dataId, group, "datumId", "content");
         ParamUtils.checkParam(tag);
@@ -428,6 +431,9 @@ public ResponseEntity<byte[]> exportConfig(@RequestParam(value = "dataId", requi
                                                    defaultValue = StringUtils.EMPTY) String tenant,
                                                @RequestParam(value = "ids", required = false) List<Long> ids) {
         ids.removeAll(Collections.singleton(null));
+        if (NAMESPACE_PUBLIC_KEY.equalsIgnoreCase(tenant)) {
+            tenant = "";
+        }
         List<ConfigAllInfo> dataList = persistService.findAllConfigInfo4Export(dataId, group, tenant, appName, ids);
         List<ZipUtils.ZipItem> zipItemList = new ArrayList<>();
         StringBuilder metaData = null;