邮件判断

app/controller/sonar.js

@@ -28,8 +28,9 @@ const sendExceptionMail = async (data) => {
     + `<font color=#000000> 结果信息 : ${data.error} <br/>`
     + `项目名称 : ${data.project}<br/>`
     + `分支名称 : ${data.branch}<br/>`
-    + `查看详情 : ${data.absoluteUrl}console`
-  sendMail(data.gitUserMail, `${data.project} ${title}`, text)
+    + `Sonar详情 : ${config.sonarHost}/dashboard?id=${data.project} <br/>`
+    + `Jenskins详情 : ${data.absoluteUrl}console <br/>`
+  sendMail(`${data.gitUser}@quantgroup.cn`, `${data.project} ${title}`, text)
 }
 
 const sendExistMail = async (data) => {
@@ -50,7 +51,7 @@ const callback = async (ctx) => {
   if (data.sonarJob) {
     logger.info(data.sonarJob.projectName, data.sonarJob.branchName, data.sonarJob.branchHash,
       'GITHASH 曾经 扫描过，扫描结果:', data.sonarJob)
-    if (data.sonarJob.sonarResult !== 'OK' && data.dingRobotAddr) {
+    if (data.sonarJob.sonarResult !== 'OK' && data.mail !== 'noMail') {
       sendExistMail(data.sonarJob)
     }
     ctx.body = ctx.ok()
@@ -66,7 +67,9 @@ const callback = async (ctx) => {
   if (data.error) {
     saveData.buildResult = 'error'
     saveData.projectName = data.project
-    sendExceptionMail(data)
+    if (data.mail !== 'noMail') {
+      sendExceptionMail(data)
+    }
     // await SonarJob.saveSonarJob(saveData)
     ctx.body = ctx.ok()
     return
@@ -91,8 +94,8 @@ const callback = async (ctx) => {
   })
   logger.info('analysisResult', data.project, JSON.stringify(res))
   for (const i of res.branches) {
-    if (i.name === 'master' && i.status.qualityGateStatus !== 'OK' && data.dingRobotAddr) {
-      logger.info(data.project, '触发质量阀，发送ding消息')
+    if (i.name === 'master' && i.status.qualityGateStatus !== 'OK' && data.mail !== 'noMail') {
+      logger.info(data.project, '触发质量阀，发送邮件通知')
       sendFailMail(data, i, executionTimeMs)
     }
     saveData.projectName = data.project

app/jobs/sonarCheck.js

@@ -19,7 +19,7 @@ const sonarCheck = async () => {
     const data = {
       GIT_REPO: project,
       BRANCH_NAME: 'master',
-      FORCE_SCAN: 'false',
+      FORCE_SCAN: 'noMail',
     }
     jenkinsService.build_with_params('tke-sonar', data)
     logger.info('daily sonarCheck', data)