branchName 提取

app/controller/pipeline.js

@@ -76,8 +76,7 @@ const webhooks = async function (ctx) {
   logger.info('webhooks', req)
 
   const projectName = req.repository.name
-  const arr = req.ref.split('/')
-  const branchName = arr[arr.length - 1]
+  const branchName = req.ref.replace('refs/heads/', '')
   logger.info(`收到webhooks->>>项目名:${projectName} 分支名:${branchName}`)
 
   // user_add_to_team project_create之类的操作
@@ -126,13 +125,13 @@ const webhooks = async function (ctx) {
       }
     }
   }
-  if (gitObject == null || gitObject === undefined) {
-    logger.info(`未查询到订阅信息->>>项目名:${projectName} 分支名:${branchName}，不执行pipeline jenkins`)
-  } else {
+  if (gitObject) {
     logger.info('webhooks 触发 pipeline jenkins build', projectName, branchName, req.checkout_sha)
     pipelineJenkinsBuild({
       projectName, branchName, type: gitObject.type, gitUser, commitMes, timestamp,
     })
+  } else {
+    logger.info(`未查询到订阅信息->>>项目名:${projectName} 分支名:${branchName}，不执行pipeline jenkins`)
   }
 
   ctx.body = ctx.ok('success')
@@ -210,7 +209,7 @@ const sendSuccessDing = async (data, pipeLineData, pushData) => {
     + `> 触发时间 : ${pushData.gitEventTime}\n\n`
     + `[查看详情](${data.absoluteUrl}console)`
   const address = pipeLineData.noticeAddress || data.dingRobotAddr
-  await dingTalk(title, text, address)
+  await dingTalk(`${pushData.projectName}${title}`, text, address)
 }
 
 const sendSonarFailDing = async (data, pipeLineData) => {
@@ -224,7 +223,7 @@ const sendSonarFailDing = async (data, pipeLineData) => {
       + `[Jenkins详情](${data.absoluteUrl}console)\n\n`
       + `[Sonar详情](${config.sonarHost}/project/activity?id=${sonarJob.projectName}&&selected_date=${sonarJob.analysisDate})`
   const address = pipeLineData.noticeAddress || data.dingRobotAddr
-  await dingTalk(title, text, address)
+  await dingTalk(`${sonarJob.projectName}${title}`, text, address)
 }
 
 const sendExceptionDing = async (data, pipeLineData) => {
@@ -234,7 +233,7 @@ const sendExceptionDing = async (data, pipeLineData) => {
     + `> 触发时间 : ${moment().format('YYYY-MM-DD HH:mm:ss')}\n\n`
     + `[Jenkins详情](${data.absoluteUrl}console)\n\n`
   const address = pipeLineData.noticeAddress || data.dingRobotAddr
-  await dingTalk(title, text, address)
+  await dingTalk(`${data.projectName}${title}`, text, address)
 }
 
 const callback = async (ctx) => {

app/controller/proconfig.js

@@ -55,7 +55,7 @@ const save = async function (ctx) {
     return
   }
 
-  if (~data.host_name.indexOf('://')) {
+  if (data.host_name && ~data.host_name.indexOf('://')) {
     ctx.body = ctx.fail('线上域名不要有 http://')
     return
   }

app/controller/sonar.js

@@ -22,7 +22,7 @@ const sendFailDing = async (data, item, executionTimeMs) => {
     // + `[查看详情](${config.sonarHost}/dashboard?id=${data.project})`
     + `[查看详情](${config.sonarHost}/project/activity?id=${data.project}&&selected_date=${item.analysisDate})`
   const address = data.dingRobotAddr
-  await dingTalk(title, text, address)
+  await dingTalk(`${data.project}${title}`, text, address)
 }
 
 const sendExceptionDing = async (data) => {
@@ -32,7 +32,7 @@ const sendExceptionDing = async (data) => {
     + `> 分支名称 : ${data.branch}\n\n`
     + `[查看详情](${data.absoluteUrl}console)`
   const address = data.dingRobotAddr || config.snorDingRobotAddr
-  await dingTalk(title, text, address)
+  await dingTalk(`${data.project}${title}`, text, address)
 }
 
 const sendExistDing = async (data, dingRobotAddr) => {
@@ -44,7 +44,7 @@ const sendExistDing = async (data, dingRobotAddr) => {
     + `> 扫描分析日期 : ${data.analysisDate}\n\n`
     + `[查看详情](${config.sonarHost}/project/activity?id=${data.projectName}&&selected_date=${data.analysisDate})`
   const address = dingRobotAddr || config.snorDingRobotAddr
-  await dingTalk(title, text, address)
+  await dingTalk(`${data.projectName}${title}`, text, address)
 }
 
 const callback = async (ctx) => {
@@ -52,7 +52,8 @@ const callback = async (ctx) => {
   logger.info('sonar callback info', data)
 
   if (data.sonarJob) {
-    logger.info(data.sonarJob.projectName, data.sonarJob.branchName, data.sonarJob.branchHash, 'GITHASH 曾经 扫描过')
+    logger.info(data.sonarJob.projectName, data.sonarJob.branchName, data.sonarJob.branchHash,
+      'GITHASH 曾经 扫描过，扫描结果:', data.sonarJob)
     if (data.sonarJob.sonarResult !== 'OK' && data.dingRobotAddr) {
       sendExistDing(data.sonarJob, data.dingRobotAddr)
     }
@@ -110,7 +111,7 @@ const callback = async (ctx) => {
       await SonarJob.saveSonarJob(saveData)
     }
   }
-  ctx.body = ctx.ok()
+  ctx.body = ctx.ok(saveData)
 }
 
 const getSonarJob = async (ctx) => {

app/jobs/sonarCheck.js

@@ -23,12 +23,12 @@ const sonarCheck = async () => {
     }
     jenkinsService.build_with_params('tke-sonar', data)
     logger.info('daily sonarCheck', data)
-    await sleep(30 * 1000)
+    await sleep(15 * 1000)
   }
   logger.info('daily sonarCheck end')
 }
 
-module.exports = schedule.scheduleJob('0 22 * * *', async () => {
+module.exports = schedule.scheduleJob('30 21 * * *', async () => {
   try {
     await sonarCheck()
   } catch (e) {

app/utils/dingTalk.js

@@ -18,6 +18,6 @@ module.exports = async (title, text, url) => {
       },
       body: JSON.stringify(dingData),
     })
-    logger.info(`发送 Sonar dingtalk ${JSON.stringify(dingData)}`)
+    logger.info(`发送 dingtalk ${JSON.stringify(dingData)}`)
   }
 }