From 05962e5fff8ea2e0066bd18f53b5822387e19dd3 Mon Sep 17 00:00:00 2001
From: zhanglei <zhanglei9588@foxmail.com>
Date: Wed, 09 Mar 2022 14:08:56 +0800
Subject: [PATCH] test

---
 Jenkinsfile |   21 +++++----------------
 1 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 039a44e..a490cda 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -29,10 +29,10 @@
                                     , userRemoteConfigs: [[credentialsId: "${GIT_CREDENTIALS_ID}", url: "${url}"]]
                                     ])
                      println "changeLogSets ${changeLogSets}"
-                     GIT_COMMIT = changeLogSets.get("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,20 +120,9 @@
     }
 
     post {
-        unsuccessful {
+        failure {
             script{
-                String msg = """
-项目[${project_name}]序号[${BUILD_ID}]构建失败<br>
-#####################<br>
-提交人:${GIT_COMMIT_AUTHOR}<br>
-提交信息:<br>
-${GIT_COMMIT_MSG}<br>
-#####################<br>
-构建内网链接:${BUILD_URL}console
-"""
-                msg = msg.replaceAll("\n","")
-                def number = "326060971"
-                sendMessage(true,number,msg);
+                sendMessage(env.GIT_COMMIT_AUTHOR,env.GIT_COMMIT_MSG,env.project_name,env.GIT_BRANCH,env.BUILD_ID,env.BUILD_URL);
             }
         }
     }

--
Gitblit v1.9.1