fe / yohobuy-portal-fe2 · Commits

Go to a project

Authored by wangwei
Commit ed25f5d1a17b1257a6c73fa4fc4307d7addebe87 2 parents 003f0626 b96d2f8b

Merge branch 'master' into test6.5

Inline Side-by-side
Showing 2 changed files with 6 additions and 6 deletions
@@ -77,7 +77,7 @@ var apiCofig = { @@ -77,7 +77,7 @@ var apiCofig = {
77 if(process.env.NODE_ENV!="coding"&&process.env.NODE_ENV!=="test"){ 77 if(process.env.NODE_ENV!="coding"&&process.env.NODE_ENV!=="test"){
78 options.store=new Redis({ 78 options.store=new Redis({
79 port: 6379, 79 port: 6379,
80 - host: 'localhost' 80 + host: 'redis.platform.yohoops.org'
81 }); 81 });
82 } 82 }
83 83
@@ -130,14 +130,14 @@ if(process.env.NODE_ENV==="test"){ @@ -130,14 +130,14 @@ if(process.env.NODE_ENV==="test"){
130 130
131 /*灰度环境*/ 131 /*灰度环境*/
132 if(process.env.NODE_ENV==="gray"){ 132 if(process.env.NODE_ENV==="gray"){
133 - apiCofig.EnvConst.domain="http://172.31.23.161:8088/platform"; 133 + apiCofig.EnvConst.domain="http://10.66.50.107:8088/platform";
134 apiCofig.EnvConst.yohoSearch="http://search.yohoops.org/yohosearch"; 134 apiCofig.EnvConst.yohoSearch="http://search.yohoops.org/yohosearch";
135 Iaccount.loginEx = "http://gateway.erp.yohoops.org/erp-gateway-web/account/profile/login"; 135 Iaccount.loginEx = "http://gateway.erp.yohoops.org/erp-gateway-web/account/profile/login";
136 Iaccount.queryAllAuth = "http://gateway.erp.yohoops.org/erp-gateway-web/account/profileDataEntitlement/queryAllAuth"; 136 Iaccount.queryAllAuth = "http://gateway.erp.yohoops.org/erp-gateway-web/account/profileDataEntitlement/queryAllAuth";
137 } 137 }
138 /*线上环境*/ 138 /*线上环境*/
139 if(process.env.NODE_ENV==="production"){ 139 if(process.env.NODE_ENV==="production"){
140 - apiCofig.EnvConst.domain="http://172.31.20.7:8088/platform"; 140 + apiCofig.EnvConst.domain="http://10.66.50.140:8088/platform";
141 apiCofig.EnvConst.yohoSearch="http://search.yohoops.org/yohosearch"; 141 apiCofig.EnvConst.yohoSearch="http://search.yohoops.org/yohosearch";
142 Iaccount.loginEx = "http://gateway.erp.yohoops.org/erp-gateway-web/account/profile/login"; 142 Iaccount.loginEx = "http://gateway.erp.yohoops.org/erp-gateway-web/account/profile/login";
143 Iaccount.queryAllAuth = "http://gateway.erp.yohoops.org/erp-gateway-web/account/profileDataEntitlement/queryAllAuth"; 143 Iaccount.queryAllAuth = "http://gateway.erp.yohoops.org/erp-gateway-web/account/profileDataEntitlement/queryAllAuth";
@@ -77,7 +77,7 @@ var apiCofig = { @@ -77,7 +77,7 @@ var apiCofig = {
77 if(process.env.NODE_ENV!="coding"&&process.env.NODE_ENV!=="test"){ 77 if(process.env.NODE_ENV!="coding"&&process.env.NODE_ENV!=="test"){
78 options.store=new Redis({ 78 options.store=new Redis({
79 port: 6379, 79 port: 6379,
80 - host: 'localhost' 80 + host: 'redis.platform.yohoops.org'
81 }); 81 });
82 } 82 }
83 83
@@ -130,14 +130,14 @@ if(process.env.NODE_ENV==="test"){ @@ -130,14 +130,14 @@ if(process.env.NODE_ENV==="test"){
130 130
131 /*灰度环境*/ 131 /*灰度环境*/
132 if(process.env.NODE_ENV==="gray"){ 132 if(process.env.NODE_ENV==="gray"){
133 - apiCofig.EnvConst.domain="http://172.31.23.161:8088/platform"; 133 + apiCofig.EnvConst.domain="http://10.66.50.107:8088/platform";
134 apiCofig.EnvConst.yohoSearch="http://search.yohoops.org/yohosearch"; 134 apiCofig.EnvConst.yohoSearch="http://search.yohoops.org/yohosearch";
135 Iaccount.loginEx = "http://gateway.erp.yohoops.org/erp-gateway-web/account/profile/login"; 135 Iaccount.loginEx = "http://gateway.erp.yohoops.org/erp-gateway-web/account/profile/login";
136 Iaccount.queryAllAuth = "http://gateway.erp.yohoops.org/erp-gateway-web/account/profileDataEntitlement/queryAllAuth"; 136 Iaccount.queryAllAuth = "http://gateway.erp.yohoops.org/erp-gateway-web/account/profileDataEntitlement/queryAllAuth";
137 } 137 }
138 /*线上环境*/ 138 /*线上环境*/
139 if(process.env.NODE_ENV==="production"){ 139 if(process.env.NODE_ENV==="production"){
140 - apiCofig.EnvConst.domain="http://172.31.20.7:8088/platform"; 140 + apiCofig.EnvConst.domain="http://10.66.50.140:8088/platform";
141 apiCofig.EnvConst.yohoSearch="http://search.yohoops.org/yohosearch"; 141 apiCofig.EnvConst.yohoSearch="http://search.yohoops.org/yohosearch";
142 Iaccount.loginEx = "http://gateway.erp.yohoops.org/erp-gateway-web/account/profile/login"; 142 Iaccount.loginEx = "http://gateway.erp.yohoops.org/erp-gateway-web/account/profile/login";
143 Iaccount.queryAllAuth = "http://gateway.erp.yohoops.org/erp-gateway-web/account/profileDataEntitlement/queryAllAuth"; 143 Iaccount.queryAllAuth = "http://gateway.erp.yohoops.org/erp-gateway-web/account/profileDataEntitlement/queryAllAuth";