sonar jenkins取消判断

app/controller/pipeline.js

@@ -106,13 +106,14 @@ const webhooks = async function (ctx) {
   const commitMes = req.commits[0].message
   const timestamp = req.commits[0].timestamp
 
-  const project = await ProConfig.getOneProject({ project_name: projectName })
-  if (project.sonar) {
-    logger.info('webhooks 触发 sonar jenkins build', projectName, branchName, req.checkout_sha)
-    sonarJenkinsBuild({
-      projectName, branchName, branchHash: req.checkout_sha, gitUser, commitMes,
-    })
-  }
+  // const project = await ProConfig.getOneProject({ project_name: projectName })
+  // if (project.sonar) {
+
+  // }
+  logger.info('webhooks 触发 sonar jenkins build', projectName, branchName, req.checkout_sha)
+  sonarJenkinsBuild({
+    projectName, branchName, branchHash: req.checkout_sha, gitUser, commitMes,
+  })
 
   const data = await PipeLine.getMatchPipe(projectName)
   // 获取项目的分类
@@ -126,7 +127,7 @@ const webhooks = async function (ctx) {
     }
   }
   if (gitObject == null || gitObject === undefined) {
-    logger.info(`未查询到订阅信息->>>项目名:${projectName} 分支名:${branchName}，不执行jenkins`)
+    logger.info(`未查询到订阅信息->>>项目名:${projectName} 分支名:${branchName}，不执行pipeline jenkins`)
   } else {
     logger.info('webhooks 触发 pipeline jenkins build', projectName, branchName, req.checkout_sha)
     pipelineJenkinsBuild({

app/controller/sonar.js

@@ -36,7 +36,7 @@ const sendExceptionDing = async (data) => {
 }
 
 const sendExistDing = async (data, dingRobotAddr) => {
-  const text = '> <font color=#FF7F50> 本次执行的GITHASH曾经扫描过'
+  const text = '> <font color=#FF7F50> 本次执行的GITHASH曾经扫描过\n\n'
     + `> 扫描结果 : ${data.sonarResult}\n\n`
     + `> <font color=#000000> 项目名称 : ${data.projectName}\n\n`
     + `> 分支名称 : ${data.branchName}\n\n`