Merge pull request #26 from simongfxu/master

init命令完善以及替换bcrypt库

Author: lisong

bin/db

@@ -6,39 +6,43 @@
 var fs = require('fs');
 var path   = require('path');
 var _   = require('lodash');
+var mysql = require('mysql');
+var Promise = require("bluebird");
 var yargs = require('yargs')
     .usage('Usage: $0 <command> [options]')
     .command('init', '初始化数据库')
-    .example('$0 init --dbname codepush --dbhost localhost --dbuser root --dbpassword 123456', '初始化code-push-server数据库')
+    .example('$0 init --dbname codepush --dbhost localhost --dbuser root --dbpassword 123456 --dbport 3306 --force', '初始化code-push-server数据库')
     .default({dbname: 'codepush', dbhost: 'localhost', dbuser: 'root', dbpassword: null})
     .help('h')
     .alias('h', 'help');
-var argv = yargs
-    .argv;
+var argv = yargs.argv;
 var command = argv._[0];
-var mysql = require('mysql');
-var Promise = require("bluebird");
 var dbname = argv.dbname ? argv.dbname : 'codepush';
 var dbhost = argv.dbhost ? argv.dbhost : 'localhost';
 var dbuser = argv.dbuser ? argv.dbuser : 'root';
+var dbport = argv.dbport ? argv.dbport : 3306;
 var dbpassword = _.isString(argv.dbpassword) ? argv.dbpassword : null;
 if (command === 'init') {
     var connection2;
     var connection = mysql.createConnection({
         host: dbhost,
         user: dbuser,
-        password: dbpassword
+        password: dbpassword,
+        port: dbport
     });
+    var createDatabaseSql = argv.force ? `CREATE DATABASE if not exists ${dbname}` :
+        `CREATE DATABASE ${dbname}`;
     Promise.promisifyAll(connection);
     connection.connect();
-    connection.queryAsync(`CREATE DATABASE ${dbname}`)
+    connection.queryAsync(createDatabaseSql)
     .then(function(){
         connection2 = mysql.createConnection({
             host: dbhost,
             user: dbuser,
             password: dbpassword,
             database: dbname,
-            multipleStatements: true
+            multipleStatements: true,
+            port: dbport
         });
         connection2.connect();
         Promise.promisifyAll(connection2);
@@ -68,4 +72,4 @@ if (command === 'init') {
     });
 } else {
     yargs.showHelp();
-}
+}

config/config.js

@@ -6,6 +6,7 @@ config.development = {
     password: null,
     database: "codepush",
     host: "127.0.0.1",
+    port: 3306,
     dialect: "mysql"
   },
   // Config for qiniu (http://www.qiniu.com/) cloud storage when storageType value is "qiniu".

config/config.test.js

@@ -7,6 +7,7 @@ config.test = {
     password: null,
     database: "codepush_test",
     host: "127.0.0.1",
+    port: 3306,
     dialect: "mysql"
   },
   local: {

config/config.testwin.js

@@ -7,6 +7,7 @@ config.test = {
     password: "Password12!",
     database: "codepush_test",
     host: "127.0.0.1",
+    port: 3306,
     dialect: "mysql"
   },
   local: {

core/utils/security.js

@@ -1,5 +1,5 @@
 'use strict';
-var bcrypt = require('bcrypt');
+var bcrypt = require('bcryptjs');
 var crypto = require('crypto');
 var fs = require('fs');
 var Promise = require('bluebird');

package.json

@@ -36,7 +36,7 @@
   },
   "dependencies": {
     "aws-sdk": "^2.7.0",
-    "bcrypt": "^0.8.7",
+    "bcryptjs": "^2.3.0",
     "bluebird": "^3.4.1",
     "body-parser": "^1.15.2",
     "cookie-parser": "^1.4.3",