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

fix: remove non-existent kwdownapikey table, use downapikey directly for per-user apikey lookup

Browse Source
This commit is contained in:
yumoqing 2026-05-13 11:22:04 +08:00
parent fe7025ac0f
commit f313877f4b
1 changed files with 8 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
wwwroot/usersync/index.dspy
View File

@ -57,24 +57,11 @@ async with db.sqlorContext(dbname) as sor:
except Exception as e: except Exception as e:
exception(f"Failed to open accounts: {e}") exception(f"Failed to open accounts: {e}")
# 2. 处理 Apikey — 先查 kwdownapikey 确认用户是否已有 apikey # 2. 处理 Apikey — 按用户级(dappid+duserid+dorgid)查询
kw_existing = await sor.R('kwdownapikey', {'dappid': dappid, 'duserid': user_id, 'dorgid': user_orgid}) existing = await sor.R('downapikey', {'dappid': dappid, 'duserid': user_id, 'dorgid': user_orgid})
if kw_existing: if existing:
# 用户已有 apikey，从 downapikey 获取 apikey = password_decode(existing[0].apikey)
da_existing = await sor.R('downapikey', {'dappid': dappid, 'duserid': user_id, 'dorgid': user_orgid})
if da_existing:
apikey = password_decode(da_existing[0].apikey)
else:
# kwdownapikey 有记录但 downapikey 没有（脏数据），重新创建
apikey_value = getID()
ns_key = {
'id': getID(), 'dappid': dappid, 'dorgid': user_orgid, 'duserid': user_id,
'orgid': user_orgid, 'userid': user_id, 'apikey': password_encode(apikey_value),
'enabled': '1', 'created_at': datetime.now().strftime('%Y-%m-%d'), 'expired_date': '9999-12-31'
}
await sor.C('downapikey', ns_key)
apikey = apikey_value
msg = '用户已同步，获取现有apikey' msg = '用户已同步，获取现有apikey'
else: else:
apikey_value = getID() apikey_value = getID()
@ -133,21 +120,10 @@ async with db.sqlorContext(dbname) as sor:
except Exception as e: except Exception as e:
exception(f"Failed to open accounts: {e}") exception(f"Failed to open accounts: {e}")
# 2. 处理 Apikey — 先查 kwdownapikey 确认用户是否已有 apikey # 2. 处理 Apikey — 按用户级(dappid+duserid+dorgid)查询
kw_existing = await sor.R('kwdownapikey', {'dappid': dappid, 'duserid': user_id, 'dorgid': user_orgid}) existing = await sor.R('downapikey', {'dappid': dappid, 'duserid': user_id, 'dorgid': user_orgid})
if kw_existing: if existing:
da_existing = await sor.R('downapikey', {'dappid': dappid, 'duserid': user_id, 'dorgid': user_orgid}) apikey = password_decode(existing[0].apikey)
if da_existing:
apikey = password_decode(da_existing[0].apikey)
else:
apikey_value = getID()
ns_key = {
'id': getID(), 'dappid': dappid, 'dorgid': user_orgid, 'duserid': user_id,
'orgid': user_orgid, 'userid': user_id, 'apikey': password_encode(apikey_value),
'enabled': '1', 'created_at': datetime.now().strftime('%Y-%m-%d'), 'expired_date': '9999-12-31'
}
await sor.C('downapikey', ns_key)
apikey = apikey_value
status_msg = '用户已同步' status_msg = '用户已同步'
else: else:
apikey_value = getID() apikey_value = getID()