yumoqing/kboss
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: yumoqing:0312afa7a50b7bb16a89b4e140bb21e0a79b625b
Branches Tags
yumoqing:main
yumoqing:prod
yumoqing:dev1
..
compare: yumoqing:e2c778d1d65e5fd658729b9f1e434048584c8a14
Branches Tags
yumoqing:main
yumoqing:prod
yumoqing:dev1

No commits in common. "0312afa7a50b7bb16a89b4e140bb21e0a79b625b" and "e2c778d1d65e5fd658729b9f1e434048584c8a14" have entirely different histories.
0312afa7a5 ... e2c778d1d6

2 changed files with 12 additions and 120 deletions
Show Stats Expand all files Collapse all files

104
b/user/logintype.dspy
View File

@ -1,98 +1,3 @@
async def handle_login_failed(user_name):
from datetime import datetime, timedelta
db = DBPools()
async with db.sqlorContext('kboss') as sor:
try:
current_time = datetime.now()
# 1. 查询该用户当前的失败记录
record = await sor.sqlExe("SELECT first_failed_time, failed_count FROM login_fail_log WHERE user_name = '%s'" % user_name, {})
if not record:
# === 第一次失败 ===
await sor.sqlExe("""
INSERT INTO login_fail_log (user_name, first_failed_time, failed_count)
VALUES ('%s', '%s', 1)
""" % (user_name, current_time), {})
return # 正常失败，不需要等待
first_failed_time = record[0]['first_failed_time']
failed_count = record[0]['failed_count']
first_failed_time = datetime.strptime(first_failed_time, '%Y-%m-%d %H:%M:%S')
# 2. 判断是否还在10分钟窗口内
time_diff = (current_time - first_failed_time).total_seconds() / 60 # 分钟
if time_diff <= 10:
# 还在10分钟窗口内，失败次数+1
new_count = failed_count + 1
if new_count >= 3:
# === 第三次及以上失败：触发锁定 ===
# 更新失败次数，并记录锁定开始时间
await sor.sqlExe("""
UPDATE login_fail_log
SET failed_count = 3, last_failed_time = '%s', lock_until = '%s'
WHERE user_name = '%s'
""" % (current_time, current_time + timedelta(minutes=20), user_name), {})
print("十分钟内登录失败三次，请等待20分钟后再试")
else:
# 第二次失败
await sor.sqlExe("""
UPDATE login_fail_log
SET failed_count = '%s', last_failed_time = '%s'
WHERE user_name = '%s'
""" % (new_count, current_time, user_name), {})
# 可选：返回还剩几次机会
if new_count == 2:
print("登录失败，还剩1次机会（10分钟内）")
else:
# === 已经超过10分钟窗口，重置计数器 ===
await sor.sqlExe("""
UPDATE login_fail_log
SET first_failed_time = '%s', failed_count = 1, last_failed_time = '%s', lock_until = NULL
WHERE user_name = '%s'
""" % (current_time, current_time, user_name), {})
except Exception as e:
print("exception:", user_name, e)
return {'status': False, 'msg': '登录操作失败', 'error': str(e)}
async def check_login_allowed(user_name):
from datetime import datetime, timedelta
db = DBPools()
async with db.sqlorContext('kboss') as sor:
try:
record = await sor.sqlExe("SELECT lock_until, first_failed_time, failed_count FROM login_fail_log WHERE user_name = '%s'" % user_name, {})
current_time = datetime.now()
if not record:
return {'status': True} # 允许登录
record = record[0]
if record.get('lock_until'):
record['lock_until'] = datetime.strptime(record['lock_until'], '%Y-%m-%d %H:%M:%S')
# 检查是否处于锁定状态
if record.get('lock_until') and record['lock_until'] > current_time:
wait_minutes = (record['lock_until'] - current_time).total_seconds() // 60
msg = f"十分钟内登录失败三次，请等待{int(wait_minutes)}分钟后再试"
return {
'status': False,
'msg': msg
}
# 如果锁定时间已过，但还在检查窗口，也可以重置（可选）
return {'status': True} # 允许登录
except Exception as e:
print("exception:", user_name, e)
return {'status': False, 'msg': '登录操作失败, %s' % str(e)}
async def logintype(ns):
"""
1、判断用户是否为主级（如果在reseller没要找到数据，证明就是主级）
@ -141,12 +46,6 @@ async def logintype(ns):
domain_name = ns.get('domain_name')
if domain_name in ['www.opencomputing.cn', 'dev.opencomputing.cn', 'localhost:9527'] and ns.get('username') not in ['开元云(北京)科技有限公司', 'admin', 'kyy_root']:
# 登录失败次数限制
login_allowed = await check_login_allowed(ns.get('username'))
if not login_allowed.get('status'):
return {'status': False, 'msg': login_allowed.get('msg')}
if not ns.get('mobile'):
return {
'status': False,
@ -178,13 +77,11 @@ async def logintype(ns):
}
code = await sor.R('validatecode', {'id': ns.get('codeid'), 'vcode': ns.get('vcode')})
if len(code) < 1:
await handle_login_failed(ns.get('username'))
return {'status': False, 'msg': '验证码不正确'}
password = password_encode(ns['password'])
users = await sor.R('users', {'username': ns.get('username'), 'password': password})
if len(users) < 1:
await handle_login_failed(ns.get('username'))
return {"status": False,'msg':'用户名或密码错误'}
return {'status': True}
@ -203,7 +100,6 @@ async def logintype(ns):
password = password_encode(ns['password'])
users = await sor.R('users', {'username': ns.get('username'), 'password': password})
if len(users) < 1:
await handle_login_failed(ns.get('username'))
return {"status": False,'msg':'用户名或密码错误'}
elif ns.get('username') == "admin":
return {'status': True}

28
f/web-kboss/src/views/login/indexNew.vue
View File

@ -46,7 +46,8 @@
<el-form ref="loginForm" :model="loginForm" :rules="rules" class="login-form-l" autocomplete="on"
label-position="left">
<el-form-item prop="username" style="background-color: white; border: 1px solid #d9d9d9;width: 300px;">
<el-form-item prop="username"
style="background-color: white; border: 1px solid #d9d9d9;width: 300px;">
<div class="user-input">
<span class="svg-container icon-box">
<img src="../../assets/kyy/用户.svg" alt="">
@ -56,8 +57,8 @@
</div>
</el-form-item>
<el-tooltip v-model="capsTooltip" style="margin-bottom: 7px" content="Caps lock is On" placement="right"
manual>
<el-tooltip v-model="capsTooltip" style="margin-bottom: 7px"
content="Caps lock is On" placement="right" manual>
<el-form-item prop="password" class="password-mobile"
style="background-color: white; border: 1px solid #d9d9d9;width: 300px;">
<div class="user-input">
@ -75,7 +76,8 @@
</el-form-item>
</el-tooltip>
<el-form-item prop="mobile" style="background-color: white; border: 1px solid #d9d9d9;width: 300px;">
<el-form-item prop="mobile"
style="background-color: white; border: 1px solid #d9d9d9;width: 300px;">
<div class="user-input">
<span class="svg-container icon-box">
<img src="../../assets/kyy/用户.svg" alt="">
@ -433,8 +435,7 @@ export default {
// 轮询获取微信登录授权码
pollWxCode() {
this.getCodeTimer = setInterval(async () => {
try {
x // 请求微信授权码x
try {x // 请求微信授权码x
const res = await reqGetCodeAPI({ state: this.wxState });
if (!res.status) return;
@ -878,7 +879,7 @@ export default {
}
this.$message({
message: res.msg,
message: "登录成功~",
type: "success",
});
} else {
@ -898,16 +899,14 @@ export default {
});
} else {
this.$message({
message: res.msg,
message: "登录失败~",
type: "error",
});
}
})
} else {
this.$message({
message: res.msg,
message: "请查看登录信息格式",
type: "error",
});
this.$refs.loginForm.resetFields();
@ -1066,8 +1065,7 @@ $dark_gray: #889aa4;
/* 统一表单项目样式 + 边距 */
::v-deep .el-form-item {
margin-bottom: 24px !important;
/* 给错误提示预留空间 */
margin-bottom: 24px !important; /* 给错误提示预留空间 */
}
/* 统一输入框外框 */
@ -1190,7 +1188,6 @@ $dark_gray: #889aa4;
top: 20px;
left: 20px;
}
.logo-top1 {
width: 260px !important;
height: 80px !important;
@ -1218,7 +1215,6 @@ $dark_gray: #889aa4;
align-items: center;
margin-bottom: 5px;
}
span {
margin: 0 10px;
}
@ -1245,4 +1241,4 @@ $dark_gray: #889aa4;
padding: 30px 20px;
}
}
</style>
</style>