From 400fee62fb40006a9839f1c3a8244b82566b5057 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 08 五月 2025 16:30:39 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/index.js | 346 ++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 241 insertions(+), 105 deletions(-)
diff --git a/src/index.js b/src/index.js
index e9c4830..079c949 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,49 +1,35 @@
import React from 'react'
import ReactDOM from 'react-dom'
+import { ConfigProvider } from 'antd'
+import zhCN from 'antd/es/locale/zh_CN'
+
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'
+import options, { styles, langs } from '@/store/options.js'
import '@/assets/css/main.scss'
import '@/assets/css/action.scss'
import '@/assets/css/viewstyle.scss'
-if (window.location.href.indexOf('#/design') > -1) { // 缂栬緫椤甸潰鍒锋柊鏃讹紝璺宠浆鑷充富椤�
- window.location.replace(window.location.href.replace(/design/ig, 'main'))
-}
-
-options.sysType = window.atob(options.sysType.replace('$mk', ''))
-options.caId = window.atob(options.caId.replace('$mk', ''))
-options.cakey = window.atob(options.cakey.replace('$mk', ''))
-options.cdomain = window.atob(options.cdomain.replace('$mk', ''))
-
-if (options.cdomain && options.sysType !== 'cloud') {
- options.cloudServiceApi = options.cdomain + '/webapi/dostars'
-}
-
if (!localStorage.getItem('SessionUid')) {
- localStorage.setItem('SessionUid', (() => {
+ let sid = (() => {
let uuid = []
let _options = '0123456789abcdefghigklmnopqrstuv'
for (let i = 0; i < 32; i++) {
uuid.push(_options.substr(Math.floor(Math.random() * 0x20), 1))
}
return uuid.join('')
- })())
-}
+ })()
-const render = Component => {
- ReactDOM.render(
- <Provider store={store}>
- <Component/>
- </Provider>,
- document.getElementById('root')
- )
-}
+ if (/_mk_sid=[0-9a-z]{32}/.test(document.cookie)) {
+ sid = document.cookie.match(/_mk_sid=[0-9a-z]{32}/)[0].split('=')[1]
+ } else {
+ document.cookie = '_mk_sid=' + sid
+ }
-sessionStorage.removeItem('isEditState')
+ localStorage.setItem('SessionUid', sid)
+
+}
fetch('../options.json')
.then(response => response.json())
@@ -54,11 +40,13 @@
if (!config) return
if (config.defaultApp) {
- if ((navigator.userAgent.match(/(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone)/i))) {
+ if (/(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone)/i.test(navigator.userAgent)) {
window.location.replace(window.location.href.split(/(index.html)+/ig)[0].replace('admin/', '') + 'mob/index.html#/index')
return
}
}
+
+ config.keepPwd = config.keepPwd || config.keepPassword
let GLOB = {}
GLOB.appId = config.appId || ''
@@ -67,13 +55,37 @@
GLOB.probation = false
GLOB.watermark = config.watermark + '' !== 'false'
GLOB.transfer = config.transfer + '' === 'true'
- GLOB.keepKey = config.keepPassword + '' !== 'false'
- GLOB.nginx = config.nginx + '' === 'true'
+ GLOB.keepKey = config.keepPwd + '' !== 'false'
+ GLOB.vispwd = config.keepPwd + '' !== 'invisible'
GLOB.WXAppID = config.WXAppID || ''
GLOB.WXminiAppID = config.WXminiAppID || ''
+ GLOB.WXMerchID = config.WXMerchID || ''
GLOB.WXNotice = config.WXNotice + '' === 'true'
- GLOB.accessToken = {}
+ GLOB.SysNotice = config.SysNotice + '' === 'true'
+ GLOB.execType = config.execType === 'x' ? 'x' : ''
GLOB.mkHS = false
+ GLOB.debugger = false
+ GLOB.dataFormat = false
+ GLOB.upStatus = false
+ GLOB.navBar = 'shutter' // 榛樿涓虹櫨鍙剁獥
+ GLOB.style = 'bg_black_style_blue'
+ GLOB.defLang = ''
+
+ if (config.WXApps) {
+ config.WXApps = config.WXApps.filter(app => app.appId && app.appName && ['public', 'miniProgram', 'merchant'].includes(app.appType))
+ if (config.WXApps.length) {
+ GLOB.WXApps = config.WXApps
+ }
+ }
+
+ if (langs[config.defaultLang]) {
+ GLOB.defLang = config.defaultLang
+ }
+
+ GLOB.sysType = options.sysType
+ if (GLOB.sysType !== 'cloud') {
+ GLOB.cloudServiceApi = options.cdomain + '/webapi/dostars'
+ }
if (sessionStorage.getItem('externalDatabase')) {
GLOB.externalDatabase = `[${sessionStorage.getItem('externalDatabase')}]..`
@@ -83,13 +95,15 @@
GLOB.externalDatabase = null
}
- // 鍙湁涓氬姟绯荤粺鎵嶅彲浠ヨ缃负姝ｅ紡绯荤粺
- if (options.sysType === 'local' && (config.systemType === 'official' || config.systemType === 'production')) {
- GLOB.systemType = 'production'
- 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.probation && /^[1-9]\d{3}-\d{2}-\d{2}$/.test(config.probation) && new Date(config.probation).getTime() > new Date().getTime()) {
+ GLOB.probation = true
+ }
+ if (config.forcedUpdate && /^[1-9]\d{3}-\d{2}-\d{2}$/.test(config.forcedUpdate) && new Date(config.forcedUpdate).getTime() > new Date().getTime()) {
+ GLOB.forcedUpdate = true
+ }
+ // 鍙湁涓氬姟绯荤粺鎵嶅彲浠ヨ缃负姝ｅ紡绯荤粺
+ if (GLOB.sysType === 'local' && (config.systemType === 'official' || config.systemType === 'production')) {
if (!config.mainSystemApi) {
document.getElementById('root').innerHTML = '<div style="text-align: center; font-size: 30px; margin-top: 40vh;">绯荤粺鏈缃崟鐐瑰湴鍧�锛岃鑱旂郴绠＄悊鍛橈紒</div>'
return
@@ -100,9 +114,17 @@
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.systemType = 'production'
+ } else if (GLOB.sysType === 'local') {
GLOB.probation = true
+ GLOB.debugger = true
GLOB.systemType = ''
+ GLOB.upStatus = config.updateStatus + '' !== 'false'
+
+ if (config.style_appkey) {
+ GLOB.style_appkey = config.style_appkey
+ }
// GLOB.mainSystemApi = 'https://cloud.positecgroup.com/webapi/dostars'
@@ -119,25 +141,20 @@
GLOB.mainSystemApi = ''
}
- GLOB.debugger = options.sysType === 'local' && GLOB.systemType !== 'production'
-
- if (/#\/hs$/.test(window.location.href)) { // hs涓嬩笉鎵撳嵃鑴氭湰
- GLOB.debugger = false
- }
-
- if (options.sysType !== 'cloud') {
+ if (GLOB.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涓虹郴缁熻缃�
+ if (GLOB.sysType === 'cloud') { // cloud涓嶅彲璁剧疆鍗曠偣鏈嶅姟鍣ㄥ湴鍧�,浜戠appkey涓虹郴缁熻缃�
GLOB.appkey = options.cakey
+ GLOB.appId = options.caId
GLOB.WXNotice = false
- } else if (options.sysType === 'SSO') { // sso涓嶅彲璁剧疆鍗曠偣鏈嶅姟鍣ㄥ湴鍧�
+ } else if (GLOB.sysType === 'SSO') { // sso涓嶅彲璁剧疆鍗曠偣鏈嶅姟鍣ㄥ湴鍧�
GLOB.appkey = config.appkey
- } else if (options.sysType === 'local') { // 涓氬姟绯荤粺
+ } else if (GLOB.sysType === 'local') { // 涓氬姟绯荤粺
GLOB.appkey = config.appkey
if (GLOB.systemType === 'production') {
let systemApi = config.mainSystemApi
@@ -153,12 +170,63 @@
GLOB.mainSystemApi = systemApi
}
+
+ if (config.errorLog === 'true' && /#\/(login|main|billprint|docprint|tab|iframe|view|ssologin)/.test(window.location.href)) {
+ GLOB.errorLog = true
+ }
}
- let _href = window.location.href.split('#')[0]
- let _systemMsg = localStorage.getItem(_href + 'system')
+ if (/#\/hs$/.test(window.location.href)) { // hs涓嬩笉鎵撳嵃鑴氭湰
+ GLOB.debugger = false
- GLOB.navBar = 'shutter' // 榛樿涓虹櫨鍙剁獥
+ if (GLOB.mainSystemApi) {
+ GLOB.localSystemApi = GLOB.mainSystemApi
+ GLOB.mainSystemApi = ''
+ }
+ if (GLOB.cloudServiceApi) {
+ GLOB.mainSystemApi = GLOB.cloudServiceApi
+ }
+
+ if (config.systemRun === 'backend') {
+ config.systemRun = '' // hs 涓嶄娇鐢ㄥ悗绔浛鎹�
+ GLOB.backend = true
+ }
+ }
+
+ if (process.env.NODE_ENV === 'production') { // 鐢ㄤ簬鏍￠獙鏄惁瀛樺湪寮�鍙戞潈闄�
+ let _service = window.location.href.replace(/\/admin(.*)/ig, '').replace(new RegExp(document.location.origin + '/?', 'ig'), '')
+ GLOB.service = _service ? _service + '/' : ''
+ 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
+ GLOB.host = config.host.replace(/http(s)?:\/\//ig, '') + (config.service ? '_' + config.service.replace(/\//ig, '') : '')
+ GLOB.baseurl = GLOB.location + '/' + GLOB.service
+ GLOB.linkurl = GLOB.baseurl + 'index.html'
+ GLOB.dataFormat = false
+ }
+
+ let mark = sessionStorage.getItem('system_mark')
+ let _mark = `sys_${GLOB.service.replace('/', '') || 'service'}`
+ if (mark && mark !== _mark) {
+ sessionStorage.clear()
+ }
+ sessionStorage.setItem('system_mark', _mark)
+
+ if (config.mainkey && GLOB.sysType !== 'cloud' && config.mainkey !== options.cakey) {
+ GLOB.localkey = GLOB.appkey
+ GLOB.appkey = config.mainkey
+ }
+
+ let lang = localStorage.getItem(window.location.href.split('#')[0] + 'lang') || GLOB.defLang || 'zh-CN'
+ sessionStorage.setItem('lang', lang)
+
+ GLOB.sysSign = GLOB.service + 'admin/' + lang + '/'
+
+ let _systemMsg = localStorage.getItem(GLOB.sysSign + 'system')
let className = 'mk-blue-black'
if (_systemMsg) {
@@ -175,10 +243,25 @@
GLOB.mainlogo = _systemMsg.mainlogo
GLOB.doclogo = _systemMsg.doclogo
GLOB.webSite = _systemMsg.webSite
- GLOB.style = _systemMsg.style
+ GLOB.prolType = _systemMsg.prolType || ''
+ GLOB.prolCont = _systemMsg.prolCont || ''
+ GLOB.style = _systemMsg.style || 'bg_black_style_blue'
GLOB.showline = _systemMsg.showline || ''
GLOB.navBar = _systemMsg.navBar || 'shutter'
GLOB.appVersion = _systemMsg.app_version || ''
+ GLOB.loginOtop = _systemMsg.loginOtop || ''
+ GLOB.loginOleft = _systemMsg.loginOleft || ''
+ sessionStorage.setItem('appname', _systemMsg.appname || '')
+
+ let levels = [30, 10, 20, 40, 50, 60, 70, 80, 90, 100]
+
+ levels.some(m => {
+ if (_systemMsg.Member_Level === md5('mksoft' + GLOB.appkey + m)) {
+ GLOB.memberLevel = m
+ return true
+ }
+ return false
+ })
if (GLOB.favicon) {
let link = document.querySelector("link[rel*='icon']") || document.createElement('link')
@@ -187,17 +270,12 @@
link.href = GLOB.favicon
document.getElementsByTagName('head')[0].appendChild(link)
}
- if (GLOB.style && styles[GLOB.style]) {
+ if (styles[GLOB.style]) {
className = styles[GLOB.style] + ' ' + (GLOB.showline === 'false' ? 'hidden-split-line' : '')
}
} catch (e) {
console.warn('Parse Failure')
}
- }
-
- // 涓嶄娇鐢ㄧ櫨鍙剁獥鎵撳紑鑿滃崟鏃讹紝鍘绘帀鍚堝苟鏍囪
- if (GLOB.navBar !== 'shutter') {
- localStorage.removeItem('collapse')
}
document.body.className = className
@@ -211,59 +289,51 @@
document.title = GLOB.platTitle || ''
- if (config.filter === 'true' || (/^20\d{2}-\d{2}-\d{2}$/.test(config.filter) && new Date(config.filter).getTime() + 86400000 >= new Date().getTime())) {
+ if (config.filter === 'true' || (/^[1-9]\d{3}-\d{2}-\d{2}$/.test(config.filter) && new Date(config.filter).getTime() + 86400000 >= new Date().getTime())) {
GLOB.filter = true
}
- if (process.env.NODE_ENV === 'production') { // 鐢ㄤ簬鏍￠獙鏄惁瀛樺湪寮�鍙戞潈闄�
- let _service = window.location.href.replace(/\/admin(.*)/ig, '').replace(new RegExp(document.location.origin + '/?', 'ig'), '')
- GLOB.service = _service ? _service + '/' : ''
- GLOB.host = window.location.host + (_service ? '_' + _service : '')
- GLOB.baseurl = document.location.origin + '/' + GLOB.service
- GLOB.linkurl = GLOB.baseurl + 'index.html'
- } else {
- GLOB.location = config.host
- GLOB.service = config.service
- GLOB.host = config.host.replace(/http(s)?:\/\//ig, '') + (config.service ? '_' + config.service.replace(/\//ig, '') : '')
- GLOB.baseurl = GLOB.location + '/' + GLOB.service
- GLOB.linkurl = GLOB.baseurl + 'index.html'
+ if (lang !== 'zh-CN') {
+ GLOB.WXNotice = false
}
- let mark = sessionStorage.getItem('system_mark')
- let _mark = `sys_${GLOB.service.replace('/', '') || 'service'}`
- if (mark && mark !== _mark) {
- sessionStorage.clear()
- }
- sessionStorage.setItem('system_mark', _mark)
+ if (localStorage.getItem(GLOB.sysSign + 'files') === md5(GLOB.sysSign + 'files')) {
+ let d = localStorage.getItem(GLOB.sysSign + 'filesDate')
- if (localStorage.getItem(_href + 'lang')) {
- sessionStorage.setItem('lang', localStorage.getItem(_href + 'lang'))
- } else {
- sessionStorage.setItem('lang', config.defaultLang !== 'en-US' ? 'zh-CN' : 'en-US')
- }
+ GLOB.storeFiles = true
+ GLOB.storeDate = Math.ceil((new Date(d).getTime() - new Date().getTime()) / 86400000)
+ } else if (GLOB.licenseKey && config.storeKey && config.storeKey.length === 16) {
+ let trans = {A:0, B:1, C:2, D:3, E:4, F:5, G:6, H:7, I:8, J:9}
+ let d = config.storeKey.slice(0, 8)
- let _level = 10
- let _Mlevel = sessionStorage.getItem('Member_Level')
+ d = d.split('').map(k => trans[k]).join('')
- 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
+ let key = config.storeKey.slice(8)
+ let _key = GLOB.appId + GLOB.appkey + 'e_files_key' + d
+ _key = md5(_key.toLowerCase())
+ _key = _key.toUpperCase()
+ _key = _key.slice(-8)
+
+ if (key === _key) {
+ GLOB.storeFiles = true
+
+ d = d.slice(0, 4) + '-' + d.slice(4, 6) + '-' + d.slice(6)
+ GLOB.storeDate = Math.ceil((new Date(d).getTime() - new Date().getTime()) / 86400000)
}
}
- GLOB.memberLevel = _level
- GLOB.mkThdMenus = [] // 涓夌骇鑿滃崟
- GLOB.mkActions = {} // 鎸夐挳鏉冮檺闆�
- if (sessionStorage.getItem('breakpoint')) {
- window.debugger = true
- GLOB.breakpoint = sessionStorage.getItem('breakpoint')
- } else {
- GLOB.breakpoint = false
+ GLOB.dict = {}
+
+ if (localStorage.getItem(GLOB.sysSign + 'js_trans')) {
+ let js_trans = JSON.parse(localStorage.getItem(GLOB.sysSign + 'js_trans'))
+
+ js_trans.forEach(item => {
+ if (lang !== item.lang) return
+ GLOB.dict[item.key] = item.val
+ })
}
+
+ GLOB.mkActions = {} // 鎸夐挳鏉冮檺闆�
Object.defineProperty(GLOB, 'appId', {
writable: false,
@@ -277,10 +347,6 @@
writable: false,
value: GLOB.systemType
})
- Object.defineProperty(GLOB, 'debugger', {
- writable: false,
- value: GLOB.debugger
- })
Object.defineProperty(GLOB, 'mainSystemApi', {
writable: false,
value: GLOB.mainSystemApi
@@ -289,6 +355,63 @@
writable: false,
value: GLOB.linkurl
})
+ Object.defineProperty(GLOB, 'sysType', {
+ writable: false,
+ value: GLOB.sysType
+ })
+ Object.defineProperty(GLOB, 'cloudServiceApi', {
+ writable: false,
+ value: GLOB.cloudServiceApi || ''
+ })
+
+ if (GLOB.memberLevel) {
+ Object.defineProperty(GLOB, 'memberLevel', {
+ writable: false,
+ value: GLOB.memberLevel
+ })
+ } else {
+ GLOB.memberLevel = 0
+ }
+
+ if (config.systemRun === 'backend') {
+ if (sessionStorage.getItem('systemRun') === 'front') {
+ GLOB.debugger = true
+ } else {
+ GLOB.debugger = false
+ Object.defineProperty(window, 'backend', {
+ writable: false,
+ value: true
+ })
+ }
+ }
+ if (config.debugger === 'forbid') {
+ sessionStorage.removeItem('breakpoint')
+ GLOB.debugger = false
+
+ Object.defineProperty(GLOB, 'debugger', {
+ writable: false,
+ value: GLOB.debugger
+ })
+ } else if (GLOB.sysType === 'cloud') {
+ if (sessionStorage.getItem('cloudRun') === 'debug') {
+ GLOB.debugger = true
+ } else {
+ Object.defineProperty(GLOB, 'debugger', {
+ writable: false,
+ value: GLOB.debugger
+ })
+
+ GLOB.breakpoint = false
+ }
+ } else {
+ if (sessionStorage.getItem('breakpoint')) {
+ GLOB.debugger = true
+ GLOB.breakpoint = sessionStorage.getItem('breakpoint')
+ } else {
+ GLOB.breakpoint = false
+ }
+ }
+
Object.defineProperty(window, 'GLOB', {
writable: false,
value: GLOB
@@ -300,8 +423,21 @@
window.GLOB.CacheData = new Map() // 瀛樺偍閫変腑鏁版嵁
window.GLOB.SearchBox = new Map() // 瀛樺偍鎼滅储鏉′欢
window.GLOB.SyncData = new Map() // 瀛樺偍鍚屾鏌ヨ鏁版嵁
+ window.GLOB.mkThdMenus = new Map() // 涓夌骇鑿滃崟
- render(Route)
+ if (lang === 'zh-CN' || !/#\/(login|main|billprint|docprint|tab\/|iframe|view|ssologin)/.test(window.location.href)) { // 寮�鍙戜娇鐢ㄤ腑鏂�
+ ReactDOM.render(
+ <ConfigProvider locale={zhCN}>
+ <Route/>
+ </ConfigProvider>,
+ document.getElementById('root')
+ )
+ } else {
+ ReactDOM.render(
+ <Route/>,
+ document.getElementById('root')
+ )
+ }
})
serviceWorker.unregister()
--
Gitblit v1.8.0