Authored by 周奇琪

优化权限界面,添加接口超时和404等非200的处理

... ... @@ -5,5 +5,5 @@
module.exports = {
url:'http://admin.portal.yohobuy.com',
sessionKeep:'/account/profile/display',
timeout:15000
timeout:5000
};
\ No newline at end of file
... ...
... ... @@ -35,8 +35,7 @@ module.exports = function(req, res, next) {
var path = req.route?req.route.path:'';
if(req.session.user&&!checkPath(req.path,req)) {
res.status(403);
console.log('sdasda');
res.render('error/error_nolayout',{message:NO_AUTH});
res.render('error/error_nolayout',{message:NO_AUTH,layout:false});
return;
}
//进行白名单验证和session验证
... ...
... ... @@ -41,11 +41,11 @@ module.exports = function(proxyRoute) {
//老系统调用地址
var callUrl = config.url + req.originalUrl;
//gray 透传cookie
var options = {
method:method,
url:callUrl,
timeout:config.timeout,
headers: {
'Cookie':req.session.gray
}
... ... @@ -73,7 +73,7 @@ module.exports = function(proxyRoute) {
function callback(err,res,body) {
if(err) {
console.error(err);
res.status(500).send('');
ress.status(500).send('');
} else if(res&&res.statusCode === 200) {
setGrayCookie(req,res);
var ContentType = res.caseless.get('Content-Type');
... ... @@ -84,6 +84,10 @@ module.exports = function(proxyRoute) {
setGrayCookie(req,res);
//跳转
ress.redirect(res.caseless.get('location'));
} else if(res){
ress.status(res.statusCode).send(body);
} else {
ress.status(500).send('500 ERROR!');
}
}
} else {
... ... @@ -92,7 +96,6 @@ module.exports = function(proxyRoute) {
request({
method:'GET',
url: config.url + config.sessionKeep,
timeout: config.timeout,
headers: {
'Cookie':req.session.gray
}
... ...