fe / yohobuy-portal-fe2 · Commits

Go to a project

Authored by 陶雨
Commit ccb7e287b0f0269710026cef5768444075e072ca 2 parents b64c18b5 783f68e5

Merge branch 'yohobuy_portak_dev_v4.8_20160620' of http://git.yoho.cn/fe/yohobuy… 

…-portal-fe2 into yohobuy_portak_dev_v4.8_20160620
Inline Side-by-side
Showing 6 changed files with 18 additions and 8 deletions
... ... @@ -40,7 +40,7 @@
<td>说明：</td>
<td colspan="2">
1、上传文件必须是<span style="color:red;">.xlsx</span>文件<br>
2、第一行标题栏：<span style="color: #67D267;">SKN|奥莱</span><br>
2、第一行标题栏：<span style="color: #67D267;">SKU|条码</span><br>
3、<a href="/ajax/link/modifyFactoryCode">下载样例</a>
</td>
</tr>
... ...
... ... @@ -102,9 +102,14 @@ if(process.env.NODE_ENV==="test"){
apiCofig.EnvConst.domain="http://10.66.100.6:8088/platform";
apiCofig.EnvConst.yohoSearch="http://10.66.100.4:8080/yohosearch";
}
/**/
if(process.env.NODE_ENV==="production"){
/*灰度环境*/
if(process.env.NODE_ENV==="gray"){
apiCofig.EnvConst.domain="http://172.31.23.161:8088/platform";
apiCofig.EnvConst.yohoSearch="http://search.yohoops.org/yohosearch";
}
/*线上环境*/
if(process.env.NODE_ENV==="production"){
apiCofig.EnvConst.domain="http://172.31.20.7:8088/platform";
apiCofig.EnvConst.yohoSearch="http://search.yohoops.org/yohosearch";
}
module.exports = require('./libs/App')(apiCofig);
\ No newline at end of file
... ...
{
"name": "yohobuy-portal-fe",
"version": "4.6.4",
"version": "4.7.0",
"description": "Construction of the presentation layer solution is based on express, handlebars",
"main": "app.js",
"scripts": {
... ...
... ... @@ -102,9 +102,14 @@ if(process.env.NODE_ENV==="test"){
apiCofig.EnvConst.domain="http://10.66.100.6:8088/platform";
apiCofig.EnvConst.yohoSearch="http://10.66.100.4:8080/yohosearch";
}
/**/
if(process.env.NODE_ENV==="production"){
/*灰度环境*/
if(process.env.NODE_ENV==="gray"){
apiCofig.EnvConst.domain="http://172.31.23.161:8088/platform";
apiCofig.EnvConst.yohoSearch="http://search.yohoops.org/yohosearch";
}
/*线上环境*/
if(process.env.NODE_ENV==="production"){
apiCofig.EnvConst.domain="http://172.31.20.7:8088/platform";
apiCofig.EnvConst.yohoSearch="http://search.yohoops.org/yohosearch";
}
module.exports = require('./libs/App')(apiCofig);
\ No newline at end of file
... ...
{"name":"yohobuy-portal-fe","version":"4.6.4","description":"Construction of the presentation layer solution is based on express, handlebars","main":"app.js","scripts":{"code":"set NODE_ENV=coding&& gulp start","build":"set NODE_ENV=production && gulp && gulp mvc","server":"set NODE_ENV=server&& gulp start"},"dependencies":{"art-template":"^3.0.3","async":"^2.0.0-rc.3","body-parser":"^1.15.0","connect-multiparty":"^2.0.0","connect-redis":"^3.0.2","cookie-parser":"^1.4.1","express":"^4.13.4","express-session":"^1.13.0","lodash":"^4.11.1","md5":"^2.1.0","mkdirp":"^0.5.1","request":"^2.72.0","winston":"^2.2.0","glob":"^7.0.3"}}
\ No newline at end of file
{"name":"yohobuy-portal-fe","version":"4.7.0","description":"Construction of the presentation layer solution is based on express, handlebars","main":"app.js","scripts":{"code":"set NODE_ENV=coding&& gulp start","build":"set NODE_ENV=production && gulp && gulp mvc","server":"set NODE_ENV=server&& gulp start"},"dependencies":{"art-template":"^3.0.3","async":"^2.0.0-rc.3","body-parser":"^1.15.0","connect-multiparty":"^2.0.0","connect-redis":"^3.0.2","cookie-parser":"^1.4.1","express":"^4.13.4","express-session":"^1.13.0","lodash":"^4.11.1","md5":"^2.1.0","mkdirp":"^0.5.1","request":"^2.72.0","winston":"^2.2.0","glob":"^7.0.3"}}
\ No newline at end of file
... ...
... ... @@ -40,7 +40,7 @@
<td>说明：</td>
<td colspan="2">
1、上传文件必须是<span style="color:red;">.xlsx</span>文件<br>
2、第一行标题栏：<span style="color: #67D267;">SKN|奥莱</span><br>
2、第一行标题栏：<span style="color: #67D267;">SKU|条码</span><br>
3、<a href="/ajax/link/modifyFactoryCode">下载样例</a>
</td>
</tr>
... ...