From 9cf5fc474d2159aad973e3208fbef670f325307f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 25 十一月 2020 17:57:41 +0800
Subject: [PATCH] 2020-11-25
---
src/index.js | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/src/index.js b/src/index.js
index ea3cafa..4ca1c39 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,7 +1,7 @@
import React from 'react'
import ReactDOM from 'react-dom'
import Route from './router'
-import {Provider} from 'react-redux'
+import { Provider } from 'react-redux'
import store from '@/store'
import * as serviceWorker from './serviceWorker'
import options from '@/store/options.js'
@@ -43,9 +43,17 @@
)
}
-sessionStorage.removeItem('isEditState')
-// fetch(`./${process.env.NODE_ENV === 'production' ? 'build/' : ''}options.json`)
+if (sessionStorage.getItem('loginError')) {
+ try {
+ let res = JSON.parse(sessionStorage.getItem('loginError'))
+ console.info(res.request)
+ console.info(res.response)
+ } catch {}
+}
+sessionStorage.removeItem('isEditState')
+sessionStorage.removeItem('loginError')
+
fetch(`./options.json`)
.then(response => response.json())
.catch(() => {
@@ -58,6 +66,12 @@
GLOB.appId = config.appId || ''
GLOB.lineColor = config.lineColor || ''
GLOB.filter = config.filter || ''
+
+ if (config.externalDatabase !== false && config.externalDatabase !== 'false' && config.externalDatabase !== undefined) {
+ GLOB.externalDatabase = config.externalDatabase || ''
+ } else {
+ GLOB.externalDatabase = null
+ }
// 鍙湁涓氬姟绯荤粺鎵嶅彲浠ヨ缃负姝ｅ紡绯荤粺
if (options.sysType === 'local' && (config.systemType === 'official' || config.systemType === 'production')) {
@@ -107,7 +121,7 @@
// 涓氬姟绯荤粺涓嶅厑璁歌繛鎺ヤ簯绔紝涓氬姟绯荤粺杩炴帴sso.mk9h.cn鏃讹紝鏁版嵁铏氬寲澶勭悊
if (systemApi && systemApi.indexOf('cloud.mk9h.cn') > -1) {
systemApi = ''
- } else if (systemApi && systemApi.indexOf('sso.mk9h.cn') > -1) {
+ } else if (systemApi && systemApi.indexOf('sso.mk9h.cn') > -1 && process.env.NODE_ENV === 'production') {
GLOB.dataFormat = true
}
--
Gitblit v1.8.0