fix: 编译报错提醒改到钉钉上

.github/workflows/air101.yml

@@ -54,7 +54,12 @@ jobs:
         MQTTADDR: ${{ secrets.MQTTADDR }}
         MQTTPORT: ${{ secrets.MQTTPORT }}
         MQTTTOPIC: ${{ secrets.MQTTTOPIC }}
+        DD_APPKEY: ${{ secrets.DD_APPKEY }}
+        DD_APPSECRET: ${{ secrets.DD_APPSECRET }}
+        DD_NOTIFY_LIST: ${{ secrets.DD_NOTIFY_LIST }}
+        DD_API_TOKEN: ${{ secrets.DD_API_TOKEN }}
+        DD_API_SEND: ${{ secrets.DD_API_SEND }}
       run: |
-        sudo pip3 install paho_mqtt gitpython
+        sudo pip3 install paho_mqtt gitpython requests
         cd tools
-        if [ "$STATUS" = "failure" ];then python3 ciNotify.py $MQTTADDR $MQTTPORT $MQTTTOPIC "air101 https://github.com/openLuat/LuatOS/actions/runs/$GITHUB_RUN_ID" "air101"; fi
+        if [ "$STATUS" = "failure" ];then python3 ciNotify.py $MQTTADDR $MQTTPORT $MQTTTOPIC "https://github.com/openLuat/LuatOS/actions/runs/$GITHUB_RUN_ID" "air101" "$DD_APPKEY" "$DD_APPSECRET" "$DD_NOTIFY_LIST" "$DD_API_TOKEN" "$DD_API_SEND"; fi

.github/workflows/air105.yml

@@ -51,7 +51,12 @@ jobs:
         MQTTADDR: ${{ secrets.MQTTADDR }}
         MQTTPORT: ${{ secrets.MQTTPORT }}
         MQTTTOPIC: ${{ secrets.MQTTTOPIC }}
+        DD_APPKEY: ${{ secrets.DD_APPKEY }}
+        DD_APPSECRET: ${{ secrets.DD_APPSECRET }}
+        DD_NOTIFY_LIST: ${{ secrets.DD_NOTIFY_LIST }}
+        DD_API_TOKEN: ${{ secrets.DD_API_TOKEN }}
+        DD_API_SEND: ${{ secrets.DD_API_SEND }}
       run: |
-        sudo pip3 install paho_mqtt gitpython
+        sudo pip3 install paho_mqtt gitpython requests
         cd tools
-        if [ "$STATUS" = "failure" ];then python3 ciNotify.py $MQTTADDR $MQTTPORT $MQTTTOPIC "air105 https://github.com/openLuat/LuatOS/actions/runs/$GITHUB_RUN_ID" "air105"; fi
+        if [ "$STATUS" = "failure" ];then python3 ciNotify.py $MQTTADDR $MQTTPORT $MQTTTOPIC "https://github.com/openLuat/LuatOS/actions/runs/$GITHUB_RUN_ID" "air105" "$DD_APPKEY" "$DD_APPSECRET" "$DD_NOTIFY_LIST" "$DD_API_TOKEN" "$DD_API_SEND"; fi

.github/workflows/air640w.yml

@@ -58,7 +58,12 @@ jobs:
         MQTTADDR: ${{ secrets.MQTTADDR }}
         MQTTPORT: ${{ secrets.MQTTPORT }}
         MQTTTOPIC: ${{ secrets.MQTTTOPIC }}
+        DD_APPKEY: ${{ secrets.DD_APPKEY }}
+        DD_APPSECRET: ${{ secrets.DD_APPSECRET }}
+        DD_NOTIFY_LIST: ${{ secrets.DD_NOTIFY_LIST }}
+        DD_API_TOKEN: ${{ secrets.DD_API_TOKEN }}
+        DD_API_SEND: ${{ secrets.DD_API_SEND }}
       run: |
-        sudo pip3 install paho_mqtt gitpython
+        sudo pip3 install paho_mqtt gitpython requests
         cd tools
