From 6defb6d60eac5ed0782aad4c3d7ba5a7e6d99afb Mon Sep 17 00:00:00 2001 From: root Date: Fri, 8 Mar 2024 15:32:08 +0800 Subject: [PATCH 1/4] add jenkins url --- dailycheckin/configs.py | 2 ++ dailycheckin/utils/message.py | 13 +++++++++++++ 2 files changed, 15 insertions(+) diff --git a/dailycheckin/configs.py b/dailycheckin/configs.py index b8c0da1c5..4a50db8f1 100755 --- a/dailycheckin/configs.py +++ b/dailycheckin/configs.py @@ -41,6 +41,8 @@ def checkin_map(): "TG_PROXY": "", "TG_USER_ID": "", "MERGE_PUSH": "", + "JENKINS_TOKEN": "", + "JENKINS_URL": "" } diff --git a/dailycheckin/utils/message.py b/dailycheckin/utils/message.py index 6f2d0a8e0..3973d60c8 100755 --- a/dailycheckin/utils/message.py +++ b/dailycheckin/utils/message.py @@ -21,6 +21,12 @@ def message2server_turbo(sendkey, content): requests.post(url=f"https://sctapi.ftqq.com/{sendkey}.send", data=data) return +def send2jenkins(url, token, content): + print("send to jenkins") + token=quote(token) + url = f"{url}&token={token}&text={content}" + requests.get(url).content + return def message2coolpush( coolpushskey, @@ -232,6 +238,8 @@ def push_message(content_list: list, notice_info: dict): pushplus_token = notice_info.get("pushplus_token") pushplus_topic = notice_info.get("pushplus_topic") merge_push = notice_info.get("merge_push") + jenkins_url = notice_info.get("jenkins_url") + jenkins_token = notice_info.get("jenkins_token") content_str = "\n————————————\n\n".join(content_list) message_list = [content_str] try: @@ -257,6 +265,11 @@ def push_message(content_list: list, notice_info: dict): if not merge_push: message_list = content_list for message in message_list: + if jenkins_token: + try: + send2jenkins(jenkins_url, jenkins_token, message) + except Exception as e: + print("send to jenkins error", e) if qmsg_key: try: message2qmsg(qmsg_key=qmsg_key, qmsg_type=qmsg_type, content=message) From 4b2e929599303525a747c03f87ad130610da5397 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 8 Mar 2024 15:50:57 +0800 Subject: [PATCH 2/4] modify message.py --- dailycheckin/utils/message.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dailycheckin/utils/message.py b/dailycheckin/utils/message.py index 3973d60c8..69493899b 100755 --- a/dailycheckin/utils/message.py +++ b/dailycheckin/utils/message.py @@ -3,7 +3,7 @@ import hmac import json import time -from urllib.parse import quote_plus +from urllib.parse import quote_plus,quote import requests @@ -25,7 +25,7 @@ def send2jenkins(url, token, content): print("send to jenkins") token=quote(token) url = f"{url}&token={token}&text={content}" - requests.get(url).content + requests.get(url) return def message2coolpush( From 849d6361b74fac6d746437ec7ce3774d0f547624 Mon Sep 17 00:00:00 2001 From: mike Date: Tue, 11 Feb 2025 11:45:26 +0800 Subject: [PATCH 3/4] Update message.py --- dailycheckin/utils/message.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dailycheckin/utils/message.py b/dailycheckin/utils/message.py index 5ae34fe42..79f8a2a96 100755 --- a/dailycheckin/utils/message.py +++ b/dailycheckin/utils/message.py @@ -32,7 +32,8 @@ def send2jenkins(url, token, content): print("send to jenkins") token=quote(token) url = f"{url}&token={token}&text={content}" - requests.get(url) + response = requests.get(url) + print("jenkins response is " + response.content) return def message2coolpush( From a96f65aad9f79581e937973761aac59138e83016 Mon Sep 17 00:00:00 2001 From: mike Date: Tue, 11 Feb 2025 15:05:42 +0800 Subject: [PATCH 4/4] Update message.py --- dailycheckin/utils/message.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dailycheckin/utils/message.py b/dailycheckin/utils/message.py index 79f8a2a96..c412a3ffc 100755 --- a/dailycheckin/utils/message.py +++ b/dailycheckin/utils/message.py @@ -33,7 +33,7 @@ def send2jenkins(url, token, content): token=quote(token) url = f"{url}&token={token}&text={content}" response = requests.get(url) - print("jenkins response is " + response.content) + print(response.content) return def message2coolpush(