Commit 059b8dbc authored by 张淼's avatar 张淼

1

parent fed49d6b
...@@ -17,17 +17,13 @@ exports.createUser=function(entity,callback){ ...@@ -17,17 +17,13 @@ exports.createUser=function(entity,callback){
//根据Uid获取用户 //根据Uid获取用户
exports.getUserByUid=function(uid,callback){ exports.getUserByUid=function(uid,callback){
console.log('==============uid:'+uid);
ForumUser.findOne({uid:uid}).exec(function(err,result){ ForumUser.findOne({uid:uid}).exec(function(err,result){
if(err){ if(err){
callback(err,null); callback(err,null);
}else{ }else{
console.log('==============result:'+result);
if(result ){ if(result ){
console.log('=================in a');
callback(null,result); callback(null,result);
}else{ }else{
console.log('=================in b');
callback(null,null); callback(null,null);
} }
} }
......
...@@ -21,37 +21,47 @@ exports.getOpenId=function(req){ ...@@ -21,37 +21,47 @@ exports.getOpenId=function(req){
exports.identifyUser=function() { exports.identifyUser=function() {
return function(req, res,next){ return function(req, res,next){
forumUserService.getUserByUid(req.session.openUser.openId,function(err,doc){ if(!req.session.mobileForumUser){
if(err){ forumUserService.getUserByUid(req.session.openUser.openId,function(err,doc){
next(err); if(err){
}else{ next(err);
if(doc){
req.session.mobileForumUser={
userId:doc._id,
openId:doc.uid
};
next(null);
}else{ }else{
var entity={ if(doc){
uid:req.session.openUser.openId, req.session.mobileForumUser={
nickName:req.session.openUser.nickName, userId:doc._id,
icon:req.session.openUser.headPic, openId:doc.uid
ent_code:req.session.user.ent_code };
}; next(null);
forumUserService.createUser(entity,function(err,doc){ }else{
if(err){ if(req.session.tmpOpenId){
next(err); next(null);
}else{ }else{
req.session.mobileForumUser={ req.session.tmpOpenId=req.session.openUser.openId;
userId:doc._id, var entity={
openId:doc.uid uid:req.session.openUser.openId,
nickName:req.session.openUser.nickName,
icon:req.session.openUser.headPic,
ent_code:req.session.user.ent_code
}; };
next(null); forumUserService.createUser(entity,function(err,doc){
if(err){
next(err);
}else{
req.session.mobileForumUser={
userId:doc._id,
openId:doc.uid
};
next(null);
}
});
} }
}); }
} }
} });
}); }else{
next(null);
}
} }
} }
\ No newline at end of file
...@@ -23,8 +23,7 @@ var config = { ...@@ -23,8 +23,7 @@ var config = {
bucketNameDev:'pisns-oss-dev', bucketNameDev:'pisns-oss-dev',
prodCDNURL:'http://fs.wxpai.cn/', prodCDNURL:'http://fs.wxpai.cn/',
devCDNURL:'http://dev.fs.wxpai.cn/' devCDNURL:'http://dev.fs.wxpai.cn/'
}, }
indexUrl:'http://www.baidu.com'
}, },
test: { test: {
...@@ -46,8 +45,7 @@ var config = { ...@@ -46,8 +45,7 @@ var config = {
bucketNameDev:'pisns-oss-dev', bucketNameDev:'pisns-oss-dev',
prodCDNURL:'http://fs.wxpai.cn/', prodCDNURL:'http://fs.wxpai.cn/',
devCDNURL:'http://dev.fs.wxpai.cn/' devCDNURL:'http://dev.fs.wxpai.cn/'
}, }
indexUrl:''
}, },
...@@ -71,8 +69,7 @@ var config = { ...@@ -71,8 +69,7 @@ var config = {
bucketNameDev:'pisns-oss-dev', bucketNameDev:'pisns-oss-dev',
prodCDNURL:'http://fs.wxpai.cn/', prodCDNURL:'http://fs.wxpai.cn/',
devCDNURL:'http://dev.fs.wxpai.cn/' devCDNURL:'http://dev.fs.wxpai.cn/'
}, }
indexUrl:''
} }
}; };
......
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