Authored by wangwei

Merge branch 'master' into test6.5

... ... @@ -77,7 +77,7 @@ var apiCofig = {
if(process.env.NODE_ENV!="coding"&&process.env.NODE_ENV!=="test"){
options.store=new Redis({
port: 6379,
host: 'localhost'
host: 'redis.platform.yohoops.org'
});
}
... ... @@ -130,14 +130,14 @@ if(process.env.NODE_ENV==="test"){
/*灰度环境*/
if(process.env.NODE_ENV==="gray"){
apiCofig.EnvConst.domain="http://172.31.23.161:8088/platform";
apiCofig.EnvConst.domain="http://10.66.50.107:8088/platform";
apiCofig.EnvConst.yohoSearch="http://search.yohoops.org/yohosearch";
Iaccount.loginEx = "http://gateway.erp.yohoops.org/erp-gateway-web/account/profile/login";
Iaccount.queryAllAuth = "http://gateway.erp.yohoops.org/erp-gateway-web/account/profileDataEntitlement/queryAllAuth";
}
/*线上环境*/
if(process.env.NODE_ENV==="production"){
apiCofig.EnvConst.domain="http://172.31.20.7:8088/platform";
apiCofig.EnvConst.domain="http://10.66.50.140:8088/platform";
apiCofig.EnvConst.yohoSearch="http://search.yohoops.org/yohosearch";
Iaccount.loginEx = "http://gateway.erp.yohoops.org/erp-gateway-web/account/profile/login";
Iaccount.queryAllAuth = "http://gateway.erp.yohoops.org/erp-gateway-web/account/profileDataEntitlement/queryAllAuth";
... ...
... ... @@ -77,7 +77,7 @@ var apiCofig = {
if(process.env.NODE_ENV!="coding"&&process.env.NODE_ENV!=="test"){
options.store=new Redis({
port: 6379,
host: 'localhost'
host: 'redis.platform.yohoops.org'
});
}
... ... @@ -130,14 +130,14 @@ if(process.env.NODE_ENV==="test"){
/*灰度环境*/
if(process.env.NODE_ENV==="gray"){
apiCofig.EnvConst.domain="http://172.31.23.161:8088/platform";
apiCofig.EnvConst.domain="http://10.66.50.107:8088/platform";
apiCofig.EnvConst.yohoSearch="http://search.yohoops.org/yohosearch";
Iaccount.loginEx = "http://gateway.erp.yohoops.org/erp-gateway-web/account/profile/login";
Iaccount.queryAllAuth = "http://gateway.erp.yohoops.org/erp-gateway-web/account/profileDataEntitlement/queryAllAuth";
}
/*线上环境*/
if(process.env.NODE_ENV==="production"){
apiCofig.EnvConst.domain="http://172.31.20.7:8088/platform";
apiCofig.EnvConst.domain="http://10.66.50.140:8088/platform";
apiCofig.EnvConst.yohoSearch="http://search.yohoops.org/yohosearch";
Iaccount.loginEx = "http://gateway.erp.yohoops.org/erp-gateway-web/account/profile/login";
Iaccount.queryAllAuth = "http://gateway.erp.yohoops.org/erp-gateway-web/account/profileDataEntitlement/queryAllAuth";
... ...