Commit 2b37d12b authored by 陈家荣's avatar 陈家荣

Merge branch 'development' of git.wxpai.cn:scrmgroup/pisns-forum-api into development

parents 3c3865a6 a8b7974c
......@@ -77,7 +77,6 @@ var checkLimitAction = function(req, res) {
//验证用户身份
router.post('/user/identifyUser',function(req,res,next){
var entity=req.body;
req.session.mobileForumUser=null;
if(!req.session.mobileForumUser){
forumUserService.getUserByUid(entity.uid,function(err,doc){
if(err){
......@@ -90,7 +89,7 @@ router.post('/user/identifyUser',function(req,res,next){
openId:doc.uid
};
// checkLimitAction(req, res);
res.json('success');
res.json({result:'success',userId:doc._id});
}else{
forumUserService.createUser(entity,function(err,doc){
if(err){
......@@ -102,15 +101,15 @@ router.post('/user/identifyUser',function(req,res,next){
openId:doc.uid
};
// checkLimitAction(req, res);
res.json('success');
res.json({result:'success',userId:doc._id});
}
});
}
}
});
}else{
res.json('success');
}
}else{
res.json('success');
}
});
//微信分享带来用户
router.get('/user/from/share', function(req, res, next) {
......@@ -145,7 +144,6 @@ router.post('/user/checkLimitAction', function(req, res, next) {
if(mid){
var array = [];
forumLimitActionRefService.getLimitActionRefByMid(mid,function(err,forumLimitActionRef){
console.log(forumLimitActionRef);
if (err) {
console.error(err);
res.json('success');
......
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