git pull

merge.js

@@ -2,8 +2,7 @@ const fs = require('fs')
 let moment = require('moment-timezone')
 let _ = require('lodash')
 const uuid = require('uniqid')
-let pairs = ''
-let res
+let all=[]
 init()
 
 
@@ -26,7 +25,11 @@ async function init() {
     // }
 
     arr=await Promise.all(arr)
-    console.log(arr[0].arr[0])
+    for (let i=0;i<arr.length;i++)
+        arrange(arr[i])
+  //  console.log(arr[0].arr[0])
+
+    console.log(files)
 
     //  console.log(files)
     // let com = await fs.readFileSync('E:\\fail\\btc1', 'utf8');
@@ -35,6 +38,19 @@ async function init() {
 
 }
 
+async function arrange(data)
+{
+    for (let i=0;i<all.length;i++)
+        if (all[i].uniq ===data.uniq) {
+            all[i].data.push(data.arr)
+            return
+        }
+
+    all.push({uniq:data.uniq,data:[data.arr]})
+}
+
+
+
 
 async function read(dir, name) {
     let arr = []