Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
P
pisns-forum-api
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
scrmGroup
pisns-forum-api
Commits
9616d5b7
Commit
9616d5b7
authored
Jan 07, 2016
by
陈家荣
2
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改消息
parent
b86884ff
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
2 deletions
+12
-2
forumMessage.js
app/controllers/admin/forumMessage.js
+3
-1
forumMessage.js
app/models/forumMessage.js
+8
-0
forumMessageService.js
app/service/forumMessageService.js
+1
-1
No files found.
app/controllers/admin/forumMessage.js
View file @
9616d5b7
...
...
@@ -22,6 +22,8 @@ router.post('/message/create', function(req, res, next) {
var
ent_code
=
req
.
session
.
user
.
ent_code
;
var
uid
=
req
.
session
.
user
.
uid
;
object
.
ent_code
=
ent_code
;
object
.
fromUsername
=
req
.
session
.
user
.
username
;
object
.
fromNickName
=
req
.
session
.
user
.
nickName
;
var
to_user_ids
=
object
.
to
;
//接受者ID
if
(
to_user_ids
){
async
.
waterfall
([
...
...
@@ -32,7 +34,7 @@ router.post('/message/create', function(req, res, next) {
}
else
if
(
user
){
callback
(
null
,
user
.
_id
);
}
else
{
callback
(
'管理员信息错误'
,
null
);
callback
(
null
,
''
);
}
});
},
...
...
app/models/forumMessage.js
View file @
9616d5b7
...
...
@@ -15,6 +15,14 @@ var ForumMessageSchema = new Schema({
index
:
true
,
ref
:
'ForumUser'
},
fromUsername
:
{
//发消息帐号
type
:
String
,
require
:
false
},
fromNickName
:
{
//发消息昵称
type
:
String
,
require
:
false
},
to
:
[{
//收消息者
type
:
Schema
.
Types
.
ObjectId
,
require
:
true
,
...
...
app/service/forumMessageService.js
View file @
9616d5b7
...
...
@@ -86,7 +86,7 @@ exports.getAll= function(conditions,pageNo,pageSize,callback) {
}
else
{
var
skip
=
(
pageNo
-
1
)
*
pageSize
;
var
limit
=
count
-
skip
>
pageSize
?
pageSize
:
(
count
-
skip
);
ForumMessage
.
find
(
conditions
).
populate
(
'from'
,
'
_id uid m
id nickName'
).
skip
(
skip
).
limit
(
limit
).
sort
({
created
:
-
1
}).
exec
(
function
(
err
,
docs
)
{
ForumMessage
.
find
(
conditions
).
populate
(
'from'
,
'
u
id nickName'
).
skip
(
skip
).
limit
(
limit
).
sort
({
created
:
-
1
}).
exec
(
function
(
err
,
docs
)
{
if
(
err
)
{
console
.
error
(
err
);
callback
(
err
,
null
);
...
...
strong
@strong
mentioned in commit
f50f72bd
·
Jan 07, 2016
mentioned in commit
f50f72bd
mentioned in commit f50f72bdc61a8ef09dcbee9f3898498b46a3e22a
Toggle commit list
strong
@strong
mentioned in commit
c69419f0
·
Jan 08, 2016
mentioned in commit
c69419f0
mentioned in commit c69419f06fc097135dfd8025a4bb8141d02cc591
Toggle commit list
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment