From 48a18736c461ad730bd264b0ac7b40b68a0e33a1 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 28 六月 2020 20:30:20 +0800
Subject: [PATCH] 2020-06-28

---
 src/index.js |   58 ++++++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 38 insertions(+), 20 deletions(-)

diff --git a/src/index.js b/src/index.js
index 52e544e..ad77622 100644
--- a/src/index.js
+++ b/src/index.js
@@ -14,6 +14,10 @@
   window.location.replace(window.location.href.split(/(index.html)+/ig)[0] + 'mob/index.html')
 }
 
+if (options.cdomain) {
+  options.cloudServiceApi = options.cdomain + '/webapi/dostars'
+}
+
 const render  = Component => {
   ReactDOM.render(
     <Provider store={store}>
@@ -25,32 +29,46 @@
 
 window.GLOB = window.GLOB || {}
 
-if (!(options.systemType === 'local' && window.GLOB.systemType === 'official')) { // 鍙湁涓氬姟绯荤粺鎵嶅彲浠ヨ缃负姝e紡绯荤粺
+if (!(options.sysType === 'local' && window.GLOB.systemType === 'official')) { // 鍙湁涓氬姟绯荤粺鎵嶅彲浠ヨ缃负姝e紡绯荤粺
   window.GLOB.systemType = ''
 }
-if (options.systemType !== 'local') { // sso,cloud涓嶅彲璁剧疆鍗曠偣鏈嶅姟鍣ㄥ湴鍧�
+
+if (options.sysType === 'cloud') { // cloud涓嶅彲璁剧疆鍗曠偣鏈嶅姟鍣ㄥ湴鍧�,浜戠appkey涓虹郴缁熻缃�
+  window.GLOB.appkey = options.cakey
   window.GLOB.mainSystemApi = ''
-} else if (options.systemType === 'local' && window.GLOB.mainSystemApi) { // 涓氬姟绯荤粺
-  let systemApi = window.GLOB.mainSystemApi
-
-  if (/^(http|https):\/\//ig.test(systemApi)) {
-    let _systemApi = /^(http|https):\/\/[a-zA-Z0-9][-a-zA-Z0-9]{0,62}(\.[a-zA-Z0-9][-a-zA-Z0-9]{0,62}|(:[0-9]{1,4}))+\.?/ig.exec(systemApi)
-
-    systemApi = _systemApi ? _systemApi[0] : ''
-  } else {
-    systemApi = ''
+} else if (options.sysType === 'SSO') { // sso涓嶅彲璁剧疆鍗曠偣鏈嶅姟鍣ㄥ湴鍧�
+  window.GLOB.mainSystemApi = ''
+  if (window.GLOB.appkey === options.cakey) {
+    window.GLOB.appkey = ''
+    console.warn('鍗曠偣绯荤粺appkey涓嶅彲涓庝簯绔浉鍚�')
   }
-
-  // 涓氬姟绯荤粺杩炴帴浜戠鏃讹紝鏍煎紡鍖栧鐞�
-  if (systemApi && systemApi === /^(http|https):\/\/[a-zA-Z0-9][-a-zA-Z0-9]{0,62}(\.[a-zA-Z0-9][-a-zA-Z0-9]{0,62}|(:[0-9]{1,4}))+\.?/ig.exec(options.cloudServiceApi)[0]) {
-    window.GLOB.dataFormat = true
+} else if (options.sysType === 'local') { // 涓氬姟绯荤粺
+  if (window.GLOB.appkey === options.cakey) {
+    window.GLOB.appkey = ''
+    console.warn('涓氬姟绯荤粺appkey涓嶅彲涓庝簯绔浉鍚�')
   }
-
-  if (systemApi) {
-    systemApi = systemApi + '/webapi/dostars'
+  if (window.GLOB.mainSystemApi) {
+    let systemApi = window.GLOB.mainSystemApi
+  
+    if (/^(http|https):\/\//ig.test(systemApi)) {
+      let _systemApi = /^(http|https):\/\/[a-zA-Z0-9][-a-zA-Z0-9]{0,62}(\.[a-zA-Z0-9][-a-zA-Z0-9]{0,62}|(:[0-9]{1,4}))+\.?/ig.exec(systemApi)
+  
+      systemApi = _systemApi ? _systemApi[0] : ''
+    } else {
+      systemApi = ''
+    }
+  
+    // 涓氬姟绯荤粺杩炴帴浜戠鏃讹紝鏍煎紡鍖栧鐞�
+    if (systemApi && systemApi === /^(http|https):\/\/[a-zA-Z0-9][-a-zA-Z0-9]{0,62}(\.[a-zA-Z0-9][-a-zA-Z0-9]{0,62}|(:[0-9]{1,4}))+\.?/ig.exec(options.cloudServiceApi)[0]) {
+      window.GLOB.dataFormat = true
+    }
+  
+    if (systemApi) {
+      systemApi = systemApi + '/webapi/dostars'
+    }
+  
+    window.GLOB.mainSystemApi = systemApi
   }
-
-  window.GLOB.mainSystemApi = systemApi
 }
 
 let _systemMsg = localStorage.getItem(window.location.href.split('#')[0] + 'system')

--
Gitblit v1.8.0