From 8191861c9d71c7c5545a159fe24e5360681e3079 Mon Sep 17 00:00:00 2001
From: zhanglei <zhanglei9588@foxmail.com>
Date: Wed, 09 Mar 2022 13:18:25 +0800
Subject: [PATCH] 完善信息10

---
 Jenkinsfile |   29 +++++++++++++++--------------
 1 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 168eced..2615278 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()
 
                 }
             }
@@ -122,17 +122,18 @@
     post {
         unsuccessful {
             script{
-                def msg = '''
-                        当前构建失败<br>
-                        ---------------------<br>
-                        提交人:${GIT_COMMIT_AUTHOR}<br>
-                        提交信息:<br>
-                        ${GIT_COMMIT_MSG}<br>
-                        ---------------------<br>
-                        构建内网链接:${BUILD_URL}console
-                    '''
-                def number = "964606955"
-                sendMessage(true,number,msg);
+                def msg = """
+项目[${project_name}/${GIT_BRANCH}]序号[${BUILD_ID}]构建失败,请提交人员自查
+
+###########更新信息##########
+提交人:${GIT_COMMIT_AUTHOR}
+提交日志如下:
+${GIT_COMMIT_MSG}
+############################
+构建内网日志:${BUILD_URL}console
+"""
+                def number = "326060971"
+                sendMessage(msg,number,true);
             }
         }
     }

--
Gitblit v1.9.1