From 822bc67061448c6e3a1eb77d39be4ad2b84b416a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 27 二月 2020 09:36:34 +0800
Subject: [PATCH] 2020-02-27
---
src/api/index.js | 29 +++++++++++++++++------------
1 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/src/api/index.js b/src/api/index.js
index 87326a2..f029f03 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -126,26 +126,22 @@
param.LoginUID = sessionStorage.getItem('LoginUID') || ''
param.appkey = window.GLOB.appkey || ''
- let _rduri = ''
if (sessionStorage.getItem('isEditState') === 'true' && options.cloudServiceApi) { // 缂栬緫鐘舵�侊紝涓斿瓨鍦ㄤ簯绔湴鍧�
- _rduri = 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) {
- _rduri = window.GLOB.mainSystemApi
+ param.rduri = window.GLOB.mainSystemApi
}
param.nonc = Utils.getuuid()
let keys = Object.keys(param).sort()
+ keys = keys.filter(key => key !== 'rduri')
let values = keys.map(key => key + param[key]).join('')
param.sign = md5(values)
param.t = new Date().getTime()
-
- if (_rduri) {
- param.rduri = _rduri
- }
return axios({
url: '/webapi/dostars',
@@ -182,13 +178,20 @@
* @param {Boolean} SSO 鏄惁涓哄崟鐐圭櫥褰曞湴鍧�
*/
getSystemCacheConfig (param, SSO = true) {
- param.userid = sessionStorage.getItem('UserID')
+ param.userid = sessionStorage.getItem('UserID') || ''
param.lang = localStorage.getItem('lang') || ''
param.SessionUid = sessionStorage.getItem('SessionUid') || ''
param.LoginUID = sessionStorage.getItem('LoginUID') || ''
param.appkey = window.GLOB.appkey || ''
- if (window.GLOB.mainSystemApi && SSO) {
+ if (sessionStorage.getItem('isEditState') === 'true' && SSO) { // 缂栬緫鐘舵�侊紝鍗曠偣鐧诲綍鏈嶅姟鍣ㄤ负浜戠
+ 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) {
param.rduri = window.GLOB.mainSystemApi
}
@@ -231,9 +234,11 @@
param.SessionUid = sessionStorage.getItem('SessionUid') || ''
param.LoginUID = sessionStorage.getItem('LoginUID') || ''
- // if (param.func === 'RolesAdd') { // 瑙掕壊娣诲姞鏃讹紝浼燼ppkey(澶栭儴鎺ュ彛缁熶竴娣诲姞)
- // param.appkey = window.GLOB.appkey || ''
- // }
+ if (sessionStorage.getItem('isEditState') === 'true' && param.rduri === options.cloudServiceApi) { // HS涓嬭彍鍗�
+ param.userid = sessionStorage.getItem('CloudUserID')
+ param.SessionUid = sessionStorage.getItem('CloudSessionUid') || ''
+ param.LoginUID = sessionStorage.getItem('CloudLoginUID') || ''
+ }
param.nonc = Utils.getuuid()
--
Gitblit v1.8.0