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 |   23 ++++++-----------------
 1 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index c2ac5e8..d09dee5 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()
 
                 }
             }
@@ -114,26 +114,15 @@
         stage('deploy') {
             when { branch 'master' }
             steps {
-                sh 'echo test2'
+                sh 'echo test'
             }
         }
     }
 
     post {
-        unsuccessful {
+        failure {
             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);
+                sendMessage(env);
             }
         }
     }

--
Gitblit v1.9.1