fix: 修复环境变量问题 #7545 (#7617)

* fix: 修复环境变量问题 #7545 * fix: 修正环境变量 #7545 * fix: 删除多余导包 #7545 * fix: 修改环境变量读取 #7545
TencentBlueKing · Nov 20, 2024 · 692b69d · 692b69d
1 parent 29cce60
commit 692b69d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/config/default.py b/config/default.py
@@ -888,3 +888,6 @@ def check_engine_admin_permission(request, *args, **kwargs):
 ENABLE_BK_CHAT_CHANNEL = env.ENABLE_BK_CHAT_CHANNEL
 # bk_chat路由
 BK_CHAT_API_ENTRY = env.BK_CHAT_API_ENTRY
+# bk_chat通知渠道过滤app
+BK_CHAT_APP_CODE = env.BK_CHAT_APP_CODE
+BK_CHAT_APP_SECRET_KEY = env.BK_CHAT_APP_SECRET_KEY
diff --git a/env.py b/env.py
@@ -158,3 +158,6 @@
 ENABLE_BK_CHAT_CHANNEL = False if os.getenv("BKAPP_ENABLE_BK_CHAT_CHANNEL") is None else True
 # bk_chat通知路由
 BK_CHAT_API_ENTRY = os.getenv("BK_CHAT_API_ENTRY", "")
+# bk_chat通知渠道过滤app
+BK_CHAT_APP_CODE = os.getenv("BK_CHAT_APP_CODE", os.getenv("BKPAAS_APP_ID"))
+BK_CHAT_APP_SECRET_KEY = os.getenv("BK_CHAT_APP_SECRET_KEY", os.getenv("BKPAAS_APP_SECRET"))
diff --git a/gcloud/shortcuts/message/send_msg.py b/gcloud/shortcuts/message/send_msg.py
@@ -67,7 +67,7 @@ def send(self, executor, notify_type, notify_info, receivers, title, content, em
         return True
 
     def send_bkchat(self, notify, content):
-        params = {"bk_app_code": settings.APP_CODE, "bk_app_secret": settings.SECRET_KEY}
+        params = {"bk_app_code": settings.BK_CHAT_APP_CODE, "bk_app_secret": settings.BK_CHAT_APP_SECRET_KEY}
 
         data = {
             "im": "WEWORK",