Merge branch 'dev-zhengzhou' into test

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