Skip to content

P
pisns-forum-api
Commit 9c72a803 authored by 张淼's avatar 张淼
Browse files
Options

1

parent f65d652c
Hide whitespace changes
Inline Side-by-side
Showing with 17 additions and 17 deletions
app/controllers/mobile/forumThread.js
View file @ 9c72a803
......@@ -29,7 +29,7 @@ module.exports = function(app) {
router.post('/thread/create', function(req, res, next) {
var rs = {};
req.body.ent_code=req.session.user.ent_code;
req.body.from=user.getMobileUser();
req.body.from=user.getMobileUser(req);
// console.log(req.body);
//-----------处理前端上传图片开始
......@@ -163,7 +163,7 @@ router.post('/thread/:tid/raise', function(req, res, next) {
var exp=req.session.openUser.exp||0;
//判断是否已经点赞
forumPraiseLogService.queryPraiseLog(tid,null,user.getMobileUser(),1,function(err,logs){
forumPraiseLogService.queryPraiseLog(tid,null,user.getMobileUser(req),1,function(err,logs){
if(err){
res.json(returnCode.BUSY);
}else{
......@@ -199,7 +199,7 @@ router.post('/thread/:tid/raise', function(req, res, next) {
function(callback){
var entity={
ent_code:req.session.user.ent_code,
user:user.getMobileUser(),
user:user.getMobileUser(req),
thread:tid,
ip:req.ip,
comment:null,
......@@ -218,7 +218,7 @@ router.post('/thread/:tid/raise', function(req, res, next) {
console.error(err);
res.json(returnCode.BUSY);
}else{
httpService.sendRequest(req.session.user.ent_code,user.getOpenId(),tid,'raise');
httpService.sendRequest(req.session.user.ent_code,user.getOpenId(req,tid,'raise');
forumThreadService.getThreadById(tid,function(err,doc){
if(err){
console.error(err);
......@@ -283,7 +283,7 @@ router.post('/thread/:tid/share', function(req, res, next) {
function(callback){
var entity={
ent_code:req.session.user.ent_code,
user:user.getMobileUser(),
user:user.getMobileUser(req),
thread:tid,
destination:destination,
ip:req.ip
......@@ -302,7 +302,7 @@ router.post('/thread/:tid/share', function(req, res, next) {
console.error(err);
res.json(returnCode.BUSY);
}else{
httpService.sendRequest(req.session.user.ent_code,user.getOpenId(),tid,'share');
httpService.sendRequest(req.session.user.ent_code,user.getOpenId(req),tid,'share');
res.json(returnCode.SUCCESS);
}
});
......@@ -351,7 +351,7 @@ router.post('/thread/:tid/comment/create', function(req, res, next) {
function(callback){
var entity={
ent_code:req.session.user.ent_code,
from:user.getMobileUser(),
from:user.getMobileUser(req),
content:content,
ip:req.ip,
thread:thread,
......@@ -401,7 +401,7 @@ router.post('/thread/:tid/comment/create', function(req, res, next) {
console.error(err);
res.json(returnCode.BUSY);
}else{
httpService.sendRequest(req.session.user.ent_code,user.getOpenId(),tid,'comment');
httpService.sendRequest(req.session.user.ent_code,user.getOpenId(req),tid,'comment');
async.parallel([
function(callback){
//获取最新5条评论
......@@ -464,7 +464,7 @@ router.post('/thread/:tid/comment/:cid/create', function(req, res, next) {
var integral=req.session.openUser.integral||0;
var exp=req.session.openUser.exp||0;
var destination=req.body.destination||'1';
req.body.from=user.getMobileUser();
req.body.from=user.getMobileUser(req);
//1.检查是否有权限
forumRolePermissionService.checkRolePermiss(req.session.user.ent_code,'reply',integral,exp,function(err,result){
......@@ -483,7 +483,7 @@ router.post('/thread/:tid/comment/:cid/create', function(req, res, next) {
function(callback){
var entity={
ent_code:req.session.user.ent_code,
from:user.getMobileUser(),
from:user.getMobileUser(req),
to:req.body.to,
content:content,
ip:req.ip,
......@@ -526,7 +526,7 @@ router.post('/thread/:tid/comment/:cid/create', function(req, res, next) {
console.error(err);
res.json(returnCode.BUSY);
}else{
httpService.sendRequest(req.session.user.ent_code,user.getOpenId(),tid,'reply');
httpService.sendRequest(req.session.user.ent_code,user.getOpenId(req),tid,'reply');
ForumComment.populate(results[0], {path:'from to', select:'uid nickName icon comments'} , function(err, c){
if(err){
res.json(returnCode.BUSY);
......@@ -565,7 +565,7 @@ router.post('/thread/:tid/comment/:cid/delete', function(req, res, next) {
res.json(returnCode.BUSY);
}else{
if(result){
if(result.from===user.getMobileUser()){
if(result.from===user.getMobileUser(req)){
async.parallel([
function(callback){
forumCommentService.deleteCommentById(cid,function(err,result){
......@@ -633,7 +633,7 @@ router.post('/thread/:tid/comment/:cid/raise', function(req, res, next) {
var integral=req.session.openUser.integral||0;
var exp=req.session.openUser.exp||0;
//判断是否已经点赞
forumPraiseLogService.queryPraiseLog(tid,cid,user.getMobileUser(),2,function(err,logs){
forumPraiseLogService.queryPraiseLog(tid,cid,user.getMobileUser(req),2,function(err,logs){
if(err){
res.json(returnCode.BUSY);
}else{
......@@ -665,7 +665,7 @@ router.post('/thread/:tid/comment/:cid/raise', function(req, res, next) {
function(callback){
var entity={
ent_code:req.session.user.ent_code,
user:user.getMobileUser(),
user:user.getMobileUser(req),
thread:tid,
ip:req.ip,
comment:cid,
......@@ -684,7 +684,7 @@ router.post('/thread/:tid/comment/:cid/raise', function(req, res, next) {
console.error(err);
res.json(returnCode.BUSY);
}else{
httpService.sendRequest(req.session.user.ent_code,user.getOpenId(),tid,'raise');
httpService.sendRequest(req.session.user.ent_code,user.getOpenId(req),tid,'raise');
//返回点赞总数
forumCommentService.getCommentById(cid,function(err,doc){
if(err){
......@@ -719,7 +719,7 @@ router.post('/thread/:tid/comment/:cid/raise', function(req, res, next) {
router.post('/thread/:tid/userShield', function(req, res, next) {
var tid = req.params.tid || null;
if(tid){
forumUserThreadControlService.getUserThreadControlById(user.getMobileUser(),function(err,doc){
forumUserThreadControlService.getUserThreadControlById(user.getMobileUser(req),function(err,doc){
if(err){
res.json(returnCode.BUSY);
}else{
......@@ -737,7 +737,7 @@ router.post('/thread/:tid/userShield', function(req, res, next) {
var array=[tid];
var entity={
ent_code:req.session.user.ent_code,
user:user.getMobileUser(),
user:user.getMobileUser(req),
thread:array
};
forumUserThreadControlService.createUserThreadControl(entity,function(err,result){
......
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