更新example

littledu · littledu · commit eaacafe15305 · 2017-06-15T11:09:00.000+08:00
diff --git a/app.html b/app.html
@@ -189,7 +189,7 @@
                 <input type="text" name="ftp-user" placeholder="用户名" value="">
             </div>
             <div class="ui-text ui-text_short">
-                <input type="password" name="ftp-pass" placeholder="密码" value="">
+                <input type="text" name="ftp-pass" placeholder="密码" value="">
             </div>
             <div class="ui-text ui-text_short">
                 <input type="text" name="ftp-port" placeholder="端口" value="">
diff --git a/package.json b/package.json
@@ -67,7 +67,7 @@
     "gulp-tmtsprite": "^0.0.22",
     "gulp-uglify": "^1.5.3",
     "gulp-useref": "^3.1.2",
-    "gulp-util": "^3.0.7",
+    "gulp-util": "^3.0.8",
     "gulp-webp": "^2.3.0",
     "gulp-zip": "^3.2.0",
     "imagemin-pngquant": "^4.2.2",
diff --git a/src/_tasks/ftp.js b/src/_tasks/ftp.js
@@ -6,70 +6,67 @@ const gulp = require('gulp');
 const _ = require('lodash');
 const del = require('del');
 const ftp = require('gulp-ftp');
+const gutil = require('gulp-util');
 const Common = require(path.join(__dirname, '../common'));
 
 module.exports = function (projectPath, log, callback) {
 
-    let projectConfigPath = path.join(projectPath, 'weflow.config.json');
-    let config = null;
+  let distDir = path.join(projectPath, './dist');
 
-    if (Common.fileExist(projectConfigPath)) {
-        config = Common.requireUncached(projectConfigPath);
-    } else {
-        config = Common.requireUncached(path.join(__dirname, '../../weflow.config.json'));
-    }
+  let projectConfigPath = path.join(projectPath, 'weflow.config.json');
+  let config = null;
 
-    let configFTP = config.ftp;
+  if (Common.fileExist(projectConfigPath)) {
+    config = Common.requireUncached(projectConfigPath);
+  } else {
+    config = Common.requireUncached(path.join(__dirname, '../../weflow.config.json'));
+  }
 
-    if (configFTP.host === '' || configFTP.pass === '' || configFTP.user === '') {
-        callback('ftp config');
-        return;
-    }
+  let configFTP = config.ftp;
 
-    let projectName = path.basename(projectPath);
+  if (configFTP.host === '' || configFTP.pass === '' || configFTP.user === '') {
+    callback('ftp config');
+    return;
+  }
 
-    //清除目标目录
-    function delDist(cb) {
-        del(path.join(projectPath, './dist'), {force: true}).then(function () {
-            cb && cb();
-        })
-    }
+  let projectName = path.basename(projectPath);
+
+  //清除目标目录
+  function delDist(cb) {
+    del(path.join(projectPath, './dist'), {force: true}).then(function () {
+      cb && cb();
+    })
+  }
 
-    function remoteFtp(cb) {
-        let remotePath = config['ftp']['remotePath'] || "";
-        let ftpConfig = _.extend(config['ftp'], {
-            remotePath: path.join(remotePath, projectName)
-        });
-        let distPath = config['ftp']['includeHtml'] ? path.join(projectPath, './dist/**/*') : [path.join(projectPath, './dist/**/*'), path.join(projectPath, '!./dist/html/**/*.html')];
+  function remoteFtp(cb) {
+    let remotePath = config['ftp']['remotePath'] || "";
+    let ftpConfig = _.extend(config['ftp'], {
+      remotePath: path.join(remotePath, projectName)
+    });
+    let distPath = config['ftp']['includeHtml'] ? path.join(projectPath, './dist/**/*') : [path.join(projectPath, './dist/**/*'), path.join(projectPath, '!./dist/html/**/*.html')];
 
-        console.log(ftpConfig)
-        console.log(distPath);
+    gulp.src(distPath)
+      .pipe(ftp(ftpConfig))
+      .pipe(gutil.noop())
+      .pipe(gulp.dest(distDir))
+      .on('end', function () {
+        console.log('ftp success.');
+        log('ftp success.');
+        cb && cb();
+      })
+  }
 
-        gulp.src(distPath)
-            .pipe(ftp(ftpConfig))
-            .on('finish', function(){
-                console.log('sftp success.');
-                log('sftp success.');
-                cb && cb();
-            })
-            .on('end', function () {
-                console.log('ftp success.');
-                log('ftp success.');
-                cb && cb();
-            });
+  async.series([
+    function (next) {
+      remoteFtp(next);
+    }
+  ], function (err) {
+    if (err) {
+      throw new Error(err);
     }
 
-    async.series([
-        function (next) {
-            remoteFtp(next);
-        }
-    ], function (err) {
-        if (err) {
-            throw new Error(err);
-        }
-
-        delDist();
+    delDist();
 
-        callback && callback();
-    });
+    callback && callback();
+  });
 };
diff --git a/templates/example.zip b/templates/example.zip
