浏览代码

Merge branch 'master' of git.sagacloud.cn:web/ibms

zhangyu 6 年之前
父节点
当前提交
35af3a3fc9
共有 5 个文件被更改,包括 11 次插入5 次删除
  1. 2 2
      config/index.js
  2. 1 0
      config/prod.env.js
  3. 6 2
      src/api/framework.js
  4. 1 1
      src/api/system/admin.js
  5. 1 0
      src/framework/layout/PageHeader.vue

+ 2 - 2
config/index.js

@@ -11,11 +11,11 @@ module.exports = {
         assetsPublicPath: '/',
         proxyTable: {
             '/admin': {
-                target: 'http://172.16.0.235:8080/ibms',
+                target: 'http://172.16.0.235:8080',
                 changeOrigin: true,
                 pathRewrite: {
                     // "^/apis": ""
-                    "^/admin": ""
+                    "^/admin": "/"
                 }
             },
             '/data-platform-3': {

+ 1 - 0
config/prod.env.js

@@ -2,4 +2,5 @@
 module.exports = {
     NODE_ENV: '"production"',
     BASE_URL: '"http://172.16.0.239"', //线上iframe地址
+    SSO_SERVER: '"http://192.168.20.101:8004"'
 }

+ 6 - 2
src/api/framework.js

@@ -95,12 +95,16 @@ export default {
 
     loadUserInfo() {
         // return new Promise((resolve, reject) => resolve({ result: 'success', ...userInfo }))
-        return httputils.getJson(`/admin/user/userInfo`)
+        return httputils.getJson(`/admin/ibms/user/userInfo`)
     },
 
     toLogout() {
         // TODO
-        router.push('/login')
+        router.push('/auth')
+        store.commit('setSsoToken', null)
+        let ssoServer = process.env.SSO_SERVER
+        let redirectUrl = window.location.protocol + '//' + window.location.host + '/'
+        window.location.href = `${ssoServer}/logout?redirectUrl=${redirectUrl}`
     },
 
     toLoginPage: toLogin

+ 1 - 1
src/api/system/admin.js

@@ -1,6 +1,6 @@
 import httputils from '@/utils/httputils'
 export default {
     loadUserInfo() {
-        return httputils.getJson('/ibms/user/userInfo')
+        return httputils.getJson('/admin/ibms/user/userInfo')
     }
 }

+ 1 - 0
src/framework/layout/PageHeader.vue

@@ -57,6 +57,7 @@ export default {
         userMenuCommand(cmd) {
             // console.log('userMenuCommand ', cmd)
             if (cmd == 'logout') {
+                console.log("点击登出l")
                 frameworkApi.toLogout()
             }
         },