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 | 32 +++++++++++++++++++++++++++-----
1 files changed, 27 insertions(+), 5 deletions(-)
diff --git a/src/index.js b/src/index.js
index 601a715..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'
@@ -71,6 +72,10 @@
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}]..` : ''
@@ -101,7 +106,7 @@
// GLOB.mainSystemApi = 'https://cloud.positecgroup.com/webapi/dostars'
- GLOB.mainSystemApi = 'http://sso.mk9h.cn/cloud/webapi/dostars'
+ GLOB.mainSystemApi = 'https://sso.mk9h.cn/cloud/webapi/dostars'
if (GLOB.watermark) {
GLOB.dataFormat = true
@@ -176,6 +181,13 @@
}
}
+ 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' || (/^20\d{2}-\d{2}-\d{2}$/.test(config.filter) && new Date(config.filter).getTime() + 86400000 >= new Date().getTime())) {
@@ -214,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
@@ -237,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