[deploy.js, ConfigBasic.js] 升级部署机制，把默认参数存放在 ConfigBasic.js 里。

[package.json] 补充 cross-env 以支持 npm run daemon。

ConfigBasic.js

@@ -6,4 +6,14 @@ module.exports={
   // sslKey: '/etc/letsencrypt/live/bittic.org/privkey.pem', // ssl key file,
   // sslCert: '/etc/letsencrypt/live/bittic.org/cert.pem', // ssl cert file,
   // sslCA: '../SSL/ca_bundle.crt', // ssl ca file,
+
+  deploy:{
+    host:'', // 待部署到的主机
+    port:'22', // 带部署到的主机的 SSH 端口
+    root:'/home/tic/node.console.web', // 待部署到的目录路径
+    dist:'dist', // 待部署到的文件夹
+    user:'tic', // 登录用户名
+    password:'', // 登录用户密码
+    key:`${process.env.HOME}/.ssh/id_rsa`, // 登录用户私钥文件
+  },
 }

deploy.js

@@ -1,31 +1,55 @@
 const fs = require('fs')
 const path = require('path')
 const ssh = new (require('node-ssh'))()
+
+/********************* 读取命令行以及配置文件里的参数 **********************/
 const commander = require('commander')
+const deepmerge = require('deepmerge')
+
+var Config={}
+
+// 读取配置文件
+try {
+  if (fs.existsSync('./ConfigBasic.js')) {
+    Config=require('./ConfigBasic.js')
+    console.info('ConfigBasic loaded')
+  }
+  if (fs.existsSync('./ConfigCustom.js')) { // 如果存在，覆盖掉 ConfigBasic 里的默认参数
+    Config=deepmerge(Config, require('./ConfigCustom.js')) // 注意，objectMerge后，产生了一个新的对象，而不是在原来的Config里添加
+    console.info('ConfigCustom loaded')
+  }
+  if (fs.existsSync('./ConfigSecret.js')) { // 如果存在，覆盖掉 ConfigBasic 和 ConfigCustom 里的参数
+    Config=deepmerge(Config, require('./ConfigSecret.js'))
+    console.info('ConfigSecret loaded')
+  }
+}catch(err){
+  console.error('Loading config files failed: '+err.message)
+}
 
 commander
 .version('1.0', '-v, --version') // 默认是 -V。如果要 -v，就要加 '-v --version'
-.option('-H, --host <host>', 'domain name or ip address of the target server')
+.option('-H, --host <host>', `Host IP or domain name of the target server. Default to ${Config.deploy.host}`)
-.option('-P, --port <port>', 'ssh port number of the target server')
+.option('-P, --port <port>', `Ssh port number of the target server. Default to ${Config.deploy.port}`)
-.option('-r, --root <root>', 'root directory to deploy on the target server')
+.option('-r, --root <root>', `Path to deploy on the target server. Default to ${Config.deploy.root}`)
-.option('-d, --dist <dist>', 'dist folder to deploy on the target server')
+.option('-d, --dist <dist>', `Folder to deploy on the target server. Default to ${Config.deploy.dist}`)
-.option('-u, --user <user>', 'user id to login the target server')
+.option('-u, --user <user>', `User id to login the target server. Default to ${Config.deploy.user}`)
-.option('-k, --key <key>', 'user key file to login the target server')
+.option('-k, --key <key>', `User private key file to login the target server. Default to ${Config.deploy.key}`)
-.option('-p, --password <password>', 'user password to login the target server. You may have to enclose the password in ""')
+.option('-p, --password <password>', `User password to login the target server. You may have to enclose it in "". Default to ${Config.deploy.password}`)
 .parse(process.argv)
 
-const root=commander.root // 本地的项目目录。似乎该目录必须已经存在于服务器上
+const root=commander.root||Config.deploy.root // 本地的项目目录。似乎该目录必须已经存在于服务器上
-const dist=commander.dist||'dist' // 新系统将发布在这个目录里。建议为dist，和npm run build产生的目录一致，这样既可以远程自动部署，也可以直接登录服务器手动部署。
 console.log(` root = ${root} `)