-        if [ "$STATUS" = "failure" ];then python3 ciNotify.py $MQTTADDR $MQTTPORT $MQTTTOPIC "air640w https://github.com/openLuat/LuatOS/actions/runs/$GITHUB_RUN_ID"; fi
+        if [ "$STATUS" = "failure" ];then python3 ciNotify.py $MQTTADDR $MQTTPORT $MQTTTOPIC "https://github.com/openLuat/LuatOS/actions/runs/$GITHUB_RUN_ID" "$DD_APPKEY" "$DD_APPSECRET" "$DD_NOTIFY_LIST" "$DD_API_TOKEN" "$DD_API_SEND"; fi

.github/workflows/esp32c3.yml

@@ -52,7 +52,12 @@ jobs:
         MQTTADDR: ${{ secrets.MQTTADDR }}
         MQTTPORT: ${{ secrets.MQTTPORT }}
         MQTTTOPIC: ${{ secrets.MQTTTOPIC }}
+        DD_APPKEY: ${{ secrets.DD_APPKEY }}
+        DD_APPSECRET: ${{ secrets.DD_APPSECRET }}
+        DD_NOTIFY_LIST: ${{ secrets.DD_NOTIFY_LIST }}
+        DD_API_TOKEN: ${{ secrets.DD_API_TOKEN }}
+        DD_API_SEND: ${{ secrets.DD_API_SEND }}
       run: |
-        sudo pip3 install paho_mqtt gitpython
+        sudo pip3 install paho_mqtt gitpython requests
         cd tools
-        if [ "$STATUS" = "failure" ];then python3 ciNotify.py $MQTTADDR $MQTTPORT $MQTTTOPIC "esp32c3 https://github.com/openLuat/LuatOS/actions/runs/$GITHUB_RUN_ID" "LuatOS-ESP32"; fi
+        if [ "$STATUS" = "failure" ];then python3 ciNotify.py $MQTTADDR $MQTTPORT $MQTTTOPIC "https://github.com/openLuat/LuatOS/actions/runs/$GITHUB_RUN_ID" "LuatOS-ESP32" "$DD_APPKEY" "$DD_APPSECRET" "$DD_NOTIFY_LIST" "$DD_API_TOKEN" "$DD_API_SEND"; fi

.github/workflows/linux.yml

@@ -41,7 +41,12 @@ jobs:
         MQTTADDR: ${{ secrets.MQTTADDR }}
         MQTTPORT: ${{ secrets.MQTTPORT }}
         MQTTTOPIC: ${{ secrets.MQTTTOPIC }}
+        DD_APPKEY: ${{ secrets.DD_APPKEY }}
+        DD_APPSECRET: ${{ secrets.DD_APPSECRET }}
+        DD_NOTIFY_LIST: ${{ secrets.DD_NOTIFY_LIST }}
+        DD_API_TOKEN: ${{ secrets.DD_API_TOKEN }}
+        DD_API_SEND: ${{ secrets.DD_API_SEND }}
       run: |
-        sudo pip3 install paho_mqtt gitpython
+        sudo pip3 install paho_mqtt gitpython requests
         cd tools
-        if [ "$STATUS" = "failure" ];then python3 ciNotify.py $MQTTADDR $MQTTPORT $MQTTTOPIC "linux https://github.com/openLuat/LuatOS/actions/runs/$GITHUB_RUN_ID"; fi
+        if [ "$STATUS" = "failure" ];then python3 ciNotify.py $MQTTADDR $MQTTPORT $MQTTTOPIC "https://github.com/openLuat/LuatOS/actions/runs/$GITHUB_RUN_ID" "$DD_APPKEY" "$DD_APPSECRET" "$DD_NOTIFY_LIST" "$DD_API_TOKEN" "$DD_API_SEND"; fi

.github/workflows/win32.yml

@@ -53,7 +53,12 @@ jobs:
         MQTTADDR: ${{ secrets.MQTTADDR }}
         MQTTPORT: ${{ secrets.MQTTPORT }}
         MQTTTOPIC: ${{ secrets.MQTTTOPIC }}
+        DD_APPKEY: ${{ secrets.DD_APPKEY }}
+        DD_APPSECRET: ${{ secrets.DD_APPSECRET }}
+        DD_NOTIFY_LIST: ${{ secrets.DD_NOTIFY_LIST }}
+        DD_API_TOKEN: ${{ secrets.DD_API_TOKEN }}
+        DD_API_SEND: ${{ secrets.DD_API_SEND }}
       run: |
         cd tools
