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

---
 Jenkinsfile |   34 ++++++++++++++++++++--------------
 1 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index c2ac5e8..1f174f2 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -32,7 +32,7 @@
                      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()
 
                 }
             }
@@ -114,7 +114,7 @@
         stage('deploy') {
             when { branch 'master' }
             steps {
-                sh 'echo test2'
+                sh 'echo test'
             }
         }
     }
@@ -122,18 +122,24 @@
     post {
         unsuccessful {
             script{
-                String msg = '''
-                        当前构建失败<br>
-                        ---------------------<br>
-                        提交人:${GIT_COMMIT_AUTHOR}<br>
-                        提交信息:<br>
-                        ${GIT_COMMIT_MSG}<br>
-                        ---------------------<br>
-                        构建内网链接:${BUILD_URL}console
-                    '''
-                msg = msg.replace("\n","")
-                def number = "964606955"
-                sendMessage(true,number,msg);
+                def msg = """
+jenkins构建失败,请提交人员自查
+
+###########项目信息##########
+项目:${project_name}
+GIT分支:${GIT_BRANCH}
+构建序号:${BUILD_ID}
+构建内网链接:${BUILD_URL}console
+############################
+
+###########提交信息##########
+提交人:${GIT_COMMIT_AUTHOR}
+提交日志如下:
+${GIT_COMMIT_MSG}
+############################
+"""
+                def number = "326060971"
+                sendMessage(msg,number,true);
             }
         }
     }

--
Gitblit v1.9.1