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
2b37d12b
Commit
2b37d12b
authored
Jul 23, 2015
by
陈家荣
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'development' of git.wxpai.cn:scrmgroup/pisns-forum-api into development
parents
3c3865a6
a8b7974c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
7 deletions
+5
-7
forumIdentifyUser.js
app/controllers/admin/forumIdentifyUser.js
+5
-7
No files found.
app/controllers/admin/forumIdentifyUser.js
View file @
2b37d12b
...
...
@@ -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'
);
...
...
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