dedsudiyu 1 month ago
parent
commit
5cf54c83c4
2 changed files with 20 additions and 72 deletions
  1. 18 61
      src/utils/requestYiLi.js
  2. 2 11
      src/views/login.vue

+ 18 - 61
src/utils/requestYiLi.js

@@ -38,14 +38,16 @@ service.interceptors.request.use(config => {
   loadingInstance = Loading.service(options)
   // 是否需要设置 token
   const isToken = (config.headers || {}).isToken === false
-  if(config.url == '/oauth/token?grant_type=client_credentials'){
-    config.headers['Authorization'] = 'Basic '+encoded
-  }else{
-    if (getTokenYiLi() && !isToken) {
-      config.headers['Authorization'] = 'Bearer '+getTokenYiLi()
-    }
-  }
-  config.credentials= 'omit';
+  // if(config.url == '/oauth/token?grant_type=client_credentials'){
+  //   config.headers['Authorization'] = 'Basic '+encoded
+  // }else{
+  //   if (getTokenYiLi() && !isToken) {
+  //     config.headers['Authorization'] = 'Bearer '+getTokenYiLi()
+  //   }
+  // }
+  // config.credentials= 'omit';
+  config.headers['appId'] = '1963877190961897474';
+  config.headers['secret'] = 'fd89c504f4c244dab891acf6fbd172c2';
   // get请求映射params参数
   if (config.method === 'get' && config.params) {
     let url = config.url + '?' + tansParams(config.params);
@@ -88,27 +90,6 @@ service.interceptors.response.use(res => {
         },1000);
       }
       return res.data
-    }else if(code == 5002){
-      // autoLoginYiLi();
-      if(getTokenYiLi()){
-        removeTokenYiLi();
-        MessageBox.confirm('登录状态已过期,请重新登录', '系统提示', {
-            confirmButtonText: '确定',
-            showCancelButton:false,
-            closeOnClickModal:false,
-            cancelButtonText: '取消',
-            type: 'warning'
-          }
-        ).then(() => {
-          router.replace({
-            path: '/'
-          })
-        }).catch(() => {});
-      }else{
-        router.replace({
-          path: '/'
-        })
-      }
     }else if(code != 200) {
       if(!messageData){
         messageData = Message({
@@ -139,38 +120,14 @@ service.interceptors.response.use(res => {
       message = "系统接口请求超时";
     }
     else if (message.includes("Request failed with status code")) {
-      // console.log('message',message)
-      if(message.substr(message.length - 3) == 401){
-        if(getTokenYiLi()){
-          removeTokenYiLi();
-          MessageBox.confirm('登录状态已过期,请重新登录', '系统提示', {
-              confirmButtonText: '确定',
-              showCancelButton:false,
-              closeOnClickModal:false,
-              cancelButtonText: '取消',
-              type: 'warning'
-            }
-          ).then(() => {
-            router.replace({
-              path: '/'
-            })
-          }).catch(() => {});
-        }else{
-          router.replace({
-            path: '/'
-          })
-        }
-        // autoLoginYiLi();
-      }else{
-        messageData = Message({
-          message: message,
-          type: 'error',
-          offset:100
-        })
-        setTimeout(function(){
-          messageData = null
-        },1000);
-      }
+      messageData = Message({
+        message: message,
+        type: 'error',
+        offset:100
+      })
+      setTimeout(function(){
+        messageData = null
+      },1000);
       return Promise.reject(error)
     }
     if(!messageData){

+ 2 - 11
src/views/login.vue

@@ -49,10 +49,9 @@
 <script>
   import md5 from 'js-md5';
   import Cookies from "js-cookie";
-  import { loginYiLi } from "@/api/yiLi";
   import { login,authInfo,getCodeImg,getConfigByType,configInfo} from "@/api/login";
   import {Decrypt} from "@/utils/secret";
-  import { setToken,getToken,removeToken,setTokenYiLi,deleteCookie } from '@/utils/auth'
+  import { setToken } from '@/utils/auth'
   export default {
     name: "Login",
     data() {
@@ -110,8 +109,7 @@
       this.getCode();
     },
     mounted(){
-      deleteCookie('JSESSIONID');
-      deleteCookie('rememberMe');
+
     },
     methods: {
       //获取开发配置
@@ -206,7 +204,6 @@
             }else{
               setToken(res.data.token)
               Promise.all([
-                this.getTokenYiLi(),
                 this.getExploitConfig(),
                 this.fullScreen(),
               ]).then((result)=>{
@@ -226,12 +223,6 @@
           }
         });
       },
-      //获取YiLi-token
-      getTokenYiLi() {
-        loginYiLi().then(res => {
-          setTokenYiLi(res.access_token)
-        })
-      },
       //全屏
       fullScreen() {
         var element = document.documentElement;