zhuyijun/nacos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix #2275

Browse Source
This commit is contained in:
qq213539 2020-01-14 16:33:06 +08:00
parent 89760cd7bf
commit 58db0e266e
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config/src/main/java/com/alibaba/nacos/config/server/controller/ConfigController.java
View File

@ -177,6 +177,9 @@ public class ConfigController {
String tenant, String tenant,
@RequestParam(value = "tag", required = false) String tag) @RequestParam(value = "tag", required = false) String tag)
throws IOException, ServletException, NacosException { throws IOException, ServletException, NacosException {
if (NAMESPACE_PUBLIC_KEY.equalsIgnoreCase(tenant)) {
tenant = "";
}
// check params // check params
ParamUtils.checkParam(dataId, group, "datumId", "content"); ParamUtils.checkParam(dataId, group, "datumId", "content");
ParamUtils.checkParam(tag); ParamUtils.checkParam(tag);
@ -428,6 +431,9 @@ public class ConfigController {
defaultValue = StringUtils.EMPTY) String tenant, defaultValue = StringUtils.EMPTY) String tenant,
@RequestParam(value = "ids", required = false) List<Long> ids) { @RequestParam(value = "ids", required = false) List<Long> ids) {
ids.removeAll(Collections.singleton(null)); ids.removeAll(Collections.singleton(null));
if (NAMESPACE_PUBLIC_KEY.equalsIgnoreCase(tenant)) {
tenant = "";
}
List<ConfigAllInfo> dataList = persistService.findAllConfigInfo4Export(dataId, group, tenant, appName, ids); List<ConfigAllInfo> dataList = persistService.findAllConfigInfo4Export(dataId, group, tenant, appName, ids);
List<ZipUtils.ZipItem> zipItemList = new ArrayList<>(); List<ZipUtils.ZipItem> zipItemList = new ArrayList<>();
StringBuilder metaData = null; StringBuilder metaData = null;