feat: ops

sean · sean · commit 20db695cfc61 · 2017-07-27T14:21:22.000+08:00
diff --git a/config_example.json 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": "*****"
+    }
+  }
+}
diff --git a/server/config.js b/server/config.js
diff --git 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
@@ -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
diff --git 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
@@ -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) {

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`import fs from 'fs-extra';`
`2`		`-import initConfig from './utils/initConfig.js'`
`3`	`2`	`import yapi from './yapi.js';`
`4`	`3`	`import commons from './utils/commons';`
`5`	`4`	`import dbModule from './utils/db.js';`