Commit 49594480 authored by 智勇's avatar 智勇

修复是否sonar的判断

parent 103d7c34
const Router = require('koa-router') const Router = require('koa-router')
const bodyParser = require('koa-bodyparser') const bodyParser = require('koa-bodyparser')
const _ = require('lodash') const _ = require('lodash')
const mysql = require('mysql2/promise'); const mysql = require('mysql2/promise')
const logger = require('koa-log4').getLogger('dbsync')
const jenkinsService = require('../service/jenkinsService') const jenkinsService = require('../service/jenkinsService')
const k8sService = require('../service/k8sService') const k8sService = require('../service/k8sService')
const { DBConfig } = require('../service/mongoService') const { DBConfig } = require('../service/mongoService')
const { config } = require('../../src')
const { api } = require('../../src')
const domain = 'liangkebang.com' const domain = 'liangkebang.com'
let domainTKE = 'liangkebang.net' let domainTKE = 'liangkebang.net'
...@@ -74,7 +74,7 @@ const dbSyncTke = async function (ctx) { ...@@ -74,7 +74,7 @@ const dbSyncTke = async function (ctx) {
} }
let res = await ctx.curl({ let res = await ctx.curl({
uri: `${api.tke_api}/service/details`, uri: `${config.tke_api}/service/details`,
headers: { headers: {
cluster: ctx.request.headers.cluster, cluster: ctx.request.headers.cluster,
}, },
...@@ -131,7 +131,7 @@ const dbSyncQuery = async function (ctx) { ...@@ -131,7 +131,7 @@ const dbSyncQuery = async function (ctx) {
const getDropSQL = async (ctx) => { const getDropSQL = async (ctx) => {
const { dbName } = ctx.request.query const { dbName } = ctx.request.query
const select = `select \`sql\`,base from core_sqlrecord where to_days(date) = to_days(now()) const select = `select \`sql\`,base from core_sqlrecord where to_days(date) = to_days(now())
and state='Execute Successfully' and \`sql\` like '%drop %'` and state like '%Execute Successfully%' and \`sql\` like '%drop %'`
const connection = await mysql.createConnection({ const connection = await mysql.createConnection({
host: '172.30.4.8', host: '172.30.4.8',
user: 'sync_del', user: 'sync_del',
...@@ -145,6 +145,7 @@ const getDropSQL = async (ctx) => { ...@@ -145,6 +145,7 @@ const getDropSQL = async (ctx) => {
} }
return a return a
}, '') }, '')
logger.info(dbName, 'dropSQL: ', res)
ctx.body = res ctx.body = res
} }
......
const Router = require('koa-router') const Router = require('koa-router')
const moment = require('moment') const moment = require('moment')
const bodyParser = require('koa-bodyparser') const bodyParser = require('koa-bodyparser')
const logger = require('koa-log4') const logger = require('koa-log4').getLogger('pipeline')
.getLogger('pipeline')
const { PipeLine, PipeLinePush, SonarJob } = require('../service/mongoService') const { PipeLine, PipeLinePush, SonarJob } = require('../service/mongoService')
const jenkinsService = require('../service/jenkinsService') const jenkinsService = require('../service/jenkinsService')
const dingTalk = require('../utils/dingTalk') const dingTalk = require('../utils/dingTalk')
...@@ -95,26 +94,21 @@ const webhooks = async function (ctx) { ...@@ -95,26 +94,21 @@ const webhooks = async function (ctx) {
return return
} }
const gitUser = req.user_username || req.user_email.split('@')[0]
const commitMes = req.commits[req.commits.length - 1].message
let projects = await ProConfig.findByQuery({ is_active: true, deploy_to_testenv: true, type: 'java' }, { project_name: 1 }) let projects = await ProConfig.findByQuery({ is_active: true, deploy_to_testenv: true, type: 'java' }, { project_name: 1 })
projects = projects.map(i => i.project_name) projects = projects.map(i => i.project_name)
if (!projects.includes(projectName)) { if (projects.includes(projectName)) {
logger.info(`${projectName} 不是激活且部署到容器的java服务,不执行jenkins`) logger.info('webhooks 触发 sonar jenkins build', projectName, branchName, req.checkout_sha)
sonarJenkinsBuild({
projectName, branchName, branchHash: req.checkout_sha, gitUser, commitMes,
})
} else {
logger.info(`${projectName} 不是激活且部署到容器的java服务,不执行sonar jenkins`)
ctx.body = ctx.ok(`${projectName} 不是激活且部署到容器的java服务`) ctx.body = ctx.ok(`${projectName} 不是激活且部署到容器的java服务`)
return
} }
const gitUser = req.user_username || req.user_email.split('@')[0]
const commitMes = req.commits[req.commits.length - 1].message
// 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) const data = await PipeLine.getMatchPipe(projectName)
// 获取项目的分类 // 获取项目的分类
let gitObject; let gitObject;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment