dedsudiyu 1 月之前
父节点
当前提交
94057e2a4e
共有 2 个文件被更改,包括 20 次插入34 次删除
  1. 18 24
      src/utils/requestYiLi.js
  2. 2 10
      src/views/home.vue

+ 18 - 24
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,8 +90,6 @@ service.interceptors.response.use(res => {
         },1000);
       }
       return res.data
-    }else if(code == 5002){
-      autoLoginYiLi();
     }else if(code != 200) {
       if(!messageData){
         messageData = Message({
@@ -120,20 +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){
-        console.log('message',message)
-        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 - 10
src/views/home.vue

@@ -20,9 +20,8 @@
 </template>
 <script>
   import { login } from '@/api/login'
-  import { loginYiLi } from '@/api/yiLi'
   import { getConfigByType } from '@/api/index'
-  import { setToken, setTokenYiLi } from '@/utils/auth'
+  import { setToken } from '@/utils/auth'
   import { Encrypt, Decrypt } from '@/utils/secret'
   //首页组件
   import headComponent from './components/headComponent.vue'
@@ -67,8 +66,7 @@
       login() {
         let self = this
         Promise.all([
-          this.getToken(),
-          this.getTokenYiLi()
+          this.getToken()
         ]).then((result) => {
             setTimeout(function() {
               self.getExploitConfig()
@@ -82,12 +80,6 @@
           setToken(res1.data.token)
         })
       },
-      //获取YiLi-token
-      getTokenYiLi() {
-        loginYiLi().then(res2 => {
-          setTokenYiLi(res2.access_token)
-        })
-      },
       //获取开发配置
       getExploitConfig() {
         getConfigByType({ category: 2, configType: 5 }).then(response => {