From cdfd52a219b7b34a69111e097a46da2e05d3f909 Mon Sep 17 00:00:00 2001 From: zwjamnsss Date: Thu, 27 Jul 2017 11:29:12 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20group=20=E6=90=9C=E7=B4=A2=E6=A1=86?= =?UTF-8?q?=E5=AE=BD=E5=BA=A6=E7=AA=84=E8=B6=85=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/containers/ProjectGroups/GroupList/GroupList.scss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/client/containers/ProjectGroups/GroupList/GroupList.scss b/client/containers/ProjectGroups/GroupList/GroupList.scss index 68902b46..a201c99b 100644 --- a/client/containers/ProjectGroups/GroupList/GroupList.scss +++ b/client/containers/ProjectGroups/GroupList/GroupList.scss @@ -37,13 +37,13 @@ } .group-operate { height: 48px; - min-width: 263px; padding: 10px 6px; background: #eee; + display: flex; + justify-content: space-around; .search { - display: inline-block; margin-right: 6px; - width: 162px; + flex-grow: 1; } } .group-list { From 8d6de5d3f28965316ea2afb3c0cd489bf59c66a0 Mon Sep 17 00:00:00 2001 From: suxiaoxin Date: Thu, 27 Jul 2017 11:50:15 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E5=9B=A0=E9=83=A8=E7=BD=B2?= =?UTF-8?q?=E4=BF=AE=E6=94=B9runtime=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/config.js | 14 ++++++++++-- server/utils/initConfig.js | 6 +++-- server/yapi.js | 2 +- server_dist/config.js | 19 +++++++++++++--- server_dist/utils/initConfig.js | 6 +++-- server_dist/yapi.js | 2 +- service.sh | 39 +++++++++++++++++++++++++++++++++ 7 files changed, 77 insertions(+), 11 deletions(-) create mode 100644 service.sh diff --git a/server/config.js b/server/config.js index 96623b87..c83346d6 100644 --- a/server/config.js +++ b/server/config.js @@ -1,5 +1,11 @@ -module.exports = { +import path from 'path' +/** + * config.js是用来第一次安装初始化网站配置，如果不用默认的runtime_path，可以直接修改runtime_path路径 + */ +let runtime_path = path.join(path.resolve(__dirname, '../'), 'runtime') +let config = { "port": 80, + "runtime_path": runtime_path, "webhost": "yapi.local.qunar.com", "adminAccount": "admin@admin.com", "db": { @@ -16,4 +22,8 @@ module.exports = { "pass": "**********" } } -} \ No newline at end of file +} + +module.exports = config + + diff --git a/server/utils/initConfig.js b/server/utils/initConfig.js index a52fa17e..bafb5980 100644 --- a/server/utils/initConfig.js +++ b/server/utils/initConfig.js @@ -2,8 +2,10 @@ import path from 'path'; import fs from 'fs-extra'; import config from '../config.js'; -fs.ensureDirSync( path.join(path.resolve(__dirname, '../../'), 'runtime') ); -let configPath = path.join(path.resolve(__dirname, '../../'), 'runtime', 'config.json') +let runtimePath = config.runtime_path; +fs.ensureDirSync( runtimePath ); +fs.ensureDirSync( path.join(runtimePath, 'log')); +let configPath = path.join(runtimePath, 'config.json') fs.writeFileSync(configPath, JSON.stringify(config, null, '\t'), diff --git a/server/yapi.js b/server/yapi.js index c7d3eb4a..dc5e0198 100644 --- a/server/yapi.js +++ b/server/yapi.js @@ -8,7 +8,7 @@ let mail; const WEBROOT = path.resolve(__dirname, '..'); //路径 const WEBROOT_SERVER = __dirname; -const WEBROOT_RUNTIME = path.join(WEBROOT, 'runtime'); +const WEBROOT_RUNTIME = config.runtime_path; const WEBROOT_LOG = path.join(WEBROOT_RUNTIME, 'log'); const WEBCONFIG = config; diff --git a/server_dist/config.js b/server_dist/config.js index cbf2c2a6..3121f802 100644 --- a/server_dist/config.js +++ b/server_dist/config.js @@ -1,7 +1,18 @@ -"use strict"; +'use strict'; -module.exports = { +var _path = require('path'); + +var _path2 = _interopRequireDefault(_path); + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + +/** + * config.js是用来第一次安装初始化网站配置，如果不用默认的runtime_path，可以直接修改runtime_path路径 + */ +var runtime_path = _path2.default.join(_path2.default.resolve(__dirname, '../'), 'runtime'); +var config = { "port": 80, + "runtime_path": runtime_path, "webhost": "yapi.local.qunar.com", "adminAccount": "admin@admin.com", "db": { @@ -18,4 +29,6 @@ module.exports = { "pass": "**********" } } -}; \ No newline at end of file +}; + +module.exports = config; \ No newline at end of file diff --git a/server_dist/utils/initConfig.js b/server_dist/utils/initConfig.js index f089425f..c7ae500e 100644 --- a/server_dist/utils/initConfig.js +++ b/server_dist/utils/initConfig.js @@ -18,7 +18,9 @@ var _config2 = _interopRequireDefault(_config); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } -_fsExtra2.default.ensureDirSync(_path2.default.join(_path2.default.resolve(__dirname, '../../'), 'runtime')); -var configPath = _path2.default.join(_path2.default.resolve(__dirname, '../../'), 'runtime', 'config.json'); +var runtimePath = _config2.default.runtime_path; +_fsExtra2.default.ensureDirSync(runtimePath); +_fsExtra2.default.ensureDirSync(_path2.default.join(runtimePath, 'log')); +var configPath = _path2.default.join(runtimePath, 'config.json'); _fsExtra2.default.writeFileSync(configPath, (0, _stringify2.default)(_config2.default, null, '\t'), { encoding: 'utf8' }); \ No newline at end of file diff --git a/server_dist/yapi.js b/server_dist/yapi.js index fe35f0ad..135a58df 100644 --- a/server_dist/yapi.js +++ b/server_dist/yapi.js @@ -27,7 +27,7 @@ var mail = void 0; var WEBROOT = _path2.default.resolve(__dirname, '..'); //路径 var WEBROOT_SERVER = __dirname; -var WEBROOT_RUNTIME = _path2.default.join(WEBROOT, 'runtime'); +var WEBROOT_RUNTIME = _config2.default.runtime_path; var WEBROOT_LOG = _path2.default.join(WEBROOT_RUNTIME, 'log'); var WEBCONFIG = _config2.default; diff --git a/service.sh b/service.sh new file mode 100644 index 00000000..f9d4b434 --- /dev/null +++ b/service.sh @@ -0,0 +1,39 @@ +#!/bin/bash + +prog="/var/soft/node-v6.11.1-linux-x64/bin/pm2" +app="/home/q/www/yapi.beta.corp.qunar.com/webapp/server_dist/app.js" + + + +start() { + echo "Starting Server..." + eval "$prog start $app --name=yapi" +} + +stop() { + echo "Stopping Server..." + eval "$prog stop yapi" +} + +restart() { + echo "Restart Server..." + eval "$prog restart yapi" +} + + + + +case "$1" in +start) +start && exit 0 +;; +stop) +stop || exit 0 +;; +restart) +restart || exit 0 +;; +*) +echo $"Usage: $0 {start|stop|restart}" +exit 2 +esac \ No newline at end of file