From eb0a647ca97de70d6903c8f5a0a4db312c9eb8a8 Mon Sep 17 00:00:00 2001
From: Luk Lu <luk.lu@faronear.org>
Date: Tue, 5 Nov 2019 14:21:46 +0800
Subject: [PATCH] a

---
 ConfigBasic.js | 11 +++++------
 package.json   |  2 +-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/ConfigBasic.js b/ConfigBasic.js
index 04ae72d..030235d 100644
--- a/ConfigBasic.js
+++ b/ConfigBasic.js
@@ -10,12 +10,11 @@ module.exports={
   sslCA: '/etc/letsencrypt/live/server.vic.yuanjin.net/bundle.pem', // ssl ca file,
 
   deploy: {
-    type: 'web',
-    host: 'server.vic.yuanjin.net', // 待部署到的主机
-    port: '22', // 带部署到的主机的 SSH 端口
-    dir: '/home/adot/APPNAME', // 待部署到的目录路径
-    dist: 'dist', // 待部署到的文件夹
-    user: 'adot', // 登录用户名
+    from: './dist', // 待部署到的文件夹
+    type: 'git',
+    repo: 'https://github.com/vichome/webapp', // 待部署到的主机
+    gituser: 'vic-team',
+    gitemail: 'vic-team@outlook.com',
     password: '', // 登录用户密码
     key: `${process.env.HOME}/.ssh/id_rsa`, // 登录用户私钥文件
   },
diff --git a/package.json b/package.json
index 748ed1c..82db8d3 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,7 @@
     "lint:ts": "tslint \"src/**/*.ts\" \"src/**/*.tsx\"",
     "dev": "umi dev",
     "dist": "umi build",
-    "deploy": "node ./node_modules/deployer/deploy.js --type git --repo 'https://github.com/vichome/webapp' --local 'dist'",
+    "deploy": "node ./node_modules/deployer/deploy.js",
     "allinone": "npm run dist && npm run deploy",
     "daemon.pm2": "cross-env NODE_ENV=production pm2 start ./node_modules/webserver/server.js --name vic.h5"
   },