From 2490a20fbea6bae18ea3dd6a26ffcf6544a14155 Mon Sep 17 00:00:00 2001
From: zhanglei <zhanglei9588@foxmail.com>
Date: Wed, 09 Mar 2022 13:05:44 +0800
Subject: [PATCH] 完善信息7

---
 Jenkinsfile |   41 ++++++++++++++++++-----------------------
 1 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index e80c412..8a0d666 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -29,10 +29,10 @@
                                     , userRemoteConfigs: [[credentialsId: "${GIT_CREDENTIALS_ID}", url: "${url}"]]
                                     ])
                      println "changeLogSets ${changeLogSets}"
-                     GIT_COMMIT = changeLogSets['GIT_COMMIT']
+                     GIT_COMMIT = changeLogSets.get("GIT_COMMIT")
                      GIT_PREVIOUS_COMMIT = changeLogSets['GIT_PREVIOUS_COMMIT']
                      env.GIT_COMMIT_AUTHOR = sh (script: 'git log -1 --oneline --pretty=%an ${GIT_COMMIT}', returnStdout: true).trim()
-                     env.GIT_COMMIT_MSG = sh (script: 'git log --oneline --pretty=%s ${GIT_PREVIOUS_COMMIT}...${GIT_COMMIT}| sed = |sed "N;s/\\n/./"', returnStdout: true).trim()
+                     env.GIT_COMMIT_MSG = sh (script: 'git log --oneline --pretty="[%ai]%s" ${GIT_PREVIOUS_COMMIT}...${GIT_COMMIT}| sed = |sed "N;s/\\n/./"', returnStdout: true).trim()
 
                 }
             }
@@ -122,27 +122,22 @@
     post {
         unsuccessful {
             script{
-            env.BUILD_URL = "${BUILD_URL}"
-                 sh '''
-                    msg="当前构建失败<br>---------------------<br>提交人:${GIT_COMMIT_AUTHOR}<br>提交信息:<br>${GIT_COMMIT_MSG}<br>---------------------<br>构建内网链接:${BUILD_URL}"
-                    echo "$msg"
-                    sendqq(){
-                      rm -f tmp_in
-                      mknod tmp_in p
-                      exec 8<> tmp_in
-
-                      telnet zllr.top 9588 <&8 &
-                      sleep 5
-                      echo "send -t qq -fn $1 $2 >> tmp_in"
-                      echo "send -t qq -fn $1 $2" >> tmp_in
-                      sleep 1
-                      echo "exit" >> tmp_in
-                    }
-
-
-                    sendqq "964606955" "${msg}"
-                 '''
-
+                def msg = """
+jenkins构建失败,请提交人员自查
+###########项目信息##########
+项目:${project_name}
+GIT分支:${GIT_BRANCH}
+构建序号:${BUILD_ID}
+############################
+###########提交信息##########
+提交人:${GIT_COMMIT_AUTHOR}
+提交日志如下:
+${GIT_COMMIT_MSG}
+############################
+构建内网链接:${BUILD_URL}console
+"""
+                def number = "326060971"
+                sendMessage(msg,number,true);
             }
         }
     }

--
Gitblit v1.9.1