diff --git a/index.js b/index.js index f722e7f..17acc3a 100644 --- a/index.js +++ b/index.js @@ -15,52 +15,52 @@ module.exports = function (rawConfig) { // ConfigSecret: 机密参数,例如哈希盐,webtoken密钥,等等。本文件绝对不能纳入版本管理。 // 命令行参数 - console.info(' -- Loading Configuration Files (读取配置文件)') + console.info('- Loading Configuration Files (读取配置文件)') let configFile if (fs.existsSync((configFile = path.join(process.cwd(), './ConfigBasic.js')))) { global.SysConfig = deepmerge(global.SysConfig, require(configFile)) - console.info(`${configFile} loaded`) + console.info(` - ${configFile} loaded`) } else { - console.info(` Missing and omitting ${configFile}`) + console.warn(` - Missing and omitting ${configFile}`) } if (fs.existsSync((configFile = path.join(process.cwd(), './ConfigCustom.js')))) { // 如果存在,覆盖掉 ConfigBasic 里的默认参数 global.SysConfig = deepmerge(global.SysConfig, require(configFile)) // 注意,objectMerge后,产生了一个新的对象,而不是在原来的Config里添加 console.info(`${configFile} loaded`) } else { - console.info(` Missing and omitting ${configFile}`) + console.warn(` - Missing and omitting ${configFile}`) } if (fs.existsSync((configFile = path.join(process.cwd(), './ConfigSecret.js')))) { // 如果存在,覆盖掉 ConfigBasic 和 ConfigCustom 里的参数 global.SysConfig = deepmerge(global.SysConfig, require(configFile)) console.info(`${configFile} loaded`) } else { - console.info(` Missing and omitting ${configFile}`) + console.warn(` - Missing and omitting ${configFile}`) } global.SysConfig = global.SysConfig || {} - console.log(' -- Loading Command Line Parameters (载入命令行参数)') + console.info('- Loading Command Line Parameters (载入命令行参数)') commander.version(global.SysConfig.VERSION || '0.0.1', '-v, --version') // 默认是 -V。如果要 -v,就要加 '-v --version' for (let [key, param, desc] of global.SysConfig.commanderOptions || []) { commander.option(param, `${desc} Default = "${global.SysConfig[key]}"`) } commander.parse(process.argv).parse(process.argv) - global.SysConfig.env = commander.env || global.SysConfig.env || process.env.NODE_ENV + global.SysConfig.env = commander.env || global.SysConfig.env || process.env.NODE_ENV || 'development' // server = require('express')(); server.get('env) === server.settings.env === process.env.NODE_ENV if (global.SysConfig.env === 'production' && global.SysConfig.production) { - console.log(' -- Loading Production Configuration (加载生产环境配置)') + console.info('- Loading Production Configuration (加载生产环境配置)') global.SysConfig = deepmerge(global.SysConfig, global.SysConfig.production) } delete global.SysConfig.production - console.log(' -- Merging Command Line Parameters into Configuration (把命令行参数合并入配置)') + console.log('- Merging Command Line Parameters into Configuration (把命令行参数合并入配置)') for (let key in commander) { if (typeof commander[key] === 'string' && !/^_/.test(key)) { global.SysConfig[key] = commander[key] || global.SysConfig[key] } } } - console.log('Final Configuration: ', global.SysConfig) + console.log('- Final Configuration: ', global.SysConfig) console.log('######## Completed System Configuration ########') return global.SysConfig }