重构ding消息

app/controller/pipeline.js

@@ -6,7 +6,7 @@ const logger = require('koa-log4')
   .getLogger('pipeline')
 const { PipeLine, PipeLinePush } = require('../service/mongoService')
 const jenkinsService = require('../service/jenkinsService')
-
+const dingTalk = require('../utils/dingTalk')
 
 const config = require(global.configPath)
 const url = 'http://192.168.4.96:8080/view/TKE/job/tke-'
@@ -142,31 +142,17 @@ const deletePipes = async function (ctx) {
   const res = await PipeLine.delete(id)
   ctx.body = ctx.ok(res)
 }
+
 const sendData = async (namespace, projectName, branchName, gitUser, flag, message, type, buildNumber, address) => {
-  const dingData = {
-    msgtype: 'markdown',
-    markdown: {
-      title: '流水线信息如下',
-      text: `> 项目名称 : ${projectName}\n\n`
-        + `> 分支名称 : ${branchName}\n\n`
-        + `> 部署空间 : ${namespace}\n\n`
-        + `> 触发同学 : ${gitUser}\n\n`
-        + `> 触发时间 : ${moment().format('YYYY-MM-DD HH:mm:ss')}\n\n`
-        + `> 触发信息 : ${message}\n\n`
-        + `#### 结果 : ${flag === 'success' ? '成功' : '失败'}   [查看详情](${url}${type}/${buildNumber}/)`,
-    },
-  }
-  if (address !== '') {
-    await awaitRequest({
-      url: address,
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json;charset=utf-8',
-      },
-      body: JSON.stringify(dingData),
-    })
-    logger.info(`发送dingtalk ${JSON.stringify(dingData)}`)
-  }
+  const text = `> 项目名称 : ${projectName}\n\n`
+    + `> 分支名称 : ${branchName}\n\n`
+    + `> 部署空间 : ${namespace}\n\n`
+    + `> 触发同学 : ${gitUser}\n\n`
+    + `> 触发时间 : ${moment().format('YYYY-MM-DD HH:mm:ss')}\n\n`
+    + `> 触发信息 : ${message}\n\n`
+    + `#### 结果 : ${flag === 'success' ? '成功' : '失败'}   [查看详情](${url}${type}/${buildNumber}/)`
+  const title = '流水线信息如下'
+  await dingTalk(title, text, address)
 }
 
 const dingTalkPush = async function (ctx) {

app/controller/pipelineback.js

@@ -7,6 +7,7 @@ const sleep = require('../utils/sleep')
 const config = require('../../src');
 const { PipeLine, PipeLinePush } = require('../service/mongoService')
 const jenkinsService = require('../service/jenkinsService')
+const dingTalk = require('../utils/dingTalk')
 
 const awaitRequest = function (options) {
   return new Promise((resolve, reject) => {
@@ -136,33 +137,17 @@ const dingTalkPush = async function (ctx) {
   }
   const url = 'http://192.168.4.96:8080/view/TKE/job/tke-'
   result.forEach(async (item) => {
-    const dingData = {
-      msgtype: 'markdown',
-      markdown: {
-        title: '流水线信息如下',
-        text: `> 项目名称 : ${item.projectName}\n\n`
-          + `> 分支名称 : ${item.branchName}\n\n`
-          + `> 部署空间 : ${item.namespace}\n\n`
-          + `> 触发同学 : ${item.gitUser}\n\n`
-          + `> 触发时间 : ${moment().format('YYYY-MM-DD HH:mm:ss')}\n\n`
-          + `> 提交信息 : ${item.commitMes}\n\n`
-          // + `> -----${item.objectKind}-----\n\n`
-          + `#### 结果 : ${flag === 'success' ? '成功' : '失败'}   [查看详情](${url}${item.type}/${item.buildId}/)`,
-      },
-    }
-    if (item.noticeAddress !== '') {
-      await awaitRequest({
-        url: item.noticeAddress,
-        method: 'POST',
-        headers: {
-          'Content-Type': 'application/json;charset=utf-8',
-        },
-        body: JSON.stringify(dingData),
-      })
-    }
+    const text = `> 项目名称 : ${item.projectName}\n\n`
+      + `> 分支名称 : ${item.branchName}\n\n`
+      + `> 部署空间 : ${item.namespace}\n\n`
+      + `> 触发同学 : ${item.gitUser}\n\n`
+      + `> 触发时间 : ${moment().format('YYYY-MM-DD HH:mm:ss')}\n\n`
+      + `> 提交信息 : ${item.commitMes}\n\n`
+      + `#### 结果 : ${flag === 'success' ? '成功' : '失败'}   [查看详情](${url}${item.type}/${item.buildId}/)`
+    const title = '流水线信息如下'
+    await dingTalk(title, text, item.noticeAddress)
   })
 
-
   ctx.body = ctx.ok(200)
 }
 const router = new Router()

app/controller/sonar.js

@@ -2,49 +2,55 @@ const Router = require('koa-router')
 const bodyParser = require('koa-bodyparser')
 const logger = require('koa-log4').getLogger('sonar')
 const awaitRequest = require('../utils/awaitRequest')
+const dingTalk = require('../utils/dingTalk')
 const sleep = require('../utils/sleep')
 
 const config = require(global.configPath)
 
-const sendData = async (projectName, branchName, item) => {
-  const text = `> 项目名称 : ${projectName}\n\n`
-    + `> 分支名称 : ${branchName}\n\n`
-    + `> 扫描结果 : ${item.status.qualityGateStatus}\n\n`
-    // + `[查看详情](${config.sonarHost}/dashboard?id=${projectName})`
-    + `[查看详情](${config.sonarHost}/project/activity?id=${projectName}&&selected_date=${item.analysisDate})`
-  const dingData = {
-    msgtype: 'markdown',
-    markdown: {
-      title: '扫描结果',
-      text,
-    },
-  }
-  const address = 'https://oapi.dingtalk.com/robot/send?access_token=5c4c7fb82ed9c5fd2d9a959037eb79d21d5c76ceeffd00b2d1ace86409deae2c'
-  if (address !== '') {
-    await awaitRequest({
-      url: address,
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json;charset=utf-8',
-      },
-      body: JSON.stringify(dingData),
-    })
-    logger.info(`发送 Sonar dingtalk ${JSON.stringify(dingData)}`)
-  }
+const sendDing = async (data, item, executionTimeMs) => {
+  const duration = data.duration / 1000
+  const executionTime = executionTimeMs / 1000
+  const text = `> <font color=#FF0000> 扫描结果 : ${item.status.qualityGateStatus}\n\n`
+    + `> 项目名称 : ${data.content.projectKey}\n\n`
+    + `> 分支名称 : ${data.branch}\n\n`
+    + `> 扫描日期 : ${item.analysisDate}\n\n`
+    + `> 扫描时间 : ${duration}s\n\n`
+    + `> 分析时间 : ${executionTime}s\n\n`
+    // + `[查看详情](${config.sonarHost}/dashboard?id=${data.content.projectKey})`
+    + `[查看详情](${config.sonarHost}/project/activity?id=${data.content.projectKey}&&selected_date=${item.analysisDate})`
+  const address = data.dingRobotAddr
+  await dingTalk('扫描结果如下', text, address)
+}
+
+const sendExceptionDing = async (data) => {
+  const text = '> <font color=#FF0000> 扫描结果 : 扫描任务执行失败 \n\n'
+    + `> 结果信息 : ${data.error} \n\n`
+    + `> 项目名称 : ${data.project}\n\n`
+    + `> 分支名称 : ${data.branch}\n\n`
+    + `[查看详情](${data.absoluteUrl}/console)`
+  const address = data.dingRobotAddr || config.snorDingRobotAddr
+  await dingTalk('扫描结果如下', text, address)
 }
 
 const callback = async (ctx) => {
   const data = ctx.request.body
   logger.info('sonar callback info', data)
 
+  if (data.error) {
+    sendExceptionDing(data)
+    ctx.body = ctx.ok()
+    return
+  }
+
   let flag = true
+  let executionTimeMs
   while (flag) {
     const ceTaskResult = await awaitRequest({
       url: `${data.content.ceTaskUrl}`,
       method: 'GET',
     })
-    logger.info(1, ceTaskResult)
     if (ceTaskResult.task.status === 'SUCCESS') {
+      executionTimeMs = ceTaskResult.task.executionTimeMs
       flag = false
     }
     await sleep(1 * 1000)
@@ -56,7 +62,8 @@ const callback = async (ctx) => {
   logger.info('analysisResult', data.content.projectKey, JSON.stringify(res))
   for (const i of res.branches) {
     if (i.name === 'master' && i.status.qualityGateStatus !== 'OK') {
-      sendData(data.content.projectKey, data.branch, i)
+      logger.info(data.content.projectKey, '触发质量阀，发送ding消息')
+      sendDing(data, i, executionTimeMs)
     }
   }
   ctx.body = ctx.ok()

app/jobs/sonarCheck.js

 const schedule = require('node-schedule')
-const logger = require('koa-log4').getLogger('sonarCheck')
+const logger = require('koa-log4').getLogger('dailySonarCheck')
 const { ProConfig } = require('../service/mongoService')
 const jenkinsService = require('../service/jenkinsService')
-
-const sleep = (time = 0) => new Promise((resolve) => {
-  setTimeout(() => {
-    resolve();
-  }, time);
-});
-
+const sleep = require('../utils/sleep')
 
 const sonarCheck = async () => {
   logger.info('daily sonarCheck start')
 
-  let projects = await ProConfig.findByQuery({ is_active: true, type: 'java' }, { project_name: 1 })
+  let projects = await ProConfig.findByQuery({ is_active: true, type: 'java', deploy_to_testenv: true }, { project_name: 1 })
   projects = projects.map(i => i.project_name)
+  logger.info('要扫描的项目', projects)
 
-  // for test
-  const testProject = ['acs-batch', 'cash-loan-flow']
-  projects = projects.filter(item => testProject.includes(item))
+  // // for test
+  // const testProject = ['acs-batch', 'cash-loan-flow']
+  // projects = projects.filter(item => testProject.includes(item))
   for (const project of projects) {
     const data = {
       GIT_REPO_NAME: project,
@@ -26,13 +21,12 @@ const sonarCheck = async () => {
     }
     await jenkinsService.build_with_params('tke-sonar', data)
     logger.info('daily sonarCheck', data)
-    await sleep(60 * 1000)
+    await sleep(30 * 1000)
   }
   logger.info('daily sonarCheck end')
 }
 
-// module.exports = schedule.scheduleJob('*/2 * * * *', async () => {
-module.exports = schedule.scheduleJob('0 10 * * *', async () => {
+module.exports = schedule.scheduleJob('0 22 * * *', async () => {
   try {
     await sonarCheck()
   } catch (e) {

app/utils/dingTalk.js

+const logger = require('koa-log4').getLogger('dingtalk')
+const awaitRequest = require('./awaitRequest')
+
+module.exports = async (title, text, url) => {
+  const dingData = {
+    msgtype: 'markdown',
+    markdown: {
+      title,
+      text,
+    },
+  }
+  if (url) {
+    await awaitRequest({
+      url,
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json;charset=utf-8',
+      },
+      body: JSON.stringify(dingData),
+    })
+    logger.info(`发送 Sonar dingtalk ${JSON.stringify(dingData)}`)
+  }
+}

src/app.config.js

@@ -50,4 +50,5 @@ module.exports = {
   dingdingMemory: 'https://oapi.dingtalk.com/robot/send?access_token'
     + '=7cab1f948d67c3565a30323c58773c0ba77c7bd1a3eb1c11f8b2d1b6b4a395df',
   sonarHost: 'http://sonar.quantgroups.com',
+  snorDingRobotAddr: 'https://oapi.dingtalk.com/robot/send?access_token=5c4c7fb82ed9c5fd2d9a959037eb79d21d5c76ceeffd00b2d1ace86409deae2c',
 }