优化

src/api/httpmock.js

@@ -1,13 +1,11 @@
 import request from '@/utils/request'
-import { mockUrl } from '@/apiConfig/mock'
+// import { mockUrl } from '@/apiConfig/mock'
+import { httpMock } from '@/apiConfig/api'
 // ================================== Interface ======================================
 
-// const mockUrl = 'http://mock.Intra.xiaojukeji.com'
-// const mockUrl = 'http://10.179.88.110:8089'
-
 export function fetchServiceList(data) {
   return request({
-    url: mockUrl + '/api/mock/httpmock/query',
+    url: httpMock + '/api/mock/httpmock/query',
     method: 'post',
     data
   })
@@ -16,7 +14,7 @@ export function fetchServiceList(data) {
 // 添加
 export function createService(data) {
   return request({
-    url: mockUrl + '/api/mock/httpmock/add',
+    url: httpMock + '/api/mock/httpmock/add',
     method: 'post',
     data
   })
@@ -25,7 +23,7 @@ export function createService(data) {
 // 更新
 export function updateService(data) {
   return request({
-    url: mockUrl + '/api/mock/httpmock/update',
+    url: httpMock + '/api/mock/httpmock/update',
     method: 'post',
     data
   })
@@ -34,7 +32,7 @@ export function updateService(data) {
 // 状态
 export function changeStatus(data) {
   return request({
-    url: mockUrl + '/api/mock/httpmock/changeStatus',
+    url: httpMock + '/api/mock/httpmock/changeStatus',
     method: 'post',
     data
   })
@@ -43,7 +41,7 @@ export function changeStatus(data) {
 // 复制
 export function changeCopy(id) {
   return request({
-    url: mockUrl + `/api/mock/httpmock/copy/` + id,
+    url: httpMock + `/api/mock/httpmock/copy/` + id,
     method: 'get',
     id
   })
@@ -52,7 +50,7 @@ export function changeCopy(id) {
 // data类型数据接口
 export function changeDataType(d) {
   return request({
-    url: mockUrl + '/api/mock/httpmock/getReturnDataTyppes',
+    url: httpMock + '/api/mock/httpmock/getReturnDataTyppes',
     method: 'get',
     params: {}
   })
@@ -61,7 +59,7 @@ export function changeDataType(d) {
 // method方法获取接口
 export function getSupportMethods() {
   return request({
-    url: mockUrl + '/api/mock/httpmock/getSupportMethods',
+    url: httpMock + '/api/mock/httpmock/getSupportMethods',
     method: 'get',
     params: {}
   })

src/api/httprule.js

@@ -1,10 +1,11 @@
 import request from '@/utils/request'
-import { mockUrl } from '@/apiConfig/mock'
+// import { mockUrl } from '@/apiConfig/mock'
+import { httpMock } from '@/apiConfig/api'
 // ================================== Rule ======================================
 
 export function fetchRuleById(data) {
   return request({
-    url: mockUrl + '/api/mock/mockRule/query',
+    url: httpMock + '/api/mock/mockRule/query',
     method: 'post',
     data
   })
@@ -12,21 +13,21 @@ export function fetchRuleById(data) {
 
 export function queryById(id) { // 单一查询
   return request({
-    url: mockUrl + '/api/mock/mockRule/queryById/' + id,
+    url: httpMock + '/api/mock/mockRule/queryById/' + id,
     method: 'get'
   })
 }
 
 export function callbackQuery(name) { // 回调接口信息
   return request({
-    url: mockUrl + '/api/mock/mockRule/callback/query?name=' + name,
+    url: httpMock + '/api/mock/mockRule/callback/query?name=' + name,
     method: 'get'
   })
 }
 
 export function fetchRuleList(data) {
   return request({
-    url: mockUrl + '/api/mock/mockRule/query',
+    url: httpMock + '/api/mock/mockRule/query',
     method: 'post',
     data
   })
@@ -34,7 +35,7 @@ export function fetchRuleList(data) {
 
 export function createRule(data) {
   return request({
-    url: mockUrl + '/api/mock/mockRule/add',
+    url: httpMock + '/api/mock/mockRule/add',
     method: 'post',
     data
   })
@@ -42,7 +43,7 @@ export function createRule(data) {
 
 export function updateRule(data) {
   return request({
-    url: mockUrl + '/api/mock/mockRule/update',
+    url: httpMock + '/api/mock/mockRule/update',
     method: 'post',
     data
   })
@@ -50,7 +51,7 @@ export function updateRule(data) {
 
 export function changeStatus(data) {
   return request({
-    url: mockUrl + '/api/mock/mockRule/changeStatus',
+    url: httpMock + '/api/mock/mockRule/changeStatus',
     method: 'post',
     data
   })
@@ -58,7 +59,7 @@ export function changeStatus(data) {
 // 查询支持的操作符
 export function getHttpOp() {
   return request({
-    url: mockUrl + '/api/mock/ruleEngine/getHttpOp?protocol=http',
+    url: httpMock + '/api/mock/ruleEngine/getHttpOp?protocol=http',
     method: 'get'
 
   })
@@ -67,7 +68,7 @@ export function getHttpOp() {
 // 查询支持的规则表达式
 export function getExpress() {
   return request({
-    url: mockUrl + '/api/mock/ruleEngine/getExpress?protocol=http',
+    url: httpMock + '/api/mock/ruleEngine/getExpress?protocol=http',
     method: 'get'
   })
 }

src/api/interface.js

@@ -1,13 +1,14 @@
 import request from '@/utils/request'
-import { mockUrl } from '@/apiConfig/mock'
+// import { mockUrl } from '@/apiConfig/mock'
+import { httpMock } from '@/apiConfig/api'
 // ================================== Interface ======================================
 
-// const mockUrl = 'http://10.179.88.110:8089'
-// const mockUrl = 'http://mock.Intra.xiaojukeji.com'
+// const httpMock = 'http://10.179.88.110:8089'
+// const httpMock = 'http://mock.Intra.xiaojukeji.com'
 
 export function fetchEnvInfo(envChannel) {
   return request({
-    url: mockUrl + '/api/mock/envConfig/getAllEnvConfigByChannel',
+    url: httpMock + '/api/mock/envConfig/getAllEnvConfigByChannel',
     method: 'get',
     params: { channelId: envChannel }
   })
@@ -15,7 +16,7 @@ export function fetchEnvInfo(envChannel) {
 
 export function fetchServiceById(data) {
   return request({
-    url: mockUrl + '/api/mock/methodConfig/query',
+    url: httpMock + '/api/mock/methodConfig/query',
     method: 'post',
     data
   })
@@ -23,7 +24,7 @@ export function fetchServiceById(data) {
 
 export function fetchServiceList(data) {
   return request({
-    url: mockUrl + '/api/mock/methodConfig/query',
+    url: httpMock + '/api/mock/methodConfig/query',
     method: 'post',
     data
   })
@@ -31,7 +32,7 @@ export function fetchServiceList(data) {
 
 export function fetchConsumerList() {
   return request({
-    url: mockUrl + '/api/mock/dubboConsumer/getAll',
+    url: httpMock + '/api/mock/dubboConsumer/getAll',
     method: 'get',
     params: {}
   })
@@ -39,7 +40,7 @@ export function fetchConsumerList() {
 
 export function createService(data) {
   return request({
-    url: mockUrl + '/api/mock/methodConfig/add',
+    url: httpMock + '/api/mock/methodConfig/add',
     method: 'post',
     data
   })
@@ -47,7 +48,7 @@ export function createService(data) {
 
 export function updateService(data) {
   return request({
-    url: mockUrl + '/api/mock/methodConfig/update',
+    url: httpMock + '/api/mock/methodConfig/update',
     method: 'post',
     data
   })
@@ -55,7 +56,7 @@ export function updateService(data) {
 
 export function changeStatus(data) {
   return request({
-    url: mockUrl + '/api/mock/methodConfig/changeStatus',
+    url: httpMock + '/api/mock/methodConfig/changeStatus',
     method: 'post',
     data
   })

src/api/rule.js

@@ -1,12 +1,11 @@
 import request from '@/utils/request'
-import { mockUrl } from '@/apiConfig/mock'
+// import { mockUrl } from '@/apiConfig/mock'
+import { httpMock } from '@/apiConfig/api'
 // ================================== Rule ======================================
-// const mockUrl = 'http://10.179.88.110:8089'
-// const mockUrl = 'http://mock.Intra.xiaojukeji.com'
 
 export function fetchRuleById(data) {
   return request({
-    url: mockUrl + '/api/mock/mockRule/query',
+    url: httpMock + '/api/mock/mockRule/query',
     method: 'post',
     data
   })
@@ -14,7 +13,7 @@ export function fetchRuleById(data) {
 
 export function fetchRuleList(data) {
   return request({
-    url: mockUrl + '/api/mock/mockRule/query',
+    url: httpMock + '/api/mock/mockRule/query',
     method: 'post',
     data
   })
@@ -22,7 +21,7 @@ export function fetchRuleList(data) {
 
 export function createRule(data) {
   return request({
-    url: mockUrl + '/api/mock/mockRule/add',
+    url: httpMock + '/api/mock/mockRule/add',
     method: 'post',
     data
   })
@@ -30,7 +29,7 @@ export function createRule(data) {
 
 export function updateRule(data) {
   return request({
-    url: mockUrl + '/api/mock/mockRule/update',
+    url: httpMock + '/api/mock/mockRule/update',
     method: 'post',
     data
   })
@@ -38,7 +37,7 @@ export function updateRule(data) {
 
 export function changeStatus(data) {
   return request({
-    url: mockUrl + '/api/mock/mockRule/changeStatus',
+    url: httpMock + '/api/mock/mockRule/changeStatus',
     method: 'post',
     data
   })

src/apiConfig/api.js

@@ -27,3 +27,5 @@ export const Presentation = projectManagementUrl // 报告模块
 export const envWebUrl = requestIp + '/env-web' //环境web
 
 export const workbenchUrl = projectManagementUrl //工作台
+
+export const httpMock = requestIp + '/mock' // mock

src/apiConfig/mock.js

@@ -1,5 +1,5 @@
 /*eslint-disable*/   //规避eslint的检查，如没有eslint可不写
-// export const mockUrl = 'http://10.179.88.110:8089' // stable
-export const mockUrl = 'http://mock.Intra.xiaojukeji.com' // 线上
+// export const mockUrl = 'http://mock.Intra.xiaojukeji.com' // 线上
 // export const mockUrl = 'http://10.179.101.226:8089' // test
-// export const mockUrl = 'http://172.23.145.20:8089'//local
+// export const mockUrl = 'http://172.23.145.20:8089'//local
+export const mockUrl = 'http://zhihui-test.intra.xiaojukeji.com/zuul/mock'

src/views/ToConfigure/components/AddTeamMembers.vue

@@ -6,7 +6,7 @@
       <el-select v-model="teamData" remote filterable reserve-keyword :remote-method="remoteMethod" size="medium" placeholder="请输入姓名或邮箱前缀" style="width: 100%;" :loading="loading">
         <el-option v-for="item in options" :key="item.memberIDAP" :label="item.memberName" :value="item.memberIDAP" @click.native="teamChange(item)">
           <div class="item-style">
-            <div class="item-detail">{{ item.memberName }}</div>
+            <div class="item-detail">{{ item.deptName }}</div>
             <div style="min-width:80px">{{ item.memberName }}</div>
             <div class="item-detail">{{ item.memberIDAP }}</div>
           </div>