+const dist=commander.dist||Config.deploy.dist||'dist' // 新系统将发布在这个目录里。建议为dist，和npm run build产生的目录一致，这样既可以远程自动部署，也可以直接登录服务器手动部署。
 console.log(` dist = ${dist} `)
+const privateKeyFile=commander.key||Config.deploy.key||`${process.env.HOME}/.ssh/id_rsa`
+console.log(` privateKeyFile = ${privateKeyFile}`)
 
-const privateKeyFile=commander.key||`${process.env.HOME}/.ssh/id_rsa`
 const connection = {
-  host: commander.host,
+  host: commander.host||Config.deploy.host,
-  port: commander.port||22,
+  port: commander.port||Config.deploy.port||22,
-  username: commander.user||'tic',
+  username: commander.user||Config.deploy.user,
   privateKey: fs.existsSync(privateKeyFile)?privateKeyFile:undefined,
-  password: commander.password,
+  password: commander.password||Config.deploy.password,
   tryKeyboard: true,
   onKeyboardInteractive: (name, instructions, instructionsLang, prompts, finish) => {  // 不起作用
       if (prompts.length > 0 && prompts[0].prompt.toLowerCase().includes('password')) {
@@ -33,8 +57,9 @@ const connection = {
       }
     },
 }
-console.log(connection)
+console.log(` connection = ${JSON.stringify(connection)}`)
 
+/************************ 连接到待部署的主机，拷贝文件到指定路径 ***************/
 function subDirs(path) {
   const dirs = [path]
   if (fs.statSync(path).isFile()) {
@@ -57,13 +82,13 @@ const necessaryPath = (path) => {
 }
 
 ssh.connect(connection).then(async () => {
-  console.log(`[ ${root} > mv ${dist} ${dist}-backup-${new Date().toISOString()} ... ]`)
+  console.log(`[ mv ${dist} ${dist}-backup-${new Date().toISOString()} ... ]`)
   await ssh.execCommand(`mv ${dist} ${dist}-backup-${new Date().toISOString()}`, { cwd:root })
-  console.log(`[ ${root} > mkdir ${dist} ... ]`)
+  console.log(`[ mkdir ${dist} ... ]`)
   await ssh.execCommand(`mkdir ${dist}`, { cwd:root })
   const toCreate = necessaryPath('./dist')
   for (const name of toCreate) {
-    console.log(`[ ${root} > mkdir ${dist}/${name.join('/')} ... ]`)
+    console.log(`[ mkdir ${dist}/${name.join('/')} ... ]`)
     await ssh.execCommand(`mkdir ${dist}/${name.join('/')}`, { cwd:root })
   }
 
@@ -77,13 +102,13 @@ ssh.connect(connection).then(async () => {
       return !baseName.endsWith('.map');
     },
     tick: (localPath, remotePath, error) => {
-      console.log(`"${localPath}" ===> "${remotePath}" ... ${error || 'succeeded!'}`)
+      console.log(`Uploading "${localPath}" ===> "${remotePath}" ${error || 'succeeded!'}`)
       err = error
     },
   })
   ssh.dispose()
   if (err) {
-    console.log('[ Upload failed! ]')
+    console.log('[ Uploaded with error! ]')
     process.exit(1)
   } else {
     console.log('[ Uploaded successfully! ]')

package.json

@@ -5,7 +5,8 @@
   "scripts": {
     "dev": "vue-cli-service serve",
     "dist": "vue-cli-service build",
-    "deploy": "node ./deploy.js -r '/home/tic/node.console.web' -u tic",
+    "deploy": "node ./deploy.js",
+    "daemon": "cross-env NODE_ENV=production supervisor -i data.log,node_modules,dist server.js",
     "lint": "vue-cli-service lint",
     "test:unit": "vue-cli-service test:unit"
   },
@@ -42,6 +43,7 @@
     "babel-core": "7.0.0-bridge.0",
     "babel-jest": "^23.0.1",
     "babel-plugin-transform-imports": "^1.5.1",
+    "cross-env": "^5.1.3",
     "node-sass": "^4.9.0",
     "node-ssh": "^5.1.2",
     "sass-loader": "^7.0.1",