From 98ad33fac8e0a0f7c3cfbc78c333792a2cfa428f Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期二, 21 七月 2020 18:46:22 +0800 Subject: [PATCH] 2020-07-21 --- src/api/index.js | 27 ++++++++++----------------- 1 files changed, 10 insertions(+), 17 deletions(-) diff --git a/src/api/index.js b/src/api/index.js index 0eac63a..48e0840 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -1,6 +1,6 @@ import axios from 'axios' import qs from 'qs' -import {notification } from 'antd' +import { notification } from 'antd' import md5 from 'md5' import Utils from '@/utils/utils.js' import options from '@/store/options.js' @@ -110,20 +110,18 @@ getCloudConfig (param) { param.lang = localStorage.getItem('lang') || '' param.appkey = window.GLOB.appkey || '' + param.SessionUid = localStorage.getItem('SessionUid') || '' if (sessionStorage.getItem('CloudUserID') && options.cloudServiceApi) { // 瀛樺湪浜戠鐧诲綍淇℃伅锛屼笖瀛樺湪浜戠鍦板潃 param.rduri = options.cloudServiceApi param.userid = sessionStorage.getItem('CloudUserID') - param.SessionUid = sessionStorage.getItem('CloudSessionUid') || '' param.LoginUID = sessionStorage.getItem('CloudLoginUID') || '' } else if (window.GLOB.mainSystemApi) { param.rduri = window.GLOB.mainSystemApi param.userid = sessionStorage.getItem('UserID') - param.SessionUid = sessionStorage.getItem('SessionUid') || '' param.LoginUID = sessionStorage.getItem('LoginUID') || '' } else { param.userid = sessionStorage.getItem('UserID') - param.SessionUid = sessionStorage.getItem('SessionUid') || '' param.LoginUID = sessionStorage.getItem('LoginUID') || '' } @@ -154,14 +152,13 @@ getSystemConfig (param) { param.userid = sessionStorage.getItem('UserID') param.lang = localStorage.getItem('lang') || '' - param.SessionUid = sessionStorage.getItem('SessionUid') || '' + param.SessionUid = localStorage.getItem('SessionUid') || '' param.LoginUID = sessionStorage.getItem('LoginUID') || '' param.appkey = window.GLOB.appkey || '' if (sessionStorage.getItem('isEditState') === 'true' && options.cloudServiceApi) { // 缂栬緫鐘舵�侊紝涓斿瓨鍦ㄤ簯绔湴鍧� param.rduri = options.cloudServiceApi param.userid = sessionStorage.getItem('CloudUserID') - param.SessionUid = sessionStorage.getItem('CloudSessionUid') || '' param.LoginUID = sessionStorage.getItem('CloudLoginUID') || '' } else if (window.GLOB.mainSystemApi) { param.rduri = window.GLOB.mainSystemApi @@ -194,7 +191,7 @@ getLocalConfig (param) { param.userid = sessionStorage.getItem('UserID') param.lang = localStorage.getItem('lang') || '' - param.SessionUid = sessionStorage.getItem('SessionUid') || '' + param.SessionUid = localStorage.getItem('SessionUid') || '' param.LoginUID = sessionStorage.getItem('LoginUID') || '' param.appkey = window.GLOB.appkey || '' @@ -227,7 +224,7 @@ getSystemCacheConfig (param, SSO = true) { param.userid = sessionStorage.getItem('UserID') || '' param.lang = localStorage.getItem('lang') || '' - param.SessionUid = sessionStorage.getItem('SessionUid') || '' + param.SessionUid = localStorage.getItem('SessionUid') || '' param.LoginUID = sessionStorage.getItem('LoginUID') || '' param.appkey = window.GLOB.appkey || '' @@ -235,7 +232,6 @@ if (options.cloudServiceApi) { // 瀛樺湪浜戠鍦板潃鏃讹紝浣跨敤浜戠绯荤粺鍙傛暟 param.rduri = options.cloudServiceApi param.userid = sessionStorage.getItem('CloudUserID') || '' - param.SessionUid = sessionStorage.getItem('CloudSessionUid') || '' param.LoginUID = sessionStorage.getItem('CloudLoginUID') || '' } } else if (window.GLOB.mainSystemApi && SSO) { @@ -286,13 +282,12 @@ genericInterface (param) { param.userid = sessionStorage.getItem('UserID') param.lang = localStorage.getItem('lang') || '' - param.SessionUid = sessionStorage.getItem('SessionUid') || '' + param.SessionUid = localStorage.getItem('SessionUid') || '' param.LoginUID = sessionStorage.getItem('LoginUID') || '' param.appkey = window.GLOB.appkey || '' if (sessionStorage.getItem('isEditState') === 'true') { // HS涓嬭彍鍗� param.userid = sessionStorage.getItem('CloudUserID') - param.SessionUid = sessionStorage.getItem('CloudSessionUid') || '' param.LoginUID = sessionStorage.getItem('CloudLoginUID') || '' } @@ -323,7 +318,7 @@ getExcelOut (param, name) { param.userid = sessionStorage.getItem('UserID') param.lang = localStorage.getItem('lang') || '' - param.SessionUid = sessionStorage.getItem('SessionUid') || '' + param.SessionUid = localStorage.getItem('SessionUid') || '' param.LoginUID = sessionStorage.getItem('LoginUID') || '' param.appkey = window.GLOB.appkey || '' @@ -380,20 +375,18 @@ appkey: window.GLOB.appkey || '', Base64Img: base64 } + param.SessionUid = localStorage.getItem('SessionUid') || '' if (service === 'sso' && window.GLOB.mainSystemApi) { param.rduri = window.GLOB.mainSystemApi param.userid = sessionStorage.getItem('UserID') - param.SessionUid = sessionStorage.getItem('SessionUid') || '' param.LoginUID = sessionStorage.getItem('LoginUID') || '' } else if (service === 'cloud' && options.cloudServiceApi) { param.rduri = options.cloudServiceApi param.userid = sessionStorage.getItem('CloudUserID') - param.SessionUid = sessionStorage.getItem('CloudSessionUid') || '' param.LoginUID = sessionStorage.getItem('CloudLoginUID') || '' } else { param.userid = sessionStorage.getItem('UserID') - param.SessionUid = sessionStorage.getItem('SessionUid') || '' param.LoginUID = sessionStorage.getItem('LoginUID') || '' } @@ -474,7 +467,7 @@ commonInterface (param) { param.userid = sessionStorage.getItem('UserID') param.lang = localStorage.getItem('lang') || '' - param.SessionUid = sessionStorage.getItem('SessionUid') || '' + param.SessionUid = localStorage.getItem('SessionUid') || '' param.LoginUID = sessionStorage.getItem('LoginUID') || '' param.BID = param.BID || '' param.debug = param.debug || '' @@ -492,7 +485,7 @@ submitInterface (param) { param.userid = sessionStorage.getItem('UserID') param.lang = localStorage.getItem('lang') || '' - param.SessionUid = sessionStorage.getItem('SessionUid') || '' + param.SessionUid = localStorage.getItem('SessionUid') || '' param.LoginUID = sessionStorage.getItem('LoginUID') || '' return axios({ -- Gitblit v1.8.0