fix cover config failed when import config

apolloconfig · Sep 11, 2021 · fd8854c · fd8854c
1 parent 16acb77
commit fd8854c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/...l/src/main/java/com/ctrip/framework/apollo/portal/controller/ConfigsImportController.java b/...l/src/main/java/com/ctrip/framework/apollo/portal/controller/ConfigsImportController.java
@@ -98,7 +98,7 @@ public void importConfigByZipWithIgnoreConflictNamespace(@RequestParam(value = "
 
     byte[] bytes = file.getBytes();
     try (ZipInputStream zipInputStream = new ZipInputStream(new ByteArrayInputStream(bytes))) {
-      configsImportService.importDataFromZipFile(importEnvs, zipInputStream, false);
+      configsImportService.importDataFromZipFile(importEnvs, zipInputStream, true);
     }
   }
 }
diff --git a/...-portal/src/main/java/com/ctrip/framework/apollo/portal/service/ConfigsImportService.java b/...-portal/src/main/java/com/ctrip/framework/apollo/portal/service/ConfigsImportService.java
@@ -384,7 +384,8 @@ private void importItems(String appId, Env env, String clusterName, String names
       newItem.setDataChangeLastModifiedTime(new Date());
 
       try {
-        itemService.loadItem(env, appId, clusterName, namespaceName, key);
+        ItemDTO oldItem = itemService.loadItem(env, appId, clusterName, namespaceName, key);
+        newItem.setId(oldItem.getId());
         //existed
         itemService.updateItem(appId, env, clusterName, namespaceName, newItem);
       } catch (Exception e) {