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

fix: remove non-existent kwdownapikey table reference, use downapikey for user-level lookup

Browse Source
This commit is contained in:
yumoqing 2026-05-13 11:22:11 +08:00
parent beaa4371d7
commit 5c527c1bb2
1 changed files with 19 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
dapi/dapi.py
View File

@ -171,7 +171,7 @@ async def check_duserid_exists(sor, dappid, dorgid, duserid):
'duserid': duserid, 'duserid': duserid,
'dorgid': dorgid 'dorgid': dorgid
} }
recs = await sor.R('kwdownapikey', d) recs = await sor.R('downapikey', d)
if len(recs): if len(recs):
return True return True
return False return False
@ -219,41 +219,30 @@ async def create_user_apikey(sor, dappid, user_id, user_orgid, **kwargs):
dict: {'status': 'success'|'error', 'apikey': str, 'message': str} dict: {'status': 'success'|'error', 'apikey': str, 'message': str}
""" """
try: try:
# 检查apikey是否已存在 — 先查 kwdownapikey 确认用户级别是否存在 # 检查apikey是否已存在
kw_existing = await sor.R('kwdownapikey', { existing = await sor.R('downapikey', {
'dappid': dappid, 'dappid': dappid,
'duserid': user_id, 'duserid': user_id,
'dorgid': user_orgid 'dorgid': user_orgid
}) })
if kw_existing: if existing:
# 用户已有 apikey，从 downapikey 获取 # 验证关联的 users 记录是否仍然存在
da_existing = await sor.R('downapikey', { user_records = await sor.R('users', {'id': existing[0].userid})
'dappid': dappid, if not user_records:
'duserid': user_id, # downapikey 有记录但 users 表无对应用户（脏数据），清理后重新创建
'dorgid': user_orgid debug(f'create_user_apikey: downapikey exists but user {existing[0].userid} not found, recreating')
}) await sor.D('downapikey', {'id': existing[0].id})
if da_existing:
# 验证关联的 users 记录是否仍然存在
user_records = await sor.R('users', {'id': da_existing[0].userid})
if not user_records:
# downapikey 有记录但 users 表无对应用户（脏数据），清理后重新创建
debug(f'create_user_apikey: downapikey exists but user {da_existing[0].userid} not found, recreating')
await sor.D('downapikey', {'id': da_existing[0].id})
else:
# 返回现有apikey
f = get_serverenv('password_decode')
apikey = f(da_existing[0].apikey)
return {
'status': 'success',
'apikey': apikey,
'user_id': user_id,
'message': '用户apikey已存在'
}
else: else:
# kwdownapikey 有记录但 downapikey 没有（脏数据），清理 kwdownapikey 后重新创建 # 返回现有apikey
debug(f'create_user_apikey: kwdownapikey exists but downapikey missing, recreating') f = get_serverenv('password_decode')
await sor.D('kwdownapikey', {'id': kw_existing[0].id}) apikey = f(existing[0].apikey)
return {
'status': 'success',
'apikey': apikey,
'user_id': user_id,
'message': '用户apikey已存在'
}
# 创建新apikey # 创建新apikey
apikey_id = getID() apikey_id = getID()