From 425e3796c35a30018307dfd4e75b570dfb023be7 Mon Sep 17 00:00:00 2001
From: "luk.lu" <luk.lu@faronear.org>
Date: Thu, 21 Jul 2022 12:12:53 +0800
Subject: [PATCH] 'updated'

---
 .gitignore                                |  5 ++--
 envar-base-custom.template.js             |  3 ---
 envar-base-deploy.js                      | 28 -----------------------
 envar-deploy.js                           | 28 +++++++++++++++++++++++
 envar-base-basic.js => envar-web-basic.js |  0
 package.json                              |  2 +-
 6 files changed, 31 insertions(+), 35 deletions(-)
 delete mode 100644 envar-base-custom.template.js
 delete mode 100644 envar-base-deploy.js
 create mode 100644 envar-deploy.js
 rename envar-base-basic.js => envar-web-basic.js (100%)

diff --git a/.gitignore b/.gitignore
index 4d9437e..bea1c5e 100755
--- a/.gitignore
+++ b/.gitignore
@@ -32,6 +32,5 @@
 
 .deploy_git
 
-envar-base-custom.js
-envar-base-dynamic.js
-envar-base-secret.js
\ No newline at end of file
+envar-web-custom.js
+envar-deploy-secret.js
\ No newline at end of file
diff --git a/envar-base-custom.template.js b/envar-base-custom.template.js
deleted file mode 100644
index 054eb83..0000000
--- a/envar-base-custom.template.js
+++ /dev/null
@@ -1,3 +0,0 @@
-module.exports={
-
-}
\ No newline at end of file
diff --git a/envar-base-deploy.js b/envar-base-deploy.js
deleted file mode 100644
index 4bcda09..0000000
--- a/envar-base-deploy.js
+++ /dev/null
@@ -1,28 +0,0 @@
-module.exports = {
-  deploy: {
-    fromPath: "./dist",
-    gotoTarget: "github",
-    github: {
-      targetType: "git",
-      repo: "https://github.com/tuc-vic/vic-user.bittic.org",
-      branch: "main",
-      gitname: "vic-team",
-      gitemail: "vic-team@outlook.com",
-      url: 'http://vic-user.bittic.org'
-    },
-    vultr: {
-      targetType: "ssh",
-      host: "vic-user.bittic.org",
-      targetPath: "/faronear/tuc-vic/vic.user.react",
-      targetDir: "dist",
-      user: "adot",
-      password: "",
-      key: `${process.env.HOME}/.ssh/id_rsa`, // 登录用户私钥文件
-    },
-    unicloud: {
-      targetType: "serverless",
-      space: "cn-bittic-vic-user",
-      url: "http://vic-user.bittic.cn",
-    },
-  },
-};
diff --git a/envar-deploy.js b/envar-deploy.js
new file mode 100644
index 0000000..d780d0c
--- /dev/null
+++ b/envar-deploy.js
@@ -0,0 +1,28 @@
+module.exports = {
+  deploy: {
+    fromPath: './dist',
+    gotoTarget: 'github',
+    github: {
+      targetType: 'git',
+      repo: 'https://github.com/tuc-vic/vic-user.bittic.org',
+      branch: 'main',
+      gitname: 'vic-team',
+      gitemail: 'vic-team@outlook.com',
+      url: 'http://vic-user.bittic.org',
+    },
+    vultr: {
+      targetType: 'ssh',
+      host: 'vic-user.bittic.org',
+      targetPath: '/faronear/tuc-vic/vic.user.react',
+      targetDir: 'dist',
+      user: 'adot',
+      password: '',
+      privateKey: `${process.env.HOME}/.ssh/id_rsa`, // 登录用户私钥文件
+    },
+    unicloud: {
+      targetType: 'serverless',
+      space: 'cn-bittic-vic-user',
+      url: 'http://vic-user.bittic.cn',
+    },
+  },
+}
diff --git a/envar-base-basic.js b/envar-web-basic.js
similarity index 100%
rename from envar-base-basic.js
rename to envar-web-basic.js
diff --git a/package.json b/package.json
index 4ee8386..699d36d 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
     "check": "umi dev",
     "create": "umi build",
     "deploy": "node ./node_modules/basend-deployer/deploy.js",
-    "serve.pm2": "cross-env NODE_ENV=production pm2 start ./node_modules/basend-webserver/server.js --name vic.user.react",
+    "serve.pm2": "cross-env NODE_ENV=production pm2 start ./node_modules/basend-webserver/webserver.js --name vic.user.react",
     "lint:es": "eslint --ext .js src mock tests",
     "lint:ts": "tslint \"src/**/*.ts\" \"src/**/*.tsx\"",
     "test": "umi test"