Merge branch 'master' of http://git.quantgroup.cn/QA/qa-api

app/controller/dbsync.js

@@ -7,6 +7,7 @@ const jenkinsService = require('../service/jenkinsService')
 const k8sService = require('../service/k8sService')
 const { DBConfig } = require('../service/mongoService')
 const { api } = require('../../src')
+const { StatisticsLog } = require('../service/mongoService');
 
 const domain = 'liangkebang.com'
 let domainTKE = 'liangkebang.net'
@@ -47,7 +48,7 @@ const dbSync = async function (ctx) {
     not_delete_business_data: req.not_delete_business_data,
     use_cache: req.use_cache,
     domain,
-  })
+  })  
   ctx.body = ctx.ok({ location: res.location })
 }
 
@@ -109,6 +110,23 @@ const dbSyncTke = async function (ctx) {
     domain: domainTKE,
   })
   ctx.body = ctx.ok({ location: res.location })
+
+  // 数据库同步时新增行为记录
+  if (ctx.request.method === 'POST' && ctx.response.status === 200 ) {
+    const user = await ctx.redisGet(config.QA_TOKEN, ctx.request.header['x-token'])
+    if (user) {
+      const body = ctx.request.body
+      const data = {
+        namespace: body.namespace,
+        active: '同步' + body.mysqlName,
+        microservice_name: body.dbname,
+        user: user.cn,
+        user_mail: user.mail,
+        detail: body,
+      }
+      await StatisticsLog.saveLog(data);
+    }
+  }
 }
 
 const dbSyncQuery = async function (ctx) {

app/controller/k8s.js

@@ -19,7 +19,10 @@ const api = async function (ctx) {
         user_mail: user.mail,
         detail: body,
       }
-      await StatisticsLog.saveLog(data);
+      // 用户行为记录中过滤rabbitmq
+      if (!(data.active === 'service_details' && data.microservice_name === 'rabbitmq')) {
+        await StatisticsLog.saveLog(data);
+      }
     }
   }
 }

app/controller/user.js

@@ -12,7 +12,8 @@ const authenticate = require('../service/authenticate')
 
 
 const router = new Router()
-const admin = ['zhijie.xue', 'luoyong.meng', 'jinfang.liu','qiuyue.gui', 'yong.zhi', 'haiyuan.wen']
+const admin = ['qiaoling.yu','lili.wang','zhijie.xue', 'luoyong.meng', 'jinfang.liu','qiuyue.gui', 'yong.zhi', 'haiyuan.wen']
+
 
 const login = async function (ctx) {
   const { body } = ctx.request
@@ -67,7 +68,7 @@ const checkTokenNew = async (ctx) => {
   const { token } = ctx.request.query
   const info = await ctx.redisGet(config.QA_TOKEN, token)
   if (info) {
-    const role = admin.includes(info.SAMACCOUNTNAME) ? ['admin'] : ['user']
+    const role = admin.includes(info.SAMACCOUNTNAME || info.sAMAccountName) ? ['admin'] : ['user']
 
     if (info.title && info.title.indexOf('测试') !== -1) {
       role.push('test')

app/service/repoServiceNew.js

@@ -53,7 +53,6 @@ async function getRepoOfNs(ctx, ns) {
 
   // 把tag信息拉平到appname上
   const m = []
-  console.log(1, repos)
   repos.forEach((item) => {
     const tags = item.tags || [LASTEST]
     tags.forEach((tag) => {