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
4f2e1269
Commit
4f2e1269
authored
Apr 29, 2016
by
陈家荣
1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update
parent
1b2d342f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
8 deletions
+5
-8
forumUser.js
app/controllers/mobile/forumUser.js
+3
-6
user.js
app/utils/user.js
+2
-2
No files found.
app/controllers/mobile/forumUser.js
View file @
4f2e1269
...
...
@@ -516,7 +516,6 @@ router.get('/user/getUserFavorWithThreadAndInfo', function(req, res, next) {
router
.
get
(
'/user/exp/topChart'
,
function
(
req
,
res
,
next
)
{
var
userId
=
user
.
getMobileUser
(
req
);
var
ent_code
=
req
.
session
.
user
.
ent_code
;
forumUserService
.
getByConditionsSelectyField
({
_id
:
userId
},
'mid'
,
function
(
err
,
doc
){
...
...
@@ -529,7 +528,7 @@ router.get('/user/exp/topChart', function(req, res, next) {
}
else
{
async
.
parallel
([
function
(
cb
)
{
user
.
getMemberExp
(
ent_code
,
doc
.
mid
,
function
(
err
,
entity
)
{
user
.
getMemberExp
(
ent_code
,
doc
.
mid
,
3
,
function
(
err
,
entity
)
{
cb
(
err
,
entity
);
});
},
...
...
@@ -559,7 +558,6 @@ router.get('/user/exp/topChart', function(req, res, next) {
router
.
get
(
'/user/exp/topMonthChart'
,
function
(
req
,
res
,
next
)
{
var
userId
=
user
.
getMobileUser
(
req
);
var
ent_code
=
req
.
session
.
user
.
ent_code
;
forumUserService
.
getByConditionsSelectyField
({
_id
:
userId
},
'mid'
,
function
(
err
,
doc
){
...
...
@@ -572,7 +570,7 @@ router.get('/user/exp/topMonthChart', function(req, res, next) {
}
else
{
async
.
parallel
([
function
(
cb
)
{
user
.
getMemberExp
(
ent_code
,
doc
.
mid
,
function
(
err
,
entity
)
{
user
.
getMemberExp
(
ent_code
,
doc
.
mid
,
1
,
function
(
err
,
entity
)
{
cb
(
err
,
entity
);
});
},
...
...
@@ -602,7 +600,6 @@ router.get('/user/exp/topMonthChart', function(req, res, next) {
router
.
get
(
'/user/exp/topWeekChart'
,
function
(
req
,
res
,
next
)
{
var
userId
=
user
.
getMobileUser
(
req
);
var
ent_code
=
req
.
session
.
user
.
ent_code
;
forumUserService
.
getByConditionsSelectyField
({
_id
:
userId
},
'mid'
,
function
(
err
,
doc
){
...
...
@@ -615,7 +612,7 @@ router.get('/user/exp/topWeekChart', function(req, res, next) {
}
else
{
async
.
parallel
([
function
(
cb
)
{
user
.
getMemberExp
(
ent_code
,
doc
.
mid
,
function
(
err
,
entity
)
{
user
.
getMemberExp
(
ent_code
,
doc
.
mid
,
2
,
function
(
err
,
entity
)
{
cb
(
err
,
entity
);
});
},
...
...
app/utils/user.js
View file @
4f2e1269
...
...
@@ -115,11 +115,11 @@ exports.findMember=function(ent_code, mid, callback){
exports
.
getMemberExp
=
function
(
ent_code
,
mid
,
callback
){
exports
.
getMemberExp
=
function
(
ent_code
,
mid
,
type
,
callback
){
if
(
!
ent_code
||
!
mid
){
return
callback
&&
callback
(
null
,
null
);
}
var
url
=
API_ADDRESS
+
'/v1.0/internal/member/exp/getMemberInfo?mid='
+
mid
+
'&entCode='
+
ent_code
;
var
url
=
API_ADDRESS
+
'/v1.0/internal/member/exp/getMemberInfo?mid='
+
mid
+
'&entCode='
+
ent_code
+
'&type='
+
type
;
request
.
get
({
url
:
url
,
json
:
{}
...
...
strong
@strong
mentioned in commit
9bcf31a3
·
Apr 29, 2016
mentioned in commit
9bcf31a3
mentioned in commit 9bcf31a3f99838cb556e65af4a2452bef286556c
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