From 79fc3d20c370b34bafb9f01033c4d1d9a247d935 Mon Sep 17 00:00:00 2001
From: wangzilun <964606955@qq.com>
Date: Wed, 06 Apr 2022 10:45:23 +0800
Subject: [PATCH] 补充29

---
 Jenkinsfile |   29 +++++------------------------
 1 files changed, 5 insertions(+), 24 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index ba536cb..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,28 +120,9 @@
     }
 
     post {
-        unsuccessful {
+        failure {
             script{
-                 sh '''
-                    printenv
-                    msg="当前构建失败,\n提交人:${env.GIT_COMMIT_AUTHOR}\n提交信息:\n${env.GIT_COMMIT_MSG}\n 构建内网链接:\${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}"
-                 '''
-
+                sendMessage(env);
             }
         }
     }

--
Gitblit v1.9.1