fix cover config failed when import config

Author: lepdou

CHANGES.md

@@ -12,7 +12,7 @@ Apollo 1.10.0
 * [Make Access Key Timestamp check configurable](https://github.com/ctripcorp/apollo/pull/3908)
 * [remove ctrip profile](https://github.com/ctripcorp/apollo/pull/3920)
 * [Remove spring dependencies from internal code](https://github.com/apolloconfig/apollo/pull/3937)
-* [Support export/import configs](https://github.com/apolloconfig/apollo/pull/3947)
+* [Support export/import configs by apollo env](https://github.com/apolloconfig/apollo/pull/3947)
 
 
 ------------------

apollo-portal/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);
     }
   }
 }

apollo-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) {