fix(backend): 优化相关cmsi、用户管理、cmdb请求相关的代码 TencentBlueKing#16093

# Reviewed, transaction id: 74098

Author: WuFantaotao

dbm-ui/backend/components/base.py

@@ -436,7 +436,7 @@ def _get_cached_admin_username(self):
                 elif isinstance(data, dict) and data:
                     bk_username = data.get("bk_username") or data.get("username")
                 if bk_username:
-                    cache.set(cache_key, bk_username, 1)  # 60 * 60 * 24)
+                    cache.set(cache_key, bk_username, 60 * 60 * 24)
                 else:
                     raise ValidationError(_("获取租户管理员账号失败: 未能从响应中获取用户名"))
             except Exception as e:

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

@@ -34,27 +34,27 @@ def MSG_TYPE_MAP(self):
     def __init__(self):
         self.get_msg_type = self.generate_data_api(
             method="GET",
-            url="v1/channels/",
+            url="channels/",
             description=_("查询通知类型"),
         )
         self.send_voice = self.generate_data_api(
             method="POST",
-            url="v1/send_voice/",
+            url="send_voice/",
             description=_("语音通知"),
         )
         self.send_sms = self.generate_data_api(
             method="POST",
-            url="v1/send_sms/",
+            url="send_sms/",
             description=_("短信通知"),
         )
         self.send_weixin = self.generate_data_api(
             method="POST",
-            url="v1/send_weixin/",
+            url="send_weixin/",
             description=_("微信通知"),
         )
         self.send_mail = self.generate_data_api(
             method="POST",
-            url="v1/send_mail/",
+            url="send_mail/",
             description=_("邮件通知"),
         )
 

dbm-ui/backend/components/domains.py

@@ -15,20 +15,15 @@
 ESB_PREFIX = "/api/c/compapi/v2/"
 ESB_DOMAIN_TPL = "{}{}{{}}/".format(env.BK_COMPONENT_API_URL, ESB_PREFIX)
 
-# apigw
-APIGW_PREFIX = "/api/{}/prod/"
-APIGW_DOMAIN_TPL = "{}{}".format(env.BASE_APIGW_DOMAIN, APIGW_PREFIX)
 
 # 优先取环境变量的配置，若未配置对应的环境变量，则取paas默认的esb地址
 CC_APIGW_DOMAIN = env.CC_APIGW_DOMAIN or ESB_DOMAIN_TPL.format("cc")
 GSE_APIGW_DOMAIN = env.GSE_APIGW_DOMAIN or ESB_DOMAIN_TPL.format("gse")
 JOB_APIGW_DOMAIN = env.JOB_APIGW_DOMAIN or ESB_DOMAIN_TPL.format("jobv3")
 SOPS_APIGW_DOMAIN = env.SOPS_APIGW_DOMAIN or ESB_DOMAIN_TPL.format("sops")
 ESB_APIGW_DOMAIN = env.ESB_APIGW_DOMAIN or ESB_DOMAIN_TPL.format("esb")
-# 用户管理
-USER_MANAGE_APIGW_DOMAIN = APIGW_DOMAIN_TPL.format("bk-user") or ESB_DOMAIN_TPL.format("usermanage")
-# 消息通知
-CMSI_APIGW_DOMAIN = APIGW_DOMAIN_TPL.format("bk-cmsi") or ESB_DOMAIN_TPL.format("cmsi")
+USER_MANAGE_APIGW_DOMAIN = env.USER_MANAGE_APIGW_DOMAIN or ESB_DOMAIN_TPL.format("usermanage")
+CMSI_APIGW_DOMAIN = env.CMSI_APIGW_DOMAIN or ESB_DOMAIN_TPL.format("cmsi")
 BKCHAT_APIGW_DOMAIN = env.BKCHAT_APIGW_DOMAIN
 ITSM_APIGW_DOMAIN = env.ITSM_APIGW_DOMAIN or ESB_DOMAIN_TPL.format("itsm")
 BKLOG_APIGW_DOMAIN = env.BKLOG_APIGW_DOMAIN or ESB_DOMAIN_TPL.format("bk_log")

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

@@ -23,18 +23,18 @@ def __init__(self):
         is_esb = self.is_esb()
         self.list_users = self.generate_data_api(
             method="GET",
-            url="list_users/" if is_esb else "api/v3/open/tenant/users/",
+            url="list_users/" if is_esb else "tenant/users/",
             description=_("获取所有用户"),
             cache_time=300,
         )
         self.retrieve_user = self.generate_data_api(
             method="GET",
-            url="retrieve_user/" if is_esb else "api/v3/open/tenant/users/{bk_username}/",
+            url="retrieve_user/" if is_esb else "tenant/users/{bk_username}/",
             description=_("获取单个用户"),
         )
         self.batch_lookup_virtual_user = self.generate_data_api(
             method="GET",
-            url="api/v3/open/tenant/virtual-users/-/lookup/",
+            url="tenant/virtual-users/-/lookup/",
             description=_("获取租户的管理员用户"),
         )
 

dbm-ui/backend/configuration/views/system.py

@@ -130,9 +130,10 @@ def environ(self, request):
         if not env.ENABLE_EXTERNAL_PROXY and not env.ENABLE_OPEN_EXTERNAL_PROXY:
             envs.update(
                 {
-                    "CC_IDLE_MODULE_ID": CcManage(env.DBA_APP_BK_BIZ_ID, "").get_biz_internal_module(
-                        env.DBA_APP_BK_BIZ_ID
-                    )[IDLE_HOST_MODULE]["bk_module_id"],
+                    "CC_IDLE_MODULE_ID": CcManage(env.DBA_APP_BK_BIZ_ID, "")
+                    .get_biz_internal_module(env.DBA_APP_BK_BIZ_ID)
+                    .get(IDLE_HOST_MODULE, {})
+                    .get("bk_module_id"),
                     "BK_COMPONENT_API_URL": env.BK_COMPONENT_API_URL,
                     "BK_CMDB_URL": env.BK_CMDB_URL,
                     "BK_NODEMAN_URL": env.BK_NODEMAN_URL,

dbm-ui/backend/env/__init__.py

@@ -57,9 +57,6 @@
 # esb 访问地址
 BK_COMPONENT_API_URL = get_type_env(key="BK_COMPONENT_API_URL", _type=str, default="https://bk-component.example.com")
 
-# apigw 访问地址
-BASE_APIGW_DOMAIN = get_type_env(key="BASE_APIGW_DOMAIN", _type=str, default="https://bkapi.bk-component.example.com")
-
 # 开启外部路由，供外部环境使用(DBConsole)
 ENABLE_EXTERNAL_PROXY = get_type_env(key="ENABLE_EXTERNAL_PROXY", _type=bool, default=False)
 # 开启所有路由，不屏蔽。！！这里只用在合作伙伴环境！！

dbm-ui/backend/flow/utils/cc_manage.py

@@ -140,6 +140,9 @@ def get_or_create_set_module(
     def get_biz_internal_module(bk_biz_id: int):
         """获取业务下的内置模块"""
         biz_internal_module = ResourceQueryHelper.get_biz_internal_module(bk_biz_id)
+        if not biz_internal_module or not biz_internal_module.get("module"):
+            logger.warning(f"biz_internal_module is empty, bk_biz_id: {bk_biz_id}")
+            return {}
         module_type__module = {module["default"]: module for module in biz_internal_module["module"]}
         return module_type__module