Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wenHuaBu_adminServer
Overview
Overview
Details
Activity
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
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
node_server
wenHuaBu_adminServer
Commits
2efb37ce
Commit
2efb37ce
authored
Mar 22, 2024
by
lixinming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
no message
parent
40f5e6e8
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
14 deletions
+15
-14
officialWebsite.ts
src/biz/officialWebsite.ts
+1
-1
register.ts
src/biz/register.ts
+1
-0
user.ts
src/middleware/user.ts
+13
-13
No files found.
src/biz/officialWebsite.ts
View file @
2efb37ce
...
...
@@ -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"
);
...
...
src/biz/register.ts
View file @
2efb37ce
...
...
@@ -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
.
通过
)
{
...
...
src/middleware/user.ts
View file @
2efb37ce
...
...
@@ -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
();
}
...
...
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