Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Z
zhichan
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
蒋勇
zhichan
Commits
f2fbbd63
Commit
f2fbbd63
authored
Aug 22, 2020
by
Sxy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 回改
parent
32455d75
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
12 deletions
+10
-12
center-manage/app/base/service/impl/auth/userSve.js
+9
-11
center-manage/app/config/settings.js
+1
-1
No files found.
center-manage/app/base/service/impl/auth/userSve.js
View file @
f2fbbd63
...
@@ -162,17 +162,15 @@ class UserService extends ServiceBase {
...
@@ -162,17 +162,15 @@ class UserService extends ServiceBase {
if
(
u
.
password
!=
inpassword
)
{
if
(
u
.
password
!=
inpassword
)
{
return
null
;
return
null
;
}
}
console
.
log
(
'---- 密码------'
);
let
last
=
new
Date
(
u
.
last_change_date
).
getTime
();
//注意月份
console
.
log
(
u
.
last_change_date
);
let
differ
=
Date
.
now
()
-
last
;
// let last = new Date(u.last_change_date).getTime();//注意月份
let
days
=
Math
.
round
(
differ
/
(
24
*
60
*
60
*
1000
));
// let differ = Date.now() - last;
if
(
u
.
last_change_date
&&
days
>=
settings
.
changepwdcycle
)
{
//禁用用户
// let days = Math.round(differ / (24 * 60 * 60 * 1000));
await
this
.
dao
.
updateByWhere
({
isEnabled
:
false
},
{
userName
:
p
.
userName
})
// if (u.last_change_date && days >= settings.changepwdcycle) {//禁用用户
return
null
// await this.dao.updateByWhere({ isEnabled: false }, { userName: p.userName })
}
else
if
((
settings
.
changepwdcycle
-
7
)
<=
days
)
{
// return null
rtn
.
hint
=
"请尽快修改密码,否则会禁用您的账户"
// } else if ((settings.changepwdcycle - 7) <= days) {
}
// rtn.hint = "请尽快修改密码,否则会禁用您的账户"
// }
return
this
.
db
.
transaction
(
async
function
(
t
)
{
return
this
.
db
.
transaction
(
async
function
(
t
)
{
//从缓存中取得
//从缓存中取得
// let userfind = await self.dao.model.findOne({
// let userfind = await self.dao.model.findOne({
...
...
center-manage/app/config/settings.js
View file @
f2fbbd63
...
@@ -20,7 +20,7 @@ var settings = {
...
@@ -20,7 +20,7 @@ var settings = {
encrypt_secret
:
ENVINPUT
.
ENCRYPT_SECRET
,
encrypt_secret
:
ENVINPUT
.
ENCRYPT_SECRET
,
salt
:
"%iatpD1gcxz7iF#B"
,
salt
:
"%iatpD1gcxz7iF#B"
,
defaultpwd
:
"Temp123456"
,
defaultpwd
:
"Temp123456"
,
changepwdcycle
:
60
,
//密码更换周期 7天前登录提示更改密码 到期后直接禁用账户
changepwdcycle
:
365
,
//密码更换周期 7天前登录提示更改密码 到期后直接禁用账户
basepath
:
path
.
normalize
(
path
.
join
(
__dirname
,
'../..'
)),
basepath
:
path
.
normalize
(
path
.
join
(
__dirname
,
'../..'
)),
port
:
process
.
env
.
NODE_PORT
||
80
,
port
:
process
.
env
.
NODE_PORT
||
80
,
logindex
:
"center_manage"
,
logindex
:
"center_manage"
,
...
...
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