From 08cce3334a2dc81d690b518136b0aaea64e48b0b Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 14 六月 2023 09:55:50 +0800
Subject: [PATCH] 2023-06-14
---
src/index.js | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/index.js b/src/index.js
index f7ee9b8..761e47e 100644
--- a/src/index.js
+++ b/src/index.js
@@ -57,7 +57,6 @@
sessionStorage.setItem('departmentcode', localStorage.getItem('departmentcode') || '')
sessionStorage.setItem('organization', localStorage.getItem('organization') || '')
sessionStorage.setItem('mk_user_type', localStorage.getItem('mk_user_type') || '')
-sessionStorage.setItem('localRole_id', localStorage.getItem('localRole_id') || '')
sessionStorage.setItem('lang', 'zh-CN')
if (sessionStorage.getItem('loginError')) {
@@ -68,8 +67,6 @@
} catch (e) {}
}
sessionStorage.removeItem('isEditState')
-sessionStorage.setItem('role_id', sessionStorage.getItem('localRole_id') || '')
-sessionStorage.setItem('dataM', sessionStorage.getItem('localDataM') || '')
// 鏂扮郴缁熸枃浠剁疆浜巃dmin涓� ../options.json , { cache: 'no-cache'}
@@ -99,6 +96,7 @@
GLOB.nginx = config.nginx + '' === 'true'
GLOB.WXAppID = config.WXAppID || ''
GLOB.WXminiAppID = config.WXminiAppID || ''
+ GLOB.WXNotice = config.WXNotice + '' === 'true'
GLOB.accessToken = {}
GLOB.mkHS = false
@@ -161,6 +159,7 @@
if (options.sysType === 'cloud') { // cloud涓嶅彲璁剧疆鍗曠偣鏈嶅姟鍣ㄥ湴鍧�,浜戠appkey涓虹郴缁熻缃�
GLOB.appkey = options.cakey
+ GLOB.WXNotice = false
} else if (options.sysType === 'SSO') { // sso涓嶅彲璁剧疆鍗曠偣鏈嶅姟鍣ㄥ湴鍧�
GLOB.appkey = config.appkey
} else if (options.sysType === 'local') { // 涓氬姟绯荤粺
@@ -172,6 +171,10 @@
} else if (!/webapi\/dostars$/ig.test(systemApi)) {
systemApi = systemApi.replace(/\/?$/, '/webapi/dostars')
}
+
+ if (/^https/.test(window.location.protocol) && /^http:/.test(systemApi) && !GLOB.transfer) {
+ systemApi = systemApi.replace(/^http:/, 'https:')
+ }
GLOB.mainSystemApi = systemApi
}
--
Gitblit v1.8.0