Merge branch 'feature/upload' of http://git.yoho.cn/OPENTECH/yoho-node-ci into feature/upload

@@ -6,11 +6,13 @@ const rd = require('rd');
 const shelljs = require('shelljs');
 const shelljs = require('shelljs');
 const decompress = require('decompress');
 const decompress = require('decompress');
 const decompressUnzip = require('decompress-unzip');
 const decompressUnzip = require('decompress-unzip');
+const ws = require('../../../lib/ws');
 const qn = require('../../../lib/qiniu');
 const qn = require('../../../lib/qiniu');
 const Router = require('koa-router');
 const Router = require('koa-router');
 const router = new Router();
 const router = new Router();
 
 
 const QINIU_PREFIX = 'yoho';
 const QINIU_PREFIX = 'yoho';
+const BROADCAST_PATH = '/upload';
 
 
 const file =  {
 const file =  {
     /**
     /**
@@ -19,7 +21,6 @@ const file =  {
     page: async(ctx) => {
     page: async(ctx) => {
         let result = await qn.listAsync('/yoho');
         let result = await qn.listAsync('/yoho');
         
         
-        console.log('ALL-FILE-LIST:', result);
         await ctx.render('/action/file_page', {fileList: result});
         await ctx.render('/action/file_page', {fileList: result});
     },
     },
 
 
@@ -46,18 +47,20 @@ const file =  {
         await readable.pipe(writable);
         await readable.pipe(writable);
 
 
         readable.on('end', () => {
         readable.on('end', () => {
-            console.log('Zip file uploaded to Server!');
+            ws.broadcast(BROADCAST_PATH, {
+                state: 'Zip file uploaded to Server!'
+            });
         });
         });
 
 
-        console.log('Zip file savepath:', fileSavePath);
-
         // 解压
         // 解压
         await decompress(fileSavePath, fileDistPath, {
         await decompress(fileSavePath, fileDistPath, {
             plugins: [
             plugins: [
                 decompressUnzip()
                 decompressUnzip()
             ]
             ]
         }).then(() => {
         }).then(() => {
-            console.log('Zip file decompressed');
+            ws.broadcast(BROADCAST_PATH, {
+                state: 'Zip file decompressed!'
+            });
         });
         });
 
 
         // 上传到七牛处理
         // 上传到七牛处理
@@ -76,7 +79,9 @@ const file =  {
                 key: path.join(QINIU_PREFIX, fileList[i])
                 key: path.join(QINIU_PREFIX, fileList[i])
             });
             });
 
 
-            console.log(`${fileList[i]} Uploaded to Qiniu!`);
+            ws.broadcast(BROADCAST_PATH, {
+                state: `SUCCESS! ${fileList[i]} Uploaded to Qiniu!`
+            });
         }
         }
     }
     }
 }
 }