Toggle navigation
Toggle navigation
This project
Loading...
Sign in
fe
/
yohobuy-portal-fe
·
Commits
Go to a project
GitLab
Go to group
Project
Activity
Files
Commits
Pipelines
0
Builds
0
Graphs
Milestones
Issues
0
Merge Requests
0
Members
Labels
Wiki
Forks
Network
Create a new issue
Download as
Plain Diff
Browse Files
Authored by
陶雨
2016-03-16 15:42:12 +0800
Commit
5b0fb6563f86614d39129e1d1dcff09719428596
2 parents
89691b98
903c5eb0
Merge branch 'release/1.6' of
http://git.dev.yoho.cn/platform/yohobuy-portal-fe
into release/1.6
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
server/interface/guang.js
server/mid/grayroute.js
server/interface/guang.js
View file @
5b0fb65
exports
.
domain
=
'http://172.16.9.8:8080/yohobuy-platform-web'
;
//exports.domain = 'http://172.16.9.8:8080/yohobuy-platform-web';
exports
.
domain
=
require
(
'../config/common.js'
).
domain
;
exports
.
res
=
[{
//网销信息 -> 逛关联
route
:
'/goods/article/queryArticlesBySKN'
,
...
...
server/mid/grayroute.js
View file @
5b0fb65
...
...
@@ -57,7 +57,7 @@ module.exports = function(proxyRoute) {
logger
.
log
(
'info'
,
'grayroute: request options: %j'
,
options
,{});
//发起代理请求
if
(
req
.
headers
[
'accept'
].
indexOf
(
'text/html'
)
>-
1
)
{
if
(
req
.
headers
[
'accept'
].
indexOf
(
'text/html'
)
>-
1
||
req
.
xhr
)
{
request
(
options
,
function
(
err
,
res
,
body
)
{
if
(
err
)
{
logger
.
log
(
'error'
,
'grayroute: request error:'
,
err
);
...
...
Please
register
or
login
to post a comment