Commit e24424b0 authored by 陈家荣's avatar 陈家荣

修改禁言接口BUG,添加根据openId获取mid的接口

parent 333ffa91
...@@ -27,14 +27,14 @@ function date_format(date) { ...@@ -27,14 +27,14 @@ function date_format(date) {
//判断时间是否在指定范围 //判断时间是否在指定范围
function compareTime(now, begin_time, end_time) { function compareTime(now, begin_time, end_time) {
now = date_format(now); var begin_time = new Date(begin_time).getTime(),
begin_time = date_format(begin_time); ent_time = new Date(end_time).getTime(),
end_time = date_format(end_time); this_now = new Date(now).getTime();
if (moment(now).isSame(begin_time) || moment(now).isSame(end_time)) { //如果等于开始时间或者结束时间 if(this_now >= begin_time && this_now <= ent_time){
return true; return true;
} else { }else{
return moment(now).isBetween(begin_time, end_time); return false;
} }
} }
...@@ -96,15 +96,11 @@ router.get('/user/from/share', function(req, res, next) { ...@@ -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) { router.post('/user/checkLimitAction', function(req, res, next) {
var entity=req.body; var userId = req.body.userId;
var userId = entity.mid;
if(userId){ if(userId){
var array = []; var array = [];
......
...@@ -19,6 +19,15 @@ var userUtil = require('../../utils/user'); ...@@ -19,6 +19,15 @@ var userUtil = require('../../utils/user');
var async = require('async'); var async = require('async');
var _ = require('lodash'); 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) { module.exports = function(app) {
app.use('/admin/forum', router); app.use('/admin/forum', router);
}; };
...@@ -94,3 +103,33 @@ router.get('/member/:mid/get', function(req, res, next) { ...@@ -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'
});
}
});
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