From 20db695cfc61a01bc328dc38a670b2cd002e938d Mon Sep 17 00:00:00 2001
From: sean <wenxiong.su@qunar.com>
Date: Thu, 27 Jul 2017 14:21:22 +0800
Subject: [PATCH] feat: ops

---
 config_example.json    | 21 +++++++++++++++++++++
 server/config.js       | 27 ---------------------------
 server/install.js      |  1 -
 server/yapi.js         |  9 ++-------
 server_dist/config.js  | 27 ---------------------------
 server_dist/install.js |  4 ----
 server_dist/yapi.js    |  9 ++-------
 7 files changed, 25 insertions(+), 73 deletions(-)
 create mode 100644 config_example.json
 delete mode 100644 server/config.js
 delete mode 100644 server_dist/config.js

diff --git a/config_example.json b/config_example.json
new file mode 100644
index 00000000..14164abc
--- /dev/null
+++ b/config_example.json
@@ -0,0 +1,21 @@
+{
+  "port": "3000",
+  "webhost": "yapi.local.qunar.com",
+  "adminAccount": "admin@admin.com",
+  "db": {
+    "servername": "127.0.0.1",
+    "DATABASE":  "yapi",
+    "port": 27017,
+    "user": "test1",
+    "pass": "test1"
+  },
+  "mail": {
+    "host": "smtp.163.com",
+    "port": 465,
+    "from": "***@163.com",
+    "auth": {
+        "user": "***@163.com",
+        "pass": "*****"
+    }
+  }
+}
\ No newline at end of file
diff --git a/server/config.js b/server/config.js
deleted file mode 100644
index ed9b761b..00000000
--- a/server/config.js
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * config.js是用来第一次安装初始化网站配置，如果不用默认的runtime_path，可以直接修改runtime_path路径
- */
-let config = {
-  "port": 80,
-  "runtime_path": '',
-  "webhost": "yapi.local.qunar.com",
-  "adminAccount": "admin@admin.com",
-  "db": {
-    "servername": "127.0.0.1",
-    "DATABASE": "yapi",
-    "port": 27017
-  },
-  "mail": {
-    "host": "smtp.mail.com",
-    "from": "****@mail.com",
-    "port": 4652,
-    "auth": {
-      "user": "****@mail.com",
-      "pass": "**********"
-    }
-  }
-}
-
-module.exports = config
-
-
diff --git a/server/install.js b/server/install.js
index 42cd37eb..1ac097ce 100644
--- a/server/install.js
+++ b/server/install.js
@@ -1,5 +1,4 @@
 import fs from 'fs-extra';
-import initConfig from './utils/initConfig.js'
 import yapi from './yapi.js';
 import commons from './utils/commons';
 import dbModule from './utils/db.js';
diff --git a/server/yapi.js b/server/yapi.js
index e201b643..a429e143 100644
--- a/server/yapi.js
+++ b/server/yapi.js
@@ -1,22 +1,17 @@
 import path from 'path';
 import fs from 'fs-extra';
 import nodemailer from 'nodemailer';
-import config from '../runtime/config.json';
+import config from '../../config.json';
 
 let insts = new Map();
 let mail;
 
-if(!config.runtime_path){
-    config.runtime_path = path.join(path.resolve(__dirname, '../'), 'runtime')
-}
-
 const WEBROOT = path.resolve(__dirname, '..'); //路径
 const WEBROOT_SERVER = __dirname;
-const WEBROOT_RUNTIME = config.runtime_path;
+const WEBROOT_RUNTIME = path.resolve(__dirname, '../..');
 const WEBROOT_LOG = path.join(WEBROOT_RUNTIME, 'log');
 const WEBCONFIG = config;
 
-fs.ensureDirSync(WEBROOT_RUNTIME);
 fs.ensureDirSync(WEBROOT_LOG);
 
 if (WEBCONFIG.mail) {
diff --git a/server_dist/config.js b/server_dist/config.js
deleted file mode 100644
index 44a2d110..00000000
--- a/server_dist/config.js
+++ /dev/null
@@ -1,27 +0,0 @@
-"use strict";
-
-/**
- * config.js是用来第一次安装初始化网站配置，如果不用默认的runtime_path，可以直接修改runtime_path路径
- */
-var config = {
-  "port": 80,
-  "runtime_path": '',
-  "webhost": "yapi.local.qunar.com",
-  "adminAccount": "admin@admin.com",
-  "db": {
-    "servername": "127.0.0.1",
-    "DATABASE": "yapi",
-    "port": 27017
-  },
-  "mail": {
-    "host": "smtp.mail.com",
-    "from": "****@mail.com",
-    "port": 4652,
-    "auth": {
-      "user": "****@mail.com",
-      "pass": "**********"
-    }
-  }
-};
-
-module.exports = config;
\ No newline at end of file
diff --git a/server_dist/install.js b/server_dist/install.js
index 256386d9..c466f30c 100644
--- a/server_dist/install.js
+++ b/server_dist/install.js
@@ -4,10 +4,6 @@ var _fsExtra = require('fs-extra');
 
 var _fsExtra2 = _interopRequireDefault(_fsExtra);
 
-var _initConfig = require('./utils/initConfig.js');
-
-var _initConfig2 = _interopRequireDefault(_initConfig);
-
 var _yapi = require('./yapi.js');
 
 var _yapi2 = _interopRequireDefault(_yapi);
diff --git a/server_dist/yapi.js b/server_dist/yapi.js
index 0308ff03..34606718 100644
--- a/server_dist/yapi.js
+++ b/server_dist/yapi.js
@@ -16,7 +16,7 @@ var _nodemailer = require('nodemailer');
 
 var _nodemailer2 = _interopRequireDefault(_nodemailer);
 
-var _config = require('../runtime/config.json');
+var _config = require('../../config.json');
 
 var _config2 = _interopRequireDefault(_config);
 
@@ -25,17 +25,12 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 var insts = new _map2.default();
 var mail = void 0;
 
-if (!_config2.default.runtime_path) {
-    _config2.default.runtime_path = _path2.default.join(_path2.default.resolve(__dirname, '../'), 'runtime');
-}
-
 var WEBROOT = _path2.default.resolve(__dirname, '..'); //路径
 var WEBROOT_SERVER = __dirname;
-var WEBROOT_RUNTIME = _config2.default.runtime_path;
+var WEBROOT_RUNTIME = _path2.default.resolve(__dirname, '../..');
 var WEBROOT_LOG = _path2.default.join(WEBROOT_RUNTIME, 'log');
 var WEBCONFIG = _config2.default;
 
-_fsExtra2.default.ensureDirSync(WEBROOT_RUNTIME);
 _fsExtra2.default.ensureDirSync(WEBROOT_LOG);
 
 if (WEBCONFIG.mail) {