瀏覽代碼

统一api经过网关

reedliuqing_i 5 年之前
父節點
當前提交
e0261f3cbd

+ 1 - 6
src/api/user.js

@@ -1,10 +1,5 @@
 import request from '@/utils/request'
-
-export const requestIp = 'http://10.179.209.19:8762'
-
-export const loginUrl = requestIp + '/sso/login'
-
-export const logoutUrl = requestIp + '/sso/logout'
+import { requestIp } from '@/apiConfig/requestIP'
 
 export function getUserInfo() {
   return request({

+ 5 - 1
src/apiConfig/api.js

@@ -1,3 +1,5 @@
+import { requestIp } from './requestIP'
+
 /*eslint-disable*/   //规避eslint的检查,如没有eslint可不写
 export const mockUrl = 'http://10.179.24.176:8980' // 线下
 // export const mockUrl = 'http://10.179.24.123:8980' // 线上
@@ -13,4 +15,6 @@ export const TeamManagement = 'http://10.179.24.176:8990' // 团队配置 项目
 
 export const task_Url = 'http://10.179.24.176:8990' // 任务
 
-export const Presentation = 'http://10.179.24.176:8990' // 报告模块
+export const Presentation = 'http://10.179.24.176:8990' // 报告模块
+
+export const projectManagementUrl = requestIp + '/project_management' //项目管理

+ 11 - 0
src/apiConfig/requestIP.js

@@ -0,0 +1,11 @@
+export let host = 'http://zhihui-test.intra.xiaojukeji.com'
+export let requestIp = host + '/localzuul'
+export let loginUrl = host + '/sso/login?jumpto=' + 'http://zhihui-test.intra.xiaojukeji.com' + location.pathname
+export let logoutUrl = host + '/sso/logout?jumpto=' + 'http://zhihui-test.intra.xiaojukeji.com' + location.pathname
+
+if (location.host.indexOf('localhost') < 0) {
+  host = 'http://' + location.host
+  requestIp = host + '/zuul'
+  loginUrl = host + '/sso/login?jumpto=' + location.href
+  logoutUrl = host + '/sso/logout?jumpto=' + location.href
+}

+ 1 - 1
src/layout/components/Navbar.vue

@@ -19,7 +19,7 @@ import Hamburger from '@/components/Hamburger'
 // import navbarLogo from '@/icons/rabbit-logo.gif'
 import { settingQueryBizTypeList } from '@/api/settingQueryBizTypeList.js'
 import Utils from '../../util.js'
-// import { logoutUrl } from '@/api/user.js'
+// import { logoutUrl } from '@/apiConfig/requestIP.js'
 
 export default {
   components: {

+ 1 - 1
src/layout/components/Sidebar/index.vue

@@ -52,7 +52,7 @@ import Logo from './Logo'
 import SidebarItem from './SidebarItem'
 import variables from '@/styles/variables.scss'
 import { getGlobalInterface } from '@/api/data.js'
-import { logoutUrl } from '@/api/user.js'
+import { logoutUrl } from '@/apiConfig/requestIP.js'
 
 export default {
   components: { SidebarItem, Logo },

+ 1 - 1
src/utils/request.js

@@ -2,7 +2,7 @@ import axios from 'axios'
 import { Message } from 'element-ui'
 // import store from '@/store'
 // import { getToken } from '@/utils/auth'
-import { loginUrl } from '@/api/user.js'
+import { loginUrl } from '@/apiConfig/requestIP.js'
 
 // create an axios instance
 const service = axios.create({

+ 1 - 1
src/views/home/index.vue

@@ -274,7 +274,7 @@ img.img-arrow {
 <script>
 import FloatMenu from './floatMenu'
 import { getGlobalInterface } from '@/api/data.js'
-import { logoutUrl } from '@/api/user.js'
+import { logoutUrl } from '@/apiConfig/requestIP.js'
 
 export default {
   components: {