From f1a4a2e83a5a3a3f8636c0d85a3a02471c5b07e7 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期三, 05 三月 2025 15:39:52 +0800 Subject: [PATCH] Merge branch 'positec' into dms --- src/index.js | 32 +++++++++++++++++++++++--------- 1 files changed, 23 insertions(+), 9 deletions(-) diff --git a/src/index.js b/src/index.js index f91f8c0..c9d0634 100644 --- a/src/index.js +++ b/src/index.js @@ -31,6 +31,19 @@ } +sessionStorage.setItem('UserID', localStorage.getItem('UserID') || '') +sessionStorage.setItem('LoginUID', localStorage.getItem('LoginUID') || '') +sessionStorage.setItem('User_Name', localStorage.getItem('User_Name') || '') +sessionStorage.setItem('Full_Name', localStorage.getItem('Full_Name') || '') +sessionStorage.setItem('avatar', localStorage.getItem('avatar') || '') +sessionStorage.setItem('dataM', localStorage.getItem('dataM') || '') +sessionStorage.setItem('localDataM', localStorage.getItem('localDataM') || '') +sessionStorage.setItem('debug', localStorage.getItem('debug') || '') +sessionStorage.setItem('role_id', localStorage.getItem('role_id') || '') +sessionStorage.setItem('departmentcode', localStorage.getItem('departmentcode') || '') +sessionStorage.setItem('organization', localStorage.getItem('organization') || '') +sessionStorage.setItem('mk_user_type', localStorage.getItem('mk_user_type') || '') + fetch('../options.json') .then(response => response.json()) .catch(() => { @@ -118,20 +131,20 @@ GLOB.systemType = 'production' } else if (GLOB.sysType === 'local') { GLOB.probation = true - GLOB.debugger = true + // GLOB.debugger = true GLOB.systemType = '' GLOB.upStatus = config.updateStatus + '' !== 'false' + + GLOB.mainSystemApi = 'https://cloud.positecgroup.com/webapi/dostars' if (config.style_appkey) { GLOB.style_appkey = config.style_appkey } - - // GLOB.mainSystemApi = 'https://cloud.positecgroup.com/webapi/dostars' - - GLOB.mainSystemApi = 'https://sso.mk9h.cn/cloud/webapi/dostars' - if (!/^https/.test(window.location.protocol)) { // https杞崲 - GLOB.mainSystemApi = 'http://sso.mk9h.cn/cloud/webapi/dostars' - } + + // GLOB.mainSystemApi = 'https://sso.mk9h.cn/cloud/webapi/dostars' + // if (!/^https/.test(window.location.protocol)) { // https杞崲 + // GLOB.mainSystemApi = 'http://sso.mk9h.cn/cloud/webapi/dostars' + // } if (GLOB.watermark) { GLOB.dataFormat = true @@ -199,6 +212,7 @@ GLOB.host = window.location.host + (_service ? '_' + _service : '') GLOB.baseurl = document.location.origin + '/' + GLOB.service GLOB.linkurl = GLOB.baseurl + 'index.html' + GLOB.location = document.location.origin } else { GLOB.location = config.host GLOB.service = config.service @@ -275,7 +289,7 @@ document.body.className = className - if (/^https/.test(window.location.protocol)) { // https杞崲 + if (/^https/.test(window.location.protocol) || (process.env.NODE_ENV !== 'production' && /^https/.test(config.host))) { // https杞崲 let meta = document.createElement('meta') meta.content = 'upgrade-insecure-requests' meta.httpEquiv = 'Content-Security-Policy' -- Gitblit v1.8.0