From ce90af0b81a6301f4dc25c781dce3b6e3564c2f0 Mon Sep 17 00:00:00 2001 From: yumoqing Date: Sat, 26 Jul 2025 20:52:51 +0800 Subject: [PATCH] bugfix --- rbac/check_perm.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/rbac/check_perm.py b/rbac/check_perm.py index efe7101..c5dec81 100644 --- a/rbac/check_perm.py +++ b/rbac/check_perm.py @@ -17,7 +17,7 @@ async def get_user_roles(userid): sql = "select concat(b.orgtypeid, '.', b.name) as name from userrole a, role b where a.userid=${userid}$ and a.roleid = b.id" db = DBPools() roles = [] - dbname = await get_dbname() + dbname = get_dbname() async with db.sqlorContext(dbname) as sor: recs = await sor.sqlExe(sql, {'userid':userid}) if len(recs) < 1: @@ -82,14 +82,15 @@ async def register_user(sor, ns): await create_user(sor, ns) return id -async def get_dbname(): - rf = RegisterFunction() - dbname = await rf.exe('get_module_dbname', 'rbac') - return dbname +def get_dbname(): + f = get_serverenv('get_module_dbname') + if f i None: + return None + return f('rbac') async def checkUserPassword(request, username, password): db = DBPools() - dbname = await get_dbname() + dbname = get_dbname() async with db.sqlorContext(dbname) as sor: sql = "select * from users where username=${username}$ and password=${password}$" recs = await sor.sqlExe(sql, {'username':username, 'password':password}) @@ -134,7 +135,7 @@ right join userrole c on b.roleid = c.roleid where c.userid = ${userid}$ """ - dbname = await get_dbname() + dbname = get_dbname() db = DBPools() async with db.sqlorContext(dbname) as sor: if userid is None: