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

fix: use dappid+userid for downapikey query/insert, matching actual table schema

Browse Source
This commit is contained in:
yumoqing 2026-05-13 11:44:34 +08:00
parent f313877f4b
commit cd82b345aa
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
wwwroot/usersync/index.dspy
View File

@ -57,8 +57,8 @@ 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 — 按用户级(dappid+duserid+dorgid)查询 # 2. 处理 Apikey — 按(dappid, userid)查询
existing = await sor.R('downapikey', {'dappid': dappid, 'duserid': user_id, 'dorgid': user_orgid}) existing = await sor.R('downapikey', {'dappid': dappid, 'userid': user_id})
if existing: if existing:
apikey = password_decode(existing[0].apikey) apikey = password_decode(existing[0].apikey)
@ -66,9 +66,9 @@ async with db.sqlorContext(dbname) as sor:
else: else:
apikey_value = getID() apikey_value = getID()
ns_key = { ns_key = {
'id': getID(), 'dappid': dappid, 'dorgid': user_orgid, 'duserid': user_id, 'id': getID(), 'dappid': dappid, 'userid': user_id,
'orgid': user_orgid, 'userid': user_id, 'apikey': password_encode(apikey_value), 'apikey': password_encode(apikey_value),
'enabled': '1', 'created_at': datetime.now().strftime('%Y-%m-%d'), 'expired_date': '9999-12-31' 'enabled_date': datetime.now().strftime('%Y-%m-%d'), 'expired_date': '9999-12-31'
} }
await sor.C('downapikey', ns_key) await sor.C('downapikey', ns_key)
apikey = apikey_value apikey = apikey_value
@ -120,17 +120,17 @@ 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 — 按用户级(dappid+duserid+dorgid)查询 # 2. 处理 Apikey — 按(dappid, userid)查询
existing = await sor.R('downapikey', {'dappid': dappid, 'duserid': user_id, 'dorgid': user_orgid}) existing = await sor.R('downapikey', {'dappid': dappid, 'userid': user_id})
if existing: if existing:
apikey = password_decode(existing[0].apikey) apikey = password_decode(existing[0].apikey)
status_msg = '用户已同步' status_msg = '用户已同步'
else: else:
apikey_value = getID() apikey_value = getID()
ns_key = { ns_key = {
'id': getID(), 'dappid': dappid, 'dorgid': user_orgid, 'duserid': user_id, 'id': getID(), 'dappid': dappid, 'userid': user_id,
'orgid': user_orgid, 'userid': user_id, 'apikey': password_encode(apikey_value), 'apikey': password_encode(apikey_value),
'enabled': '1', 'created_at': datetime.now().strftime('%Y-%m-%d'), 'expired_date': '9999-12-31' 'enabled_date': datetime.now().strftime('%Y-%m-%d'), 'expired_date': '9999-12-31'
} }
await sor.C('downapikey', ns_key) await sor.C('downapikey', ns_key)
apikey = apikey_value apikey = apikey_value