-        pip install paho-mqtt gitpython -t ./
-        if [ "$STATUS" = "failure" ];then python3 ciNotify.py $MQTTADDR $MQTTPORT $MQTTTOPIC "win32 https://github.com/openLuat/LuatOS/actions/runs/$GITHUB_RUN_ID"; fi
+        pip install paho-mqtt gitpython requests -t ./
+        if [ "$STATUS" = "failure" ];then python3 ciNotify.py $MQTTADDR $MQTTPORT $MQTTTOPIC "https://github.com/openLuat/LuatOS/actions/runs/$GITHUB_RUN_ID" "$DD_APPKEY" "$DD_APPSECRET" "$DD_NOTIFY_LIST" "$DD_API_TOKEN" "$DD_API_SEND"; fi

tools/ciNotify.py

@@ -2,21 +2,60 @@ import sys
 import paho.mqtt.client as mqtt
 import paho.mqtt.publish as publish
 from git import Repo
+import urllib
+import requests
+import http.cookiejar
+import json
+
+#$MQTTADDR $MQTTPORT $MQTTTOPIC "https://xxxx" "air101" DD_APPKEY DD_APPSECRET DD_NOTIFY_LIST DD_API_TOKEN DD_API_SEND
+#    1      2           3           4             5         6       7               8               9           10
 
-client = mqtt.Client()
 repo = Repo("../")
+
+#暂时停用
+############# MQTT ###############
+# client = mqtt.Client()
+# try:
+#     #服务器请自行修改，需要传入参数
+#     client.connect(sys.argv[1], int(sys.argv[2]), 60)
+#     #topic请根据需要自行修改，需要传入参数
+#     info = sys.argv[4]+"\r\n"+str(repo.head.commit.author)+"-"+str(repo.head.commit.message)
+#     if len(sys.argv) >= 6:
+#         repo = Repo("../../"+sys.argv[5])
+#         info = info+"\r\n子仓库"+sys.argv[5]+"最后提交：\r\n"+str(repo.head.commit.author)+"-"+str(repo.head.commit.message)
+#     pub = client.publish(sys.argv[3],info)
+#     pub.wait_for_publish()
+#     client.disconnect()
+#     print("sent")
+# except Exception as e:
+#     print(e)
+
+
+###############钉钉提醒######################
+
+dd_appkey = sys.argv[6]
+dd_appsecret = sys.argv[7]
+dd_list = sys.argv[8].split(",")
+dd_api_token = sys.argv[9]
+dd_api_send = sys.argv[10]
 try:
-    #服务器请自行修改，需要传入参数
-    client.connect(sys.argv[1], int(sys.argv[2]), 60)
-    #topic请根据需要自行修改，需要传入参数
-    info = sys.argv[4]+"\r\n"+str(repo.head.commit.author)+"-"+str(repo.head.commit.message)
-    if len(sys.argv) >= 6:
-        repo = Repo("../../"+sys.argv[5])
-        info = info+"\r\n子仓库"+sys.argv[5]+"最后提交：\r\n"+str(repo.head.commit.author)+"-"+str(repo.head.commit.message)
-    pub = client.publish(sys.argv[3],info)
-    pub.wait_for_publish()
-    client.disconnect()
-    print("sent")
+    headers = {'user-agent': '114514'}
+    token = requests.post(dd_api_token,json={"appKey":dd_appkey,"appSecret":dd_appsecret},headers=headers).json()["accessToken"]
+    #发消息
+    headers = {'user-agent': '114514', 'x-acs-dingtalk-access-token': token}
+    r = requests.post(dd_api_send,json={
+            "robotCode":dd_appkey,
+            "userIds":dd_list,
+            "msgKey" : "sampleLink",
+            "msgParam" : json.dumps({
+                "title": sys.argv[5]+"的编译炸了",
+                "text": "最后提交："+str(repo.head.commit.author)+"\r\n"+str(repo.head.commit.message),
+                "messageUrl": sys.argv[4],
+                "picUrl": "https://www.luatos.com/img/footer-logo.png",
+            })
+        },headers=headers)
+
+    print(r.json())
+
 except Exception as e:
     print(e)
-