From 365ea069f179ee71a7a8cc7785ccd2d86bd4881c Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 03 二月 2021 18:33:45 +0800
Subject: [PATCH] 2021-02-03

---
 src/api/index.js |  114 +++++++++++++++++++--------------------------------------
 1 files changed, 38 insertions(+), 76 deletions(-)

diff --git a/src/api/index.js b/src/api/index.js
index 250e277..6b43e5e 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -46,7 +46,6 @@
   } else if (config.url.includes('Upload') || config.url.includes('doupload') || config.url.includes('dopreload')) {
     config.headers = { 'Content-Type': 'multipart/form-data' }
   } else if (config.method === 'post') {
-    // config.headers.token = sessionStorage.getItem('TOKEN') || ''
     config.data = JSON.stringify(config.data)
   }
 
@@ -90,7 +89,7 @@
       duration: 15
     })
   }
-  return Promise.reject(error)
+  return Promise.reject(error.response)
 })
 
 class Api {
@@ -120,13 +119,25 @@
    * @description 鐩存帴璇锋眰
    * @param {Object} param 鏌ヨ鍙婃彁浜ゅ弬鏁�
    */
-  directRequest (url, method, param) {
+  directRequest (url, method = 'post', param) {
+    let params = { method: 'post' }
+    let _url = url
 
-    return axios({
-      url: url,
-      method: method,
-      params: param
-    })
+    if (method === 'get' && param) {
+      let keys = Object.keys(param).map(key => `${key}=${param[key]}`)
+      keys = keys.join('&')
+      if (keys) {
+        _url = _url + '?' + keys
+      }
+    } else if (method === 'post' && param) {
+      params.data = param
+    }
+
+    _url = _url.replace(/&/ig, '%26')
+    // _url = window.btoa(_url)
+    params.url = '/trans/redirect?rd=' + _url + '&method=' + method
+
+    return axios(params)
   }
 
   /**
@@ -749,8 +760,8 @@
     param.LoginUID = sessionStorage.getItem('LoginUID') || ''
     param.appkey = window.GLOB.appkey || ''
 
-    if (sessionStorage.getItem('isEditState') === 'true') { // HS涓嬭彍鍗�
-      param.userid = sessionStorage.getItem('CloudUserID')
+    if (options.cloudServiceApi && param.rduri === options.cloudServiceApi) { // HS涓嬭彍鍗�
+      param.userid = sessionStorage.getItem('CloudUserID') || ''
       param.LoginUID = sessionStorage.getItem('CloudLoginUID') || ''
     }
 
@@ -819,28 +830,15 @@
    * @description 涓婁紶base64
    * @param {String} base64 base64鍥剧墖缂栫爜
    */
-  fileuploadbase64 (base64, service = 'local') {
-    let param = {
-      func: '',
-      BasePath: 'Content/Upload',
-      lang: localStorage.getItem('lang') || '',
-      appkey: window.GLOB.appkey || '',
-      Base64Img: base64
-    }
+  fileuploadbase64 (param) {
+    param.func = ''
+    param.BasePath = 'Content/Upload'
+    param.lang = localStorage.getItem('lang') || ''
+    param.appkey = window.GLOB.appkey || ''
     param.SessionUid = localStorage.getItem('SessionUid') || ''
 
-    if (service === 'sso' && window.GLOB.mainSystemApi) {
-      param.rduri = window.GLOB.mainSystemApi
-      param.userid = sessionStorage.getItem('UserID')
-      param.LoginUID = sessionStorage.getItem('LoginUID') || ''
-    } else if (service === 'cloud' && options.cloudServiceApi) {
-      param.rduri = options.cloudServiceApi
-      param.userid = sessionStorage.getItem('CloudUserID')
-      param.LoginUID = sessionStorage.getItem('CloudLoginUID') || ''
-    } else {
-      param.userid = sessionStorage.getItem('UserID')
-      param.LoginUID = sessionStorage.getItem('LoginUID') || ''
-    }
+    param.userid = param.userid || sessionStorage.getItem('UserID') || ''
+    param.LoginUID = param.LoginUID || sessionStorage.getItem('LoginUID') || ''
 
     param = this.encryptParam(param)
 
@@ -894,52 +892,16 @@
     })
   }
 
-  /**
-   * @description 鏂囦欢涓婁紶
-   */
-  getFileUpload (param) {
-    return axios({
-      url: '/zh-CN/Home/Upload',
-      method: 'post',
-      data: param
-    })
-  }
-
-  /**
-   * @description 閫氱敤鎺ュ彛(鏁版嵁绠＄悊)
-   * @param {Object} param 鏌ヨ鍙婃彁浜ゅ弬鏁�
-   */
-  commonInterface (param) {
-    param.userid = sessionStorage.getItem('UserID')
-    param.lang = localStorage.getItem('lang') || ''
-    param.SessionUid = localStorage.getItem('SessionUid') || ''
-    param.LoginUID = sessionStorage.getItem('LoginUID') || ''
-    param.BID = param.BID || ''
-    param.debug = param.debug || ''
-    
-    return axios({
-      url: '/webapi/dostar',
-      method: 'post',
-      data: param
-    })
-  }
-
-  /**
-   * @description 閫氱敤鎺ュ彛(鎻愪氦)(鏁版嵁绠＄悊)
-   * @param {Object} param 鏌ヨ鍙婃彁浜ゅ弬鏁�
-   */
-  submitInterface (param) {
-    param.userid = sessionStorage.getItem('UserID')
-    param.lang = localStorage.getItem('lang') || ''
-    param.SessionUid = localStorage.getItem('SessionUid') || ''
-    param.LoginUID = sessionStorage.getItem('LoginUID') || ''
-
-    return axios({
-      url: '/webapi/dostar',
-      method: 'post',
-      data: param
-    })
-  }
+  // /**
+  //  * @description 鏂囦欢涓婁紶
+  //  */
+  // getFileUpload (param) {
+  //   return axios({
+  //     url: '/zh-CN/Home/Upload',
+  //     method: 'post',
+  //     data: param
+  //   })
+  // }
 }
 
 export default new Api()
\ No newline at end of file

--
Gitblit v1.8.0