Merge branch 'master' of http://git.quantgroup.cn/QA/qahome-diamond

config/dev.env.js

 module.exports = {
   NODE_ENV: '"development"',
   ENV_CONFIG: '"dev"',
-  QA_API: '"http://127.0.0.1:3003"',
-  // QA_API: '"http://qaapi.liangkebang.com"',
+  // QA_API: '"http://127.0.0.1:3003"',
+  QA_API: '"http://qaapi.liangkebang.com"',
   TESTDATA_API: '"http://172.30.220.22:3333"',
-  PIPELINE_API:'"http://pipes.liangkebang.com"'
+  PIPELINE_API:'"http://pipes.liangkebang.com"',
+  HOLMES_API: '"//localhost:8084"'
 }

config/prod.env.js

@@ -6,4 +6,5 @@ module.exports = {
   TESTDATA_API: '"//testdata.liangkebang.com"',
   PIPELINE_API: '"//pipes.liangkebang.com"',
   PIPELINE_API_JAVA:'"//pipes.liangkebang.com"',
+  HOLMES_API: '"//holmes-yxm.liangkebang.net"',
 }

src/api/holmes.js

+import request from '@/utils/requestHolmes'
+
+export function buildJenkinsJob(paramsInfo) {
+  return request({
+    url: '/jenkins/build',
+    method: 'get',
+    params: paramsInfo
+  })
+}

src/utils/requestHolmes.js

+import axios from 'axios'
+
+const service = axios.create(
+  {
+    baseURL: process.env.HOLMES_API,
+    timeout: 500000
+  }
+)
+
+// request interceptor
+service.interceptors.request.use(
+)
+
+// response interceptor
+service.interceptors.response.use(
+  response => response,
+  error => {
+    console.log('error' + error) // for debug
+    return Promise.reject(error)
+  }
+)
+
+export default service

src/views/docker/createEnv.vue

@@ -150,7 +150,10 @@ export default {
         description: this.group,
         cluster: this.cluster,
         dependant: {
-          base: this.dependant.base
+          base: this.dependant.base,
+          java: this.dependant.java,
+          ui: this.dependant.ui,
+          node: this.dependant.node
         }
       }
 

src/views/docker/envDetail.vue

@@ -160,6 +160,7 @@
         <svg-icon icon-class="service"/>
         {{ item._id.toUpperCase() }} 服务
         <div style="float: right">
+          <el-button type="primary" size="mini" round @click="deployMaster(FormatTabledata[item._id])">一键部署master</el-button>
           <el-button type="warning" size="mini" round @click="getRepository(item._id)">新增服务</el-button>
           <el-button type="success" size="mini" round @click="refresh">刷新状态</el-button>
           <el-button type="danger" size="mini" round @click="restartAll(FormatTabledata[item._id])">重置所有服务</el-button>
@@ -456,6 +457,7 @@ import JsonEditor from '@/components/JsonEditor'
 import permission from '@/directive/permission/index.js' // 权限判断指令
 import { getHostName } from '@/api/proconfig'
 import { getNotify } from '@/api/notify'
+import { buildJenkinsJob } from '@/api/holmes'
 export default {
   components: { JsonEditor },
   directives: { permission },
@@ -551,12 +553,30 @@ export default {
       this.getServicelist()
     },
 
+    // 重置所有服务
     restartAll(serviceList) {
       for (var x in serviceList) {
         this.restartService(serviceList[x])
       }
     },
 
+    // 一键部署master
+    deployMaster(serviceList) {
+      for (var x in serviceList) {
+        buildJenkinsJob({
+          type: serviceList[x].labels.type,
+          project: serviceList[x].serviceName,
+          branch: 'master',
+          namespace: this.namespace
+        }).then((resp) => {
+          this.$message({
+            type: 'success',
+            message: '服务' + serviceList[x].serviceName + '部署master分支成功!'
+          })
+        })
+      }
+    },
+
     refreshInterval(value) {
       this.$store.dispatch('changeSwitch', value)
       if (value) {