Merge branch 'develop' of git.dev.yoho.cn:platform/yohobuy-portal-fe into develop
Showing
1 changed file
with
21 additions
and
21 deletions
@@ -9,7 +9,7 @@ var util = require('../util/common'); | @@ -9,7 +9,7 @@ var util = require('../util/common'); | ||
9 | * @type Object | 9 | * @type Object |
10 | */ | 10 | */ |
11 | var config = { | 11 | var config = { |
12 | - 'preview':{ | 12 | + 'development':{ |
13 | redis:null, | 13 | redis:null, |
14 | apiKey:'sd4H1ecAqlp', | 14 | apiKey:'sd4H1ecAqlp', |
15 | domain:'http://192.168.102.215:8088/platform', | 15 | domain:'http://192.168.102.215:8088/platform', |
@@ -45,26 +45,26 @@ var config = { | @@ -45,26 +45,26 @@ var config = { | ||
45 | } | 45 | } |
46 | } | 46 | } |
47 | }, | 47 | }, |
48 | - // 'preview': { | ||
49 | - // redis: { | ||
50 | - // port:6379, | ||
51 | - // host:'192.168.74.17' | ||
52 | - // }, | ||
53 | - // apiKey:'sd4H1ecAqlp', | ||
54 | - // domain:'http://192.168.81.13:8189/yoho-admin-portal', | ||
55 | - // logsFile:'/Data/logs/node/yohobuy-portal-log/', | ||
56 | - // loggers: { | ||
57 | - // api: { | ||
58 | - // level:'info' | ||
59 | - // }, | ||
60 | - // yo: { | ||
61 | - // level:'info' | ||
62 | - // }, | ||
63 | - // app: { | ||
64 | - // level:'info' | ||
65 | - // } | ||
66 | - // } | ||
67 | - // }, | 48 | + 'preview': { |
49 | + redis: { | ||
50 | + port:6379, | ||
51 | + host:'192.168.74.17' | ||
52 | + }, | ||
53 | + apiKey:'sd4H1ecAqlp', | ||
54 | + domain:'http://192.168.81.13:8189/yoho-admin-portal', | ||
55 | + logsFile:'/Data/logs/node/yohobuy-portal-log/', | ||
56 | + loggers: { | ||
57 | + api: { | ||
58 | + level:'info' | ||
59 | + }, | ||
60 | + yo: { | ||
61 | + level:'info' | ||
62 | + }, | ||
63 | + app: { | ||
64 | + level:'info' | ||
65 | + } | ||
66 | + } | ||
67 | + }, | ||
68 | 'production':{ | 68 | 'production':{ |
69 | redis:{ | 69 | redis:{ |
70 | port:16379, | 70 | port:16379, |
-
Please register or login to post a comment