git pull

merge.js

@@ -11,19 +11,22 @@ async function init() {
 
 
     let arr = []
-    let files = await fs.readdirSync('E:\\fail\\btc1')
+    let files = await fs.readdirSync('E:\\fail\\btc7')
     for (let i = 0; i < files.length; i++) {
         if (!files[i].includes('.csv'))
             continue
-        arr.push(read('E:\\fail\\btc1\\' + files[i], files[i]))
+        arr.push(read('E:\\fail\\btc7\\' + files[i], files[i]))
     }
 
-    let files2 = await fs.readdirSync('E:\\fail\\btc2')
-    for (let i = 0; i < files2.length; i++) {
-        if (!files2[i].includes('.csv'))
-            continue
-        arr.push(read('E:\\fail\\btc2\\' + files2[i], files2[i]))
-    }
+    // let files2 = await fs.readdirSync('E:\\fail\\btc2')
+    // for (let i = 0; i < files2.length; i++) {
+    //     if (!files2[i].includes('.csv'))
+    //         continue
+    //     arr.push(read('E:\\fail\\btc2\\' + files2[i], files2[i]))
+    // }
+
+    arr=await Promise.all(arr)
+    console.log(arr)
 
     //  console.log(files)
     // let com = await fs.readFileSync('E:\\fail\\btc1', 'utf8');
@@ -53,7 +56,8 @@ async function read(dir, name) {
 
     }
 
-    console.log(uniq,arr)
+   // console.log(uniq,arr)
+    return {uniq,arr}
     //  console.log(com)
     // com = JSON.parse(com)
 }