dedsudiyu 1 年之前
父节点
当前提交
cf8b51cedd
共有 4 个文件被更改,包括 17 次插入10 次删除
  1. 0 1
      src/App.vue
  2. 1 1
      src/api/login.js
  3. 7 5
      src/utils/request.js
  4. 9 3
      src/views/ssoLogin.vue

+ 0 - 1
src/App.vue

@@ -23,7 +23,6 @@
       }
     },
     mounted(){
-      debugger
       this.banZoom();
       //根据当前浏览器宽度与额定尺寸计算transform缩放值
       document.getElementById('app').style.transform = `scale(${document.documentElement.clientWidth / 1920})`;

+ 1 - 1
src/api/login.js

@@ -73,7 +73,7 @@ export function initPage() {
 */
 export function ssoGetLoginUser() {
   return request({
-    url: '/login',
+    url: '/auth/login',
     method: 'get'
   })
 }

+ 7 - 5
src/utils/request.js

@@ -78,12 +78,14 @@ service.interceptors.response.use(res => {
     // 获取错误信息
     const msg = errorCode[code] || res.data.msg || errorCode['default']
     debugger
-    if(res.config.url == '/login'&&res.request.responseURL){
-      window.location.href = res.request.responseURL;
-      return
-    }
+    // if(res.config.url == '/auth/login'&&res.request.responseURL){
+    //   window.location.href = res.request.responseURL;
+    //   // window.location.href = 'https://icas.jnu.edu.cn/cas/login?service=http://localhost:8081/#/login';
+    //   return
+    // }
     if(res.config.url == '/auth/logout'&&res.request.responseURL){
-      window.location.href = res.request.responseURL;
+      // window.location.href = res.request.responseURL;
+      window.location.href = 'http://localhost:8081/login';
       return
     }
     if (code == 401) {

+ 9 - 3
src/views/ssoLogin.vue

@@ -17,7 +17,7 @@
   import Cookies from 'js-cookie'
   import { setToken } from '@/utils/auth'
   import { getLogoInfo, getUrlConfig } from '@/api/system/publicConfig'
-  import { ssoGetLoginUser,initPage,getInfo } from '@/api/login'
+  import { ssoGetLoginUser,logout,initPage,getInfo } from '@/api/login'
 
   export default {
     name: 'Login',
@@ -66,14 +66,14 @@
     },
     created() {
       let url = window.location.href
-      debugger
       if (url.indexOf('token') != -1) {
         console.log('找到了====>')
         setToken(url.split('=')[1])
         this.getInfo();
       } else {
         console.log('没找到---->')
-        this.ssoGetLoginUser()
+        // this.ssoGetLoginUser()
+        this.logout()
       }
       localStorage.setItem('windowHref', window.location.href)
     },
@@ -106,6 +106,12 @@
           // window.open('https://icas.jnu.edu.cn/cas/login?service=http://localhost:8081/sso/getLoginUser','_self')
         })
       },
+      //退出
+      logout() {
+        logout(response => {
+          // window.open('https://icas.jnu.edu.cn/cas/login?service=http://localhost:8081/sso/getLoginUser','_self')
+        })
+      },
       //获取首页配置
       initPage(){
         initPage().then(response => {