From 67d0f7f94c1fa917d8ee7d0dfcf9baf471555c8b Mon Sep 17 00:00:00 2001
From: KeiferJu <jkf19980216@qq.com>
Date: Tue, 9 Jun 2020 17:44:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. 添加自定义端口设置
2. 替换压缩依赖,解决windos下文件夹打包路径错误问题
---
 README.md    |  3 +++
 config.js    |  7 +++++--
 package.json |  2 +-
 upload.js    | 12 +++++++++---
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 4ed21eb..009d324 100644
--- a/README.md
+++ b/README.md
@@ -49,6 +49,9 @@ npm run deploy
     
     如果密码登录,填入密码,并且不能设置PRIVATE_KEY参数
 
+- PORT:
+    端口
+
 
 #### 扩展配置
 - CLEAR_OLDFILES: 
diff --git a/config.js b/config.js
index b3e32a5..84fa18e 100755
--- a/config.js
+++ b/config.js
@@ -6,7 +6,8 @@ module.exports = Object.freeze({
     // PRIVATE_KEY: 'C:/Users/Html5/.ssh/id_rsa', 
     PASSWORD: '123456', //方式二 用密码连接服务器
     PATH: '/var/local', // 需要上传的服务器目录地址 如 /usr/local/nginx/html
-    OUTPUT_PATH: 'dist' // 需要上传文件夹路径,默认dist
+    OUTPUT_PATH: 'dist', // 需要上传文件夹路径,默认dist
+    PORT: 22
   },
   production: {//正式
     SERVER_PATH: 'xxx', 
@@ -15,7 +16,8 @@ module.exports = Object.freeze({
     // PRIVATE_KEY: 'C:/Users/Html5/.ssh/id_rsa', 
     PASSWORD: 'xxx', 
     PATH: '/var/local', // 需要上传的服务器目录地址 如 /usr/local/nginx/html
-    OUTPUT_PATH: 'dist'  // 需要上传文件夹路径,默认dist
+    OUTPUT_PATH: 'dist',  // 需要上传文件夹路径,默认dist
+    PORT: 22
   }
 })
 
@@ -27,6 +29,7 @@ module.exports = Object.freeze({
 // SSH_USER: 服务器用户名
 // PRIVATE_KEY: 'C:/Users/Html5/.ssh/id_rsa'  用秘钥登录服务器(推荐)的秘钥地址, private 本机私钥文件地址(需要在服务器用户目录 一般是 /root/.ssh/authorized_keys 配置公钥 并该文件权限为 600, (.ssh文件夹一般默认隐藏)
 // PASSWORD: 密码
+// PORT: 端口
 
 /**
  * 扩展配置
diff --git a/package.json b/package.json
index d08645a..e76c730 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
   "homepage": "https://github.com/KeiferJu/auto-deploy#readme",
   "devDependencies": {
     "chalk": "^3.0.0",
-    "compressing": "^1.5.0",
+    "compressing2": "^1.5.1",
     "inquirer": "^7.1.0",
     "node-ssh": "^8.0.0",
     "ora": "^4.0.3",
diff --git a/upload.js b/upload.js
index ff19688..944e753 100755
--- a/upload.js
+++ b/upload.js
@@ -4,7 +4,7 @@ const spinner_style = require('./spinner_style') //加载动画样式
 const shell = require('shelljs') // 执行shell命令
 const node_ssh = require('node-ssh') // ssh连接服务器
 const inquirer = require('inquirer') //命令行交互
-const zipFile = require('compressing') // 压缩zip
+const zipFile = require('compressing2') // 压缩zip
 const fs = require('fs') // nodejs内置文件模块
 const path = require('path') // nodejs内置路径模块
 const CONFIG = require('./config') // 配置
@@ -48,12 +48,14 @@ const connectSSH = async () => {
       host: config.SERVER_PATH,
       username: config.SSH_USER,
       privateKey: config.PRIVATE_KEY, //秘钥登录(推荐) 方式一
-      tryKeyboard: true
+      tryKeyboard: true,
+      port: config.PORT
     } : {
       host: config.SERVER_PATH,
       username: config.SSH_USER,
       password: config.PASSWORD, // 密码登录 方式二
-      tryKeyboard: true
+      tryKeyboard: true,
+      port: config.PORT
     }
 
     await SSH.connect(options);
@@ -245,6 +247,10 @@ inquirer
         config.OUTPUT_PATH = 'dist';
       }
 
+      if (!config.PORT) {
+        config.PORT = 22;
+      }
+
       const names = config.OUTPUT_PATH.split('/');
       if (names[names.length - 1]) {
         config.OLD_NAME = names[names.length - 1];