From 9e309160813e2e7dbc4a4fddd216c3be1cf5a645 Mon Sep 17 00:00:00 2001
From: suxiaoxin <hellosean1025@163.com>
Date: Tue, 26 Sep 2017 17:16:50 +0800
Subject: [PATCH] opti: npm run server to npm run start

---
 package.json   | 2 +-
 server/yapi.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index fe75c139..ac04898e 100755
--- a/package.json
+++ b/package.json
@@ -8,7 +8,7 @@
     "install-server": " node server/install.js",
     "dev-client": "ykit s -p 4000",
     "dev": "npm run dev-server & npm run dev-client",
-    "server": " node server/app.js"
+    "start": " node server/app.js"
   },
   "repository": {
     "type": "git",
diff --git a/server/yapi.js b/server/yapi.js
index 9d8ff9af..63fa1eed 100755
--- a/server/yapi.js
+++ b/server/yapi.js
@@ -14,7 +14,7 @@ const WEBCONFIG = config;
 
 fs.ensureDirSync(WEBROOT_LOG);
 
-if (WEBCONFIG.mail) {
+if (WEBCONFIG.mail && WEBCONFIG.mail.enable ) {
     mail = nodemailer.createTransport(WEBCONFIG.mail);
 }