Commit 2efb37ce by lixinming

no message

parent 40f5e6e8
......@@ -171,7 +171,7 @@ export async function guiZhangLieBiaoFenYe({pageNumber}) {
export async function guiZhangZhiDuXiangQing({id}) {
let dataBaseInfo = await findOnce(TABLEENUM.文章管理, {id, display:STATE.});
if (!dataBaseInfo || !dataBaseInfo.id) {
throw new BizError();
throw new BizError(ERRORENUM.目标数据不存在);
}
let dataInfo:any = extractData(dataBaseInfo, [ "articleTime", "title", "desc"]);
dataInfo.articleTime = moment(dataInfo.articleTime).format("YYYY-MM-DD");
......
......@@ -239,6 +239,7 @@ export async function unitMemberRegister3({application, userId}) {
* 前端通过该方法获取注册流程状态,流程1通过返回状态【完成第一步】,流程2通过返回状态【完成第二步】,流程3通过返回状态【完成第三步】
*/
export async function registerFlowType({userId}) {
if(!userId) return {};
let oldInfo = await findOnce(TABLEENUM.用户表, {userId, isAdmin:STATE.}, ["userId", "registerFlow", "userRegisterState", "memberType"]);
if (!oldInfo || !oldInfo.userId) throw new BizError(ERRORENUM.目标数据不存在);
if (oldInfo.userRegisterState == USERREGISTERSTATE.通过) {
......
......@@ -19,26 +19,26 @@ export async function checkUser(req, res, next) {
const reqToken = req.headers.token;
const userId = req.headers.userid || "";
// if (!reqToken || !userId ) return next(new BizError(ERRORENUM.身份验证失败, `userId:${userId} token:${reqToken}`));
if (!reqToken || !userId ) return next(new BizError(ERRORENUM.身份验证失败, `userId:${userId} token:${reqToken}`));
// let userInfo = await findOnce(TABLEENUM.用户表, {userId});
// if (!userInfo || !userInfo.userId) return next(new BizError(ERRORENUM.身份验证失败));
let userInfo = await findOnce(TABLEENUM.用户表, {userId});
if (!userInfo || !userInfo.userId) return next(new BizError(ERRORENUM.身份验证失败));
// if (userInfo.token != reqToken) return next(new BizError(ERRORENUM.身份验证过期));
if (userInfo.token != reqToken) return next(new BizError(ERRORENUM.身份验证过期));
// let checkToken = '';
// //30分钟更新token
// if ( (userInfo.tokenMs - new Date().valueOf()) >= (30 * 60 * 1000) ) {
// return next(new BizError(ERRORENUM.身份验证过期));
// } else {
// checkToken = reqToken;
// await updateOneData(TABLEENUM.用户表, {userId:userInfo.userId}, { tokenMs:new Date().valueOf()});
// }
let checkToken = '';
//30分钟更新token
if ( (userInfo.tokenMs - new Date().valueOf()) >= (30 * 60 * 1000) ) {
return next(new BizError(ERRORENUM.身份验证过期));
} else {
checkToken = reqToken;
await updateOneData(TABLEENUM.用户表, {userId:userInfo.userId}, { tokenMs:new Date().valueOf()});
}
req.headers.userId = userId;
req.headers.userInfo = {
userId,
// isAdmin:userInfo.isAdmin
isAdmin:userInfo.isAdmin
}
next();
}
......
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