Authored by 毕凯

修改配置目录

@@ -20,9 +20,12 @@ var config = require('./config'); @@ -20,9 +20,12 @@ var config = require('./config');
20 var app = express(), 20 var app = express(),
21 RedisStore = connectRedis(session); 21 RedisStore = connectRedis(session);
22 22
23 -// 根据不同配置获取不同配置  
24 -if (app.get('env') === 'development') {  
25 - config = Object.assign(config, require('./config.dev')); 23 +// 向模板注入变量
  24 +app.locals.devEnv = app.get('env') === 'development';
  25 +
  26 +// 根据不同环境获取不同配置
  27 +if (app.locals.devEnv) {
  28 + config = Object.assign(config, require('./config/config.dev'));
26 } 29 }
27 30
28 app.set('trust proxy', ['loopback', 'linklocal', 'uniquelocal']); 31 app.set('trust proxy', ['loopback', 'linklocal', 'uniquelocal']);
@@ -48,9 +51,6 @@ app.use(session({ @@ -48,9 +51,6 @@ app.use(session({
48 secret: config.sessionSecret 51 secret: config.sessionSecret
49 })); 52 }));
50 53
51 -// 向模板注入变量  
52 -app.locals.devEnv = app.get('env') === 'development';  
53 -  
54 // 加载路由 54 // 加载路由
55 app.use('/', require('./router')); 55 app.use('/', require('./router'));
56 56