fix(backend): 优化用户管理 TencentBlueKing#16093

# Reviewed, transaction id: 74028

Author: v_ltaoli

dbm-ui/backend/components/base.py

@@ -417,15 +417,20 @@ def _get_cached_admin_username(self):
         """
         获取缓存的租户管理员用户名
         """
+        if not env.ENABLE_MULTI_TENANT_MODE:
+            return env.DEFAULT_USERNAME
+
         login_name = "bk_admin"
         cache_key = f"dbm:tenant_admin_username:{env.BK_TENANT_ID}:{login_name}"
         bk_username = cache.get(cache_key, "")
         if not bk_username:
             try:
                 from backend.components.usermanage.client import UserManagerApi
 
-                params = {"lookup_field": "login_name", "lookups": login_name, "bk_username": "bk_admin"}
-                data = UserManagerApi.batch_lookup_virtual_user(params, use_admin=False, use_param_user=True)
+                params = {"lookup_field": "login_name", "lookups": login_name}
+                # 接口返回不规范（无result/code字段），使用raw=True绕过DataAPI的统一校验
+                res = UserManagerApi.batch_lookup_virtual_user(params, use_admin=False, use_param_user=True, raw=True)
+                data = res.get("data")
                 if isinstance(data, list) and data:
                     bk_username = data[0].get("bk_username") or data[0].get("username")
                 elif isinstance(data, dict) and data:
@@ -448,6 +453,7 @@ def _set_session_headers(self, session, local_request, headers: Dict, params: Di
         @param params: 请求参数
         """
         session.headers.update(headers)
+        bk_token = session.headers.get("bk_token")
         session.headers.update(
             {
                 "X-Bkapi-Request-Id": self.request_id,
@@ -462,6 +468,7 @@ def _set_session_headers(self, session, local_request, headers: Dict, params: Di
             "bk_app_code": params.pop("bk_app_code", env.APP_CODE),
             "bk_app_secret": params.pop("bk_app_secret", env.SECRET_KEY),
             "bk_username": params.get("bk_username", "Anonymous"),
+            "bk_token": bk_token,
         }
         if use_admin:
             # 使用管理员/平台身份调用接口

dbm-ui/backend/components/usermanage/client.py

@@ -20,15 +20,16 @@ class _UserManageApi(BaseApi):
     BASE = USER_MANAGE_APIGW_DOMAIN
 
     def __init__(self):
+        is_esb = self.is_esb()
         self.list_users = self.generate_data_api(
             method="GET",
-            url="api/v3/open/tenant/users/",
+            url="list_users/" if is_esb else "api/v3/open/tenant/users/",
             description=_("获取所有用户"),
             cache_time=300,
         )
         self.retrieve_user = self.generate_data_api(
             method="GET",
-            url="api/v3/open/tenant/users/{bk_username}/",
+            url="retrieve_user/" if is_esb else "api/v3/open/tenant/users/{bk_username}/",
             description=_("获取单个用户"),
         )
         self.batch_lookup_virtual_user = self.generate_data_api(

dbm-ui/backend/iam_app/handlers/permission.py

@@ -67,7 +67,7 @@ def __init__(self, username: str = "", request=None):
     @classmethod
     def get_iam_client(cls):
         tenant_id = getattr(env, "BK_TENANT_ID", "")
-        if settings.BK_IAM_SKIP:
+        if env.BK_IAM_SKIP:
             return DummyIAM(env.APP_CODE, env.SECRET_KEY, env.BK_IAM_APIGATEWAY, tenant_id)
         return IAM(env.APP_CODE, env.SECRET_KEY, env.BK_IAM_APIGATEWAY, tenant_id)