From 8d66ff34fae5b048a6b7923cc75d34f13a08be9d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 02 八月 2022 11:42:43 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/index.js | 106 ++++++++++++++++++++++++++++++++++------------------
1 files changed, 69 insertions(+), 37 deletions(-)
diff --git a/src/index.js b/src/index.js
index cee8479..215706f 100644
--- a/src/index.js
+++ b/src/index.js
@@ -2,6 +2,7 @@
import ReactDOM from 'react-dom'
import Route from './router'
import { Provider } from 'react-redux'
+import md5 from 'md5'
import store from '@/store'
import * as serviceWorker from './serviceWorker'
import options, { styles } from '@/store/options.js'
@@ -34,7 +35,7 @@
})())
}
-const render = Component => {
+const render = Component => {
ReactDOM.render(
<Provider store={store}>
<Component/>
@@ -43,15 +44,7 @@
)
}
-if (sessionStorage.getItem('loginError')) {
- try {
- let res = JSON.parse(sessionStorage.getItem('loginError'))
- console.info(res.request)
- console.info(res.response)
- } catch (e) {}
-}
sessionStorage.removeItem('isEditState')
-sessionStorage.removeItem('loginError')
sessionStorage.setItem('role_id', sessionStorage.getItem('localRole_id') || '')
sessionStorage.setItem('dataM', sessionStorage.getItem('localDataM') || '')
@@ -77,6 +70,12 @@
GLOB.lineColor = config.lineColor || ''
GLOB.licenseKey = config.licenseKey || ''
GLOB.probation = false
+ GLOB.watermark = config.watermark !== false
+ GLOB.keepKey = config.keepPassword !== 'false'
+ GLOB.WXAppID = config.WXAppID || ''
+ GLOB.WXminiAppID = config.WXminiAppID || ''
+ GLOB.accessToken = {}
+ GLOB.mkHS = false
if (config.externalDatabase !== false && config.externalDatabase !== 'false' && config.externalDatabase !== undefined) {
GLOB.externalDatabase = config.externalDatabase ? `[${config.externalDatabase}]..` : ''
@@ -90,44 +89,54 @@
if (config.probation && /^20\d{2}-\d{2}-\d{2}$/.test(config.probation) && new Date(config.probation).getTime() > new Date().getTime()) {
GLOB.probation = true
}
+
+ if (!config.mainSystemApi) {
+ document.getElementById('root').innerHTML = '<div style="text-align: center; font-size: 30px; margin-top: 40vh;">绯荤粺鏈缃崟鐐瑰湴鍧�锛岃鑱旂郴绠＄悊鍛橈紒</div>'
+ return
+ } else if (/http(s?):\/\/sso.mk9h.cn\/cloud/ig.test(config.mainSystemApi)) {
+ document.getElementById('root').innerHTML = '<div style="text-align: center; font-size: 30px; margin-top: 40vh;">姝ｅ紡绯荤粺涓嶅彲浣跨敤 http://sso.mk9h.cn/cloud 鍋氫负鍗曠偣鍦板潃锛岃鑱旂郴绠＄悊鍛橈紒</div>'
+ return
+ } else if (/http(s?):\/\/cloud.mk9h.cn/ig.test(config.mainSystemApi)) {
+ document.getElementById('root').innerHTML = '<div style="text-align: center; font-size: 30px; margin-top: 40vh;">姝ｅ紡绯荤粺涓嶅彲浣跨敤 http://cloud.mk9h.cn 鍋氫负鍗曠偣鍦板潃锛岃鑱旂郴绠＄悊鍛橈紒</div>'
+ return
+ }
} else if (options.sysType === 'local') {
GLOB.probation = true
GLOB.systemType = ''
+
+ // GLOB.mainSystemApi = 'https://cloud.positecgroup.com/webapi/dostars'
+
+ GLOB.mainSystemApi = 'https://sso.mk9h.cn/cloud/webapi/dostars'
+
+ if (GLOB.watermark) {
+ GLOB.dataFormat = true
+ }
} else {
GLOB.systemType = ''
+ GLOB.mainSystemApi = ''
+ }
+
+ GLOB.debugger = options.sysType === 'local' && GLOB.systemType !== 'production'
+
+ if (options.sysType !== 'cloud') {
+ if (config.appkey === options.cakey) {
+ document.getElementById('root').innerHTML = '<div style="text-align: center; font-size: 30px; margin-top: 40vh;">涓嶅彲浣跨敤浜戠appkey锛岃鑱旂郴绠＄悊鍛橈紒</div>'
+ return
+ }
}
if (options.sysType === 'cloud') { // cloud涓嶅彲璁剧疆鍗曠偣鏈嶅姟鍣ㄥ湴鍧�,浜戠appkey涓虹郴缁熻缃�
GLOB.appkey = options.cakey
- GLOB.mainSystemApi = ''
} else if (options.sysType === 'SSO') { // sso涓嶅彲璁剧疆鍗曠偣鏈嶅姟鍣ㄥ湴鍧�
- GLOB.mainSystemApi = ''
- if (config.appkey === options.cakey) {
- GLOB.appkey = ''
- console.warn('鍗曠偣绯荤粺appkey涓嶅彲涓庝簯绔浉鍚�')
- } else {
- GLOB.appkey = config.appkey
- }
+ GLOB.appkey = config.appkey
} else if (options.sysType === 'local') { // 涓氬姟绯荤粺
- if (config.appkey === options.cakey) {
- GLOB.appkey = ''
- console.warn('涓氬姟绯荤粺appkey涓嶅彲涓庝簯绔浉鍚�')
- } else {
- GLOB.appkey = config.appkey
- }
- if (config.mainSystemApi) {
+ GLOB.appkey = config.appkey
+ if (GLOB.systemType === 'production') {
let systemApi = config.mainSystemApi
- // 涓氬姟绯荤粺涓嶅厑璁歌繛鎺ヤ簯绔紝涓氬姟绯荤粺杩炴帴sso.mk9h.cn鏃讹紝鏁版嵁铏氬寲澶勭悊
- if (systemApi.indexOf('cloud.mk9h.cn') > -1) {
- systemApi = ''
- } else if (/index.html/ig.test(systemApi)) {
+ if (/index.html/ig.test(systemApi)) {
systemApi = systemApi.replace(/index.html.*/ig, 'webapi/dostars')
} else if (!/webapi\/dostars$/ig.test(systemApi)) {
systemApi = systemApi.replace(/\/?$/, '/webapi/dostars')
- }
-
- if (systemApi.indexOf('sso.mk9h.cn') > -1 && process.env.NODE_ENV === 'production') {
- GLOB.dataFormat = true
}
GLOB.mainSystemApi = systemApi
@@ -172,9 +181,16 @@
}
}
+ if (/^https/.test(window.location.protocol)) { // https杞崲
+ let meta = document.createElement('meta')
+ meta.content = 'upgrade-insecure-requests'
+ meta.httpEquiv = 'Content-Security-Policy'
+ document.getElementsByTagName('head')[0].appendChild(meta)
+ }
+
document.title = GLOB.platTitle || ''
- if (config.filter === 'true') {
+ if (config.filter === 'true' || (/^20\d{2}-\d{2}-\d{2}$/.test(config.filter) && new Date(config.filter).getTime() + 86400000 >= new Date().getTime())) {
let html = document.getElementsByTagName('html')[0]
if (html) {
@@ -189,10 +205,12 @@
GLOB.linkurl = GLOB.linkurl + 'index.html'
}
GLOB.service = _service ? _service + '/' : ''
+ GLOB.host = window.location.host + (_service ? '_' + _service : '')
} else {
GLOB.linkurl = ''
GLOB.location = config.host
GLOB.service = config.service
+ GLOB.host = config.host.replace(/http(s)?:\/\//ig, '') + (config.service ? '_' + config.service.replace(/\//ig, '') : '')
}
let mark = sessionStorage.getItem('system_mark')
@@ -208,6 +226,20 @@
sessionStorage.setItem('lang', config.defaultLang !== 'en-US' ? 'zh-CN' : 'en-US')
}
+ let _level = 10
+ let _Mlevel = sessionStorage.getItem('Member_Level')
+
+ if (_Mlevel) {
+ if (_Mlevel === md5('mksoft' + GLOB.appkey + new Date().getFullYear() + new Date().getMonth() + 10)) {
+ _level = 10
+ } else if (_Mlevel === md5('mksoft' + GLOB.appkey + new Date().getFullYear() + new Date().getMonth() + 20)) {
+ _level = 20
+ } else if (_Mlevel === md5('mksoft' + GLOB.appkey + new Date().getFullYear() + new Date().getMonth() + 30)) {
+ _level = 30
+ }
+ }
+ GLOB.memberLevel = _level
+
Object.defineProperty(GLOB, 'appId', {
writable: false,
value: GLOB.appId
@@ -220,6 +252,10 @@
writable: false,
value: GLOB.systemType
})
+ Object.defineProperty(GLOB, 'debugger', {
+ writable: false,
+ value: GLOB.debugger
+ })
Object.defineProperty(GLOB, 'mainSystemApi', {
writable: false,
value: GLOB.mainSystemApi
@@ -227,10 +263,6 @@
Object.defineProperty(GLOB, 'linkurl', {
writable: false,
value: GLOB.linkurl
- })
- Object.defineProperty(GLOB, 'dataFormat', {
- writable: false,
- value: GLOB.dataFormat
})
Object.defineProperty(window, 'GLOB', {
writable: false,
--
Gitblit v1.8.0