Commit b3f59255 authored by 陈志良's avatar 陈志良

Merge branch 'bugfix_0721_sharev3' into SANDBOX

parents ad88adef 319e122e
...@@ -556,7 +556,7 @@ router.get('/sharev3.js', function(req, res, next) { ...@@ -556,7 +556,7 @@ router.get('/sharev3.js', function(req, res, next) {
}catch(err){ }catch(err){
console.log(err); console.log(err);
} }
getWXV2(res, title, desc, link, imgUrl, mid,ent_code, id,type,null,true); getWXV2(res, title, desc, link, imgUrl, mid,ent_code, id,type,null);
}else{ }else{
then.parallel([ then.parallel([
function(cont){ function(cont){
...@@ -592,7 +592,7 @@ router.get('/sharev3.js', function(req, res, next) { ...@@ -592,7 +592,7 @@ router.get('/sharev3.js', function(req, res, next) {
}else{ }else{
link = link + '&uId='+ uId; link = link + '&uId='+ uId;
} }
getWXV2(res, title, desc, link, imgUrl, mid,ent_code, id,type,null,true); getWXV2(res, title, desc, link, imgUrl, mid,ent_code, id,type,null);
}).fail(function(cont, err) { }).fail(function(cont, err) {
res.json(_.assign({result:false},returnCode.WRONG_PARAM)); res.json(_.assign({result:false},returnCode.WRONG_PARAM));
}); });
......
...@@ -108,6 +108,10 @@ app.use('/v1/forum/*',forumUser.identifyUser()); ...@@ -108,6 +108,10 @@ app.use('/v1/forum/*',forumUser.identifyUser());
require(controller)(app); require(controller)(app);
}); });
app.use('/aliveCheck',function(req, res, next) {
res.status(200).end();
});
app.use(function(req, res, next) { app.use(function(req, res, next) {
var err = new Error('Not Found'); var err = new Error('Not Found');
err.status = 404; err.status = 404;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment