From ae7f00b753b89ba2d157a53c716662080a3cc171 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 29 七月 2023 12:05:39 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/api/index.js | 88 +++++++++++++++++++++++---------------------
1 files changed, 46 insertions(+), 42 deletions(-)
diff --git a/src/api/index.js b/src/api/index.js
index 7cd5074..c30b55b 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -1,6 +1,6 @@
import axios from 'axios'
import qs from 'qs'
-import { notification } from 'antd'
+import { notification, Modal } from 'antd'
import md5 from 'md5'
import CryptoJS from 'crypto-js'
import jsSHA from 'jssha'
@@ -11,6 +11,7 @@
window.GLOB.IndexDB = null
window.GLOB.OuterToken = {}
+window.GLOB.$error = false
let service = window.GLOB.service ? '-' + window.GLOB.service.replace('/', '') : ''
let db = `mkdb${service}`
@@ -23,53 +24,54 @@
axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded;charset=UTF-8'
axios.defaults.withCredentials = false
-// axios.interceptors.request.use((config) => {
-// return config
-// }, (error) => {
-// return Promise.reject(error)
-// })
-
-const setCurrentUrl = (res) => {
- if (!!(window.history && window.history.pushState)) {
- sessionStorage.clear()
- sessionStorage.setItem('loginError', JSON.stringify({url: res.config ? res.config.url : '', request: res.config ? res.config.data : '', response: JSON.stringify(res.data)}))
- window.history.replaceState(null, null, window.location.href.split('#')[0] + '#/login')
- window.location.reload()
- }
-}
-
axios.interceptors.response.use((response) => {
if (response.data.ErrCode === 'LoginError') {
- if (window.debugger === true) {
- response.data.ErrCode = 'E'
- return Promise.resolve(response.data)
- } else if (window.GLOB.developing) {
+ if (window.GLOB.developing) {
sessionStorage.setItem('devError', 'true')
response.data.ErrCode = 'E'
return Promise.resolve(response.data)
- } else if (!sessionStorage.getItem('loginError')) {
- setCurrentUrl(response)
+ } else if (response.config.url.indexOf('https://sso.mk9h.cn/webapi/dostars') > -1) {
+ return Promise.reject(response.data)
+ } else if (response.config.url.indexOf('https://epc.mk9h.cn/webapi/dostars') > -1) {
+ return Promise.reject(response.data)
}
+
+ if (!window.GLOB.$error) {
+ window.GLOB.$error = true
+
+ Modal.destroyAll()
+ Modal.error({
+ title: response.data.message,
+ okText: '鐭ラ亾浜�',
+ onOk: () => {
+ window.GLOB.$error = false
+ sessionStorage.clear()
+ if (!!(window.history && window.history.pushState)) {
+ window.history.replaceState(null, null, window.location.href.split('#')[0] + '#/login')
+ window.location.reload()
+ }
+ }
+ })
+ }
+
+ return Promise.reject(response.data)
} else {
return Promise.resolve(response.data)
}
}, (error) => {
- let response = error.response
+ let response = error.response || ''
- if (response) {
- if (!response.data || !response.data.errors) { // 杩囨护鏃疯鎶ラ敊淇℃伅
- notification.error({
- className: 'notification-custom-error',
- bottom: 0,
- message: '鐘舵�佺爜-' + response.status + '锛岃鑱旂郴绠＄悊鍛�',
- placement: 'bottomRight',
- duration: 15
- })
- }
- return Promise.reject(response)
- } else {
- return Promise.reject()
+ if (response && (!response.data || !response.data.errors)) { // 杩囨护鏃疯鎶ラ敊淇℃伅
+ notification.error({
+ className: 'notification-custom-error',
+ bottom: 0,
+ message: '鐘舵�佺爜-' + response.status + '锛岃鑱旂郴绠＄悊鍛�',
+ placement: 'bottomRight',
+ duration: 15
+ })
}
+
+ return Promise.reject(response)
})
class Api {
@@ -323,22 +325,23 @@
}
delCacheConfig (type = '') {
- let date = moment().subtract(7, 'days').format('YYYY-MM-DD')
+ let date = moment().subtract(7, 'days').format('YYYY-MM-DD HH:mm:ss')
CacheUtils.delIndexDBCacheConfig(date, type)
}
writeCacheConfig (menuid, data) {
if (!menuid) return
- let date = moment().format('YYYY-MM-DD')
+ let date = moment().format('YYYY-MM-DD HH:mm:ss')
let _data = data ? JSON.stringify(data) : ''
CacheUtils.writeCacheInIndexDB({menuid, CreateDate: date, LongParam: _data})
}
- getLCacheConfig (menuid) {
+ getLCacheConfig (menuid, minutes) {
return new Promise((resolve, reject) => {
if (window.GLOB.IndexDB) {
- CacheUtils.getIndexDBCacheConfig(menuid).then(res => {
+ let limit = minutes ? moment().subtract(minutes, 'minutes').format('YYYY-MM-DD HH:mm:ss') : ''
+ CacheUtils.getIndexDBCacheConfig(menuid, limit).then(res => {
if (res && res.LongParam) {
let _data = JSON.parse(res.LongParam)
if (_data.length === 0) {
@@ -415,7 +418,7 @@
if (list.length > 0) {
let clear = false
let _appkey = window.GLOB.appkey.substr(-10)
- let reg = new RegExp(_appkey + '$', 'ig')
+ let reg = new RegExp(_appkey + '$', 'i')
list.forEach(mid => {
if (reg.test(mid)) {
@@ -426,6 +429,7 @@
list = ''
}
CacheUtils.delIndexDBConfig(list)
+ this.delCacheConfig('all')
}
CacheUtils.updateIndexDBversion({version: res.app_version || '1.00', createDate: curTime})
@@ -542,7 +546,7 @@
param.lang = param.lang || sessionStorage.getItem('lang') || ''
param.SessionUid = localStorage.getItem('SessionUid') || ''
param.LoginUID = sessionStorage.getItem('LoginUID') || ''
- param.appkey = window.GLOB.appkey || ''
+ param.appkey = param.appkey || window.GLOB.appkey || ''
let url = '/webapi/dostars'
if (sessionStorage.getItem('isEditState') === 'true') { // 缂栬緫鐘舵�侊紝鍗曠偣鐧诲綍鏈嶅姟鍣ㄤ负浜戠
--
Gitblit v1.8.0