From d7bbc3ccf81ee4c92262053c48109ce483ff4f5f Mon Sep 17 00:00:00 2001
From: pycook <pycook@126.com>
Date: Mon, 9 Oct 2023 20:25:27 +0800
Subject: [PATCH] feat: get messenger url from common setting

---
 cmdb-api/api/lib/notify.py                             | 10 +++++++++-
 cmdb-api/settings.example.py                           |  1 -
 .../src/modules/cmdb/views/ci_types/triggerForm.vue    |  5 -----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/cmdb-api/api/lib/notify.py b/cmdb-api/api/lib/notify.py
index 5ee8894..8d6e070 100644
--- a/cmdb-api/api/lib/notify.py
+++ b/cmdb-api/api/lib/notify.py
@@ -8,6 +8,7 @@ from flask import current_app
 from jinja2 import Template
 from markdownify import markdownify as md
 
+from api.lib.common_setting.notice_config import NoticeConfigCRUD
 from api.lib.mail import send_mail
 
 
@@ -41,7 +42,14 @@ def _request_messenger(subject, body, tos, sender, payload):
 
         params['content'] = json.dumps(dict(content=content))
 
-    resp = requests.post(current_app.config.get('MESSENGER_URL'), json=params)
+    url = current_app.config.get('MESSENGER_URL') or NoticeConfigCRUD.get_messenger_url()
+    if not url:
+        raise Exception("no messenger url")
+
+    if not url.endswith("message"):
+        url = "{}/v1/message".format(url)
+
+    resp = requests.post(url, json=params)
     if resp.status_code != 200:
         raise Exception(resp.text)
 
diff --git a/cmdb-api/settings.example.py b/cmdb-api/settings.example.py
index 26f2d8f..ed6b6ce 100644
--- a/cmdb-api/settings.example.py
+++ b/cmdb-api/settings.example.py
@@ -97,4 +97,3 @@ BOOL_TRUE = ['true', 'TRUE', 'True', True, '1', 1, "Yes", "YES", "yes", 'Y', 'y'
 
 # # messenger
 USE_MESSENGER = True
-MESSENGER_URL = "http://{messenger_url}/v1/message"
diff --git a/cmdb-ui/src/modules/cmdb/views/ci_types/triggerForm.vue b/cmdb-ui/src/modules/cmdb/views/ci_types/triggerForm.vue
index 9fe69e0..78c468d 100644
--- a/cmdb-ui/src/modules/cmdb/views/ci_types/triggerForm.vue
+++ b/cmdb-ui/src/modules/cmdb/views/ci_types/triggerForm.vue
@@ -346,11 +346,6 @@ export default {
   },
   mounted() {},
   methods: {
-    async getNoticeConfigAppBot() {
-      await getNoticeConfigAppBot().then((res) => {
-        this.appBot = res
-      })
-    },
     async getNoticeConfigAppBot() {
       await getNoticeConfigAppBot().then((res) => {
         this.appBot = res