From 91bbe19c80c6b785d10902694c55a7980f6cb82e Mon Sep 17 00:00:00 2001
From: zhanglei <zhanglei9588@foxmail.com>
Date: Wed, 09 Mar 2022 14:10:53 +0800
Subject: [PATCH] test2

---
 Jenkinsfile |   28 +++++-----------------------
 1 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 438d57f..d09dee5 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_PREVIOUS_COMMIT = changeLogSets['GIT_PREVIOUS_COMMIT']
+                     def GIT_COMMIT = changeLogSets.get("GIT_COMMIT")
+                     def 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()
 
                 }
             }
@@ -120,27 +120,9 @@
     }
 
     post {
-        unsuccessful {
+        failure {
             script{
-            env.BUILD_URL = "${BUILD_URL}"
-             sh '''
-                msg="当前构建失败<br>---------------------<br>提交人:${GIT_COMMIT_AUTHOR}<br>提交信息:<br>${GIT_COMMIT_MSG}<br>---------------------<br>构建内网链接:${BUILD_URL}console"
-                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
-                  sleep 1
-                  echo "exit" >> tmp_in
-                }
-
-
-                sendqq "964606955" "${msg}"
-             '''
-
+                sendMessage(env);
             }
         }
     }

--
Gitblit v1.9.1