Merge branch 'dev-zhengzhou' into test

@@ -374,9 +374,11 @@ func (controller *ImportController) Unzip(zipPath, dstDir string) ([]string, err
 		if err := controller.unzipFile(f, decodeName, dstDir); err != nil {
 		if err := controller.unzipFile(f, decodeName, dstDir); err != nil {
 			return fileNames, err
 			return fileNames, err
 		} else {
 		} else {
+			if !(f.FileInfo().IsDir()) {
 				fileNames = append(fileNames, decodeName)
 				fileNames = append(fileNames, decodeName)
 			}
 			}
 		}
 		}
+	}
 	return fileNames, nil
 	return fileNames, nil
 }
 }