From eed5279d84fd59bc32f060a31b4006590cee4320 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 02 一月 2024 17:01:59 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/index.js | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/index.js b/src/index.js
index d080be6..bc6f52d 100644
--- a/src/index.js
+++ b/src/index.js
@@ -76,11 +76,6 @@
// 鍙湁涓氬姟绯荤粺鎵嶅彲浠ヨ缃负姝ｅ紡绯荤粺
if (GLOB.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.mainSystemApi) {
document.getElementById('root').innerHTML = '<div style="text-align: center; font-size: 30px; margin-top: 40vh;">绯荤粺鏈缃崟鐐瑰湴鍧�锛岃鑱旂郴绠＄悊鍛橈紒</div>'
return
@@ -91,6 +86,14 @@
document.getElementById('root').innerHTML = '<div style="text-align: center; font-size: 30px; margin-top: 40vh;">姝ｅ紡绯荤粺涓嶅彲浣跨敤 http://cloud.mk9h.cn 鍋氫负鍗曠偣鍦板潃锛岃鑱旂郴绠＄悊鍛橈紒</div>'
return
}
+
+ 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.forcedUpdate && /^20\d{2}-\d{2}-\d{2}$/.test(config.forcedUpdate) && new Date(config.forcedUpdate).getTime() > new Date().getTime()) {
+ GLOB.forcedUpdate = true
+ }
} else if (GLOB.sysType === 'local') {
GLOB.probation = true
GLOB.debugger = true
--
Gitblit v1.8.0