Merge branch 'test' into 'master'

修改返回的内容，消息ID更换为content

See merge request !2

common/cutils.py

@@ -37,7 +37,7 @@ def mk_error_message(error_editor, error_answer, message_id, url=wechaturl):
     data = {
             "msgtype": "markdown",
             "markdown": {
-                "content": f"ws推送<font color=\"warning\">异常</font>，请相关同事注意。\n>问题编辑:<font color=\"comment\">{error_editor}</font>\n>消息id:<font color=\"comment\">{message_id}</font>\n>返回消息:<font color=\"comment\">{error_answer}</font> "
+                "content": f"ws推送<font color=\"warning\">异常</font>，请相关同事注意。\n>问题编辑:<font color=\"comment\">{error_editor}</font>\ncontent:<font color=\"comment\">{message_id}</font>\n>返回消息:<font color=\"comment\">{error_answer}</font> "
             }
         }
     requests.post(url, json=data)
@@ -55,7 +55,7 @@ def ws_error(minute, error_answer_list=error_answer):
                 editor = DButils().select_sql(
                     f"select name from aicaptain.job where id= (SELECT job_id  FROM aicaptain.employee  WHERE "
                     f" id= {data[i][0]} ); ")
-                mk_error_message(editor[0][0], n, data[i][2])
+                mk_error_message(editor[0][0], n, data[i][1])
     print("结束")