From f078c137d61270d243cd8e03077fa9cf000e276b Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 14 八月 2023 14:02:40 +0800
Subject: [PATCH] 2023-08-14
---
src/views/login/index.jsx | 26 ++++++++++----------------
1 files changed, 10 insertions(+), 16 deletions(-)
diff --git a/src/views/login/index.jsx b/src/views/login/index.jsx
index 40903fc..335bac1 100644
--- a/src/views/login/index.jsx
+++ b/src/views/login/index.jsx
@@ -6,7 +6,7 @@
import Api from '@/api'
import Utils from '@/utils/utils.js'
import MKEmitter from '@/utils/events.js'
-import options, { styles } from '@/store/options.js'
+import { styles } from '@/store/options.js'
import zhCN from '@/locales/zh-CN/login.js'
import enUS from '@/locales/en-US/login.js'
import asyncComponent from '@/utils/asyncComponent'
@@ -184,7 +184,7 @@
} else {
this.props.history.replace('/main')
}
- } else if (res.ErrCode === 'Need_Get_Appkey' && options.sysType === 'SSO') {
+ } else if (res.ErrCode === 'Need_Get_Appkey' && window.GLOB.sysType === 'SSO') {
message.warning('搴旂敤灏氭湭鍒涘缓锛岃鍚戜簯绔悓姝ュ簲鐢紒')
this.setState({
@@ -245,7 +245,7 @@
} else {
this.props.history.replace('/main')
}
- } else if (res.ErrCode === 'Need_Get_Appkey' && options.sysType === 'SSO') {
+ } else if (res.ErrCode === 'Need_Get_Appkey' && window.GLOB.sysType === 'SSO') {
message.warning('搴旂敤灏氭湭鍒涘缓锛岃鍚戜簯绔悓姝ュ簲鐢紒')
this.setState({
@@ -290,7 +290,7 @@
} else {
this.props.history.replace('/main')
}
- } else if (res.ErrCode === 'Need_Get_Appkey' && options.sysType === 'SSO') {
+ } else if (res.ErrCode === 'Need_Get_Appkey' && window.GLOB.sysType === 'SSO') {
message.warning('搴旂敤灏氭湭鍒涘缓锛岃鍚戜簯绔悓姝ュ簲鐢紒')
this.setState({
@@ -434,20 +434,14 @@
}
if (!window.GLOB.licenseKey && (index === -1 || index > 5)) {
- let _appId = window.GLOB.appId
-
- if (options.sysType === 'cloud') { // 浜戠浣跨敤绯荤粺閰嶇疆appid
- _appId = options.caId
- }
-
- let str = md5('MK19' + _appId + timeStamp)
+ let str = md5('MK19' + window.GLOB.appId + timeStamp)
let _rduri = window.atob('aHR0cHM6Ly9lcGMubWs5aC5$mkjbi93ZWJhcGkvZG9zdGFycw=='.replace(/\$mk/ig, ''))
let _func = window.atob('c0VtcG93ZXJDbG91$mkZF9HZXRfTGlua1VybA=='.replace(/\$mk/ig, ''))
let _id = window.atob('YmgwYmFwYWJ0ZDQ1ZXBz$mkZ3JhNzlzZWdiY2g2YzFpYms='.replace(/\$mk/ig, ''))
let param = {
func: _func,
- AppID: _appId,
+ AppID: window.GLOB.appId,
TimeStamp: timeStamp,
appkey: window.GLOB.appkey,
userid: _id,
@@ -591,7 +585,7 @@
if (res.status) {
// positecgroup
- // if (options.sysType === 'local' && window.GLOB.systemType !== 'production') {
+ // if (window.GLOB.sysType === 'local' && window.GLOB.systemType !== 'production') {
// if (md5(('mk' + window.GLOB.appkey + res.sys_datetime + res.member_type + res.registry_date).toLowerCase()) !== res.secret_key) {
// Modal.warning({
// title: '瀵嗛挜閿欒锛岃鑱旂郴绠＄悊鍛橈紒',
@@ -808,15 +802,15 @@
func: 's_get_app_from_cloud',
UserName: '',
Password: '',
- systemType: options.sysType,
+ systemType: window.GLOB.sysType,
Type: 'X',
debug: 'Y'
}
param.appkey = window.GLOB.appkey || ''
- if (options.cloudServiceApi) {
- param.rduri = options.cloudServiceApi.replace('dostars', 'dostar')
+ if (window.GLOB.cloudServiceApi) {
+ param.rduri = window.GLOB.cloudServiceApi.replace('dostars', 'dostar')
}
this.logincloudRef.handleConfirm().then(result => {
--
Gitblit v1.8.0