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
e24424b0
Commit
e24424b0
authored
Sep 15, 2015
by
陈家荣
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改禁言接口BUG,添加根据openId获取mid的接口
parent
333ffa91
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
48 additions
and
13 deletions
+48
-13
forumIdentifyUser.js
app/controllers/admin/forumIdentifyUser.js
+9
-13
forumMember.js
app/controllers/admin/forumMember.js
+39
-0
No files found.
app/controllers/admin/forumIdentifyUser.js
View file @
e24424b0
...
...
@@ -27,14 +27,14 @@ function date_format(date) {
//判断时间是否在指定范围
function
compareTime
(
now
,
begin_time
,
end_time
)
{
now
=
date_format
(
now
);
begin_time
=
date_format
(
begin_time
);
end_time
=
date_format
(
end_time
);
if
(
moment
(
now
).
isSame
(
begin_time
)
||
moment
(
now
).
isSame
(
end_time
))
{
//如果等于开始时间或者结束时间
return
true
;
}
else
{
return
moment
(
now
).
isBetween
(
begin_time
,
end_time
)
;
}
var
begin_time
=
new
Date
(
begin_time
).
getTime
(),
ent_time
=
new
Date
(
end_time
).
getTime
(),
this_now
=
new
Date
(
now
).
getTime
(
);
if
(
this_now
>=
begin_time
&&
this_now
<=
ent_time
){
return
true
;
}
else
{
return
false
;
}
}
...
...
@@ -96,15 +96,11 @@ router.get('/user/from/share', function(req, res, next) {
}
}
});
// httpService.sendRequest(ent_code,mid,action);
// res.status(200).end();
});
//检查用户权限 旧版
router
.
post
(
'/user/checkLimitAction'
,
function
(
req
,
res
,
next
)
{
var
entity
=
req
.
body
;
var
userId
=
entity
.
mid
;
var
userId
=
req
.
body
.
userId
;
if
(
userId
){
var
array
=
[];
...
...
app/controllers/admin/forumMember.js
View file @
e24424b0
...
...
@@ -19,6 +19,15 @@ var userUtil = require('../../utils/user');
var
async
=
require
(
'async'
);
var
_
=
require
(
'lodash'
);
var
request
=
require
(
'request'
);
var
env
=
process
.
env
.
NODE_ENV
;
var
API_ADDRESS
=
'http://localhost:8080'
;
if
(
env
==
'sandbox'
){
API_ADDRESS
=
'http://rest.wxpai.cn'
;
}
else
if
(
env
==
'production'
){
API_ADDRESS
=
'https://rest.wxpai.cn'
;
}
module
.
exports
=
function
(
app
)
{
app
.
use
(
'/admin/forum'
,
router
);
};
...
...
@@ -94,3 +103,33 @@ router.get('/member/:mid/get', function(req, res, next) {
});
}
});
//根据uid获取mid
router
.
get
(
'/member/getMidByUid/:uid'
,
function
(
req
,
res
,
next
)
{
var
uid
=
req
.
params
.
uid
||
null
;
var
ent_code
=
req
.
session
.
user
.
ent_code
;
if
(
uid
)
{
request
.
get
({
url
:
API_ADDRESS
+
'/v1.0/internal/member/getMidbyOpenID?entCode='
+
ent_code
+
'&openID='
+
uid
,
json
:
true
},
function
(
e
,
r
,
result
){
if
(
result
&&
result
.
data
){
res
.
json
({
errcode
:
0
,
data
:
result
.
data
,
errmsg
:
'success'
});
}
else
{
res
.
json
({
errcode
:
-
1
,
data
:
null
,
errmsg
:
'null'
});
}
});
}
else
{
console
.
error
(
'params error'
);
res
.
json
({
result
:
false
,
err
:
'params error'
});
}
});
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