From afb39f8ab004b2607bb718edab02e99c7a010114 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 22 三月 2023 14:36:44 +0800
Subject: [PATCH] 2023-03-22
---
src/api/index.js | 403 ++++++++++++++++++---------------------------------------
1 files changed, 128 insertions(+), 275 deletions(-)
diff --git a/src/api/index.js b/src/api/index.js
index 5179db8..a4dd5b9 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -9,21 +9,13 @@
import CacheUtils from './cacheutils'
import options from '@/store/options.js'
-window.GLOB.WebSql = null
window.GLOB.IndexDB = null
window.GLOB.OuterToken = {}
-const systemMenuKeys = `1581067625930haged11ieaivpavv77k,1581734956310scks442ul2d955g9tu5,1583991994144ndddg0bhh0is6shi0v1,1583979633842550imkchl4qt4qppsiv,1578900109100np8aqd0a77q3na46oas,
- 1585192949946f3et2ts8tn82krmumdf,15855615451212m12ip23vpcm79kloro,1587005717541lov40vg61q7l1rbveon,1590458676585agbbr63t6ihighg2i1g,1602315375262ikd33ii0nii34pt861o,1582771068837vsv54a089lgp45migbg,
- 1582777675954ifu05upurs465omoth7,158294809668898cklbv6c5bou8e1fpu,1584676379094iktph45fb8imhg96bql,1584695125339vo5g7iqgfn01qmrd6s2,1584699661372vhmpp9dn9foo0eob722,15848421131551gg04ie8sitsd3f7467,
- 1589782279158ngr675kk3oksin35sul,1589788042787ffdt9hle4s45k9r1nvs,1594095599055qicg2eb642v5qglhnuo,1577972969199lei1g0qkvlh4tkc908m,16044812935562g807p3p12huk8kokmb,
- 1578479100252lfbp29v1kafk4s4q4ig,1577971621421tg4v0i1ur8873k7e0ob,1577929944419lgc5h3hepum765e2k7u,1588493493409k9guqp067d31lu7blsv,15827879285193g85m3i2uprektpgmpf`
let service = window.GLOB.service ? '-' + window.GLOB.service.replace('/', '') : ''
let db = `mkdb${service}`
-if (window.openDatabase) {
- CacheUtils.openWebSql(db)
-} else if (window.indexedDB) {
+if (window.indexedDB) {
CacheUtils.openIndexDB(db)
}
@@ -32,7 +24,7 @@
axios.defaults.withCredentials = false
axios.interceptors.request.use((config) => {
- if (config.url.includes('LoginAndRedirect') || config.url.includes('getjsonresult') || config.url.includes('wxNativePay')) {
+ if (/LoginAndRedirect|getjsonresult|wxNativePay|postek/ig.test(config.url)) {
config.data = qs.stringify(config.data)
} else if (/\/doupload|\/dopreload|\/upload/.test(config.url)) {
config.headers = { 'Content-Type': 'multipart/form-data' }
@@ -264,7 +256,7 @@
/**
* @description 鎵嬫満鍙烽獙璇佺爜鐧诲綍
*/
- getphoneusermsg (phoneNo, checkcode, isCloud = false, ipAddress, city) {
+ getphoneusermsg (phoneNo, checkcode, isCloud = false) {
let param = {
// func: 'webapi_login',
mob: phoneNo,
@@ -273,8 +265,8 @@
check_code: checkcode,
way_no: 'sms_vcode',
systemType: options.sysType,
- login_city: city,
- login_id_address: ipAddress,
+ login_city: sessionStorage.getItem('city') || '',
+ login_id_address: sessionStorage.getItem('ipAddress') || '',
kei_id: window.btoa(window.encodeURIComponent(window.GLOB.host)),
device_id: localStorage.getItem('SessionUid'),
appkey: window.GLOB.appkey || ''
@@ -303,25 +295,19 @@
/**
* @description 鐧诲綍绯荤粺, 鑾峰彇鐢ㄦ埛淇℃伅
*/
- getusermsg (username, password, isCloud = false, ipAddress, city) {
+ getusermsg (username, password, isCloud = false) {
+ let shim = +sessionStorage.getItem('sys_time_shim')
let param = {
// func: 'webapi_login',
UserName: username,
systemType: options.sysType,
Type: 'S',
- login_city: city,
- login_id_address: ipAddress,
+ login_city: sessionStorage.getItem('city') || '',
+ login_id_address: sessionStorage.getItem('ipAddress') || '',
kei_id: window.btoa(window.encodeURIComponent(window.GLOB.host)),
device_id: localStorage.getItem('SessionUid'),
- timestamp: moment().format('YYYY-MM-DD HH:mm:ss'),
+ timestamp: moment().add(shim, 'seconds').format('YYYY-MM-DD HH:mm:ss'),
appkey: window.GLOB.appkey || ''
- }
-
- let sys_datetime = sessionStorage.getItem('sys_datetime')
- let app_datetime = sessionStorage.getItem('app_datetime')
- if (sys_datetime && app_datetime) {
- let seconds = Math.floor((new Date().getTime() - app_datetime) / 1000)
- param.timestamp = moment(sys_datetime, 'YYYY-MM-DD HH:mm:ss').add(seconds, 'seconds').format('YYYY-MM-DD HH:mm:ss')
}
// Type: 'S' 鏃�
@@ -361,185 +347,136 @@
})
}
+ delCacheConfig (type = '') {
+ let date = moment().subtract(7, 'days').format('YYYY-MM-DD')
+ CacheUtils.delIndexDBCacheConfig(date, type)
+ }
+
+ writeCacheConfig (menuid, data) {
+ if (!menuid) return
+ let date = moment().format('YYYY-MM-DD')
+ let _data = data ? JSON.stringify(data) : ''
+
+ CacheUtils.writeCacheInIndexDB({menuid, CreateDate: date, LongParam: _data})
+ }
+
+ getLCacheConfig (menuid) {
+ return new Promise((resolve, reject) => {
+ if (window.GLOB.IndexDB) {
+ CacheUtils.getIndexDBCacheConfig(menuid).then(res => {
+ if (res && res.LongParam) {
+ let _data = JSON.parse(res.LongParam)
+ if (_data.length === 0) {
+ resolve()
+ } else {
+ resolve(_data)
+ }
+ } else {
+ resolve()
+ }
+ })
+ } else {
+ resolve()
+ }
+ })
+ }
+
/**
- * @description 鑾峰彇绯荤粺鐗堟湰淇℃伅锛屽惎鐢ㄦ垨鏇存柊websql
+ * @description 鑾峰彇绯荤粺鐗堟湰淇℃伅
*/
getAppVersion (reload) {
- if (!window.GLOB.WebSql && !window.GLOB.IndexDB) {
+ if (!window.GLOB.IndexDB) {
return Promise.reject()
}
- let curTime = moment().format('YYYY-MM-DD HH:mm:ss') + '.000'
- let sys_datetime = sessionStorage.getItem('sys_datetime')
- let app_datetime = sessionStorage.getItem('app_datetime')
- if (sys_datetime && app_datetime) {
- let seconds = Math.floor((new Date().getTime() - app_datetime) / 1000)
- let _curTime = moment(sys_datetime, 'YYYY-MM-DD HH:mm:ss').add(seconds, 'seconds').format('YYYY-MM-DD HH:mm:ss') + '.000'
- if (/^\d{4}-\d{2}-\d{2}/.test(_curTime)) {
- curTime = _curTime
- }
- }
+ let shim = +sessionStorage.getItem('sys_time_shim')
+ let curTime = moment().add(shim, 'seconds').format('YYYY-MM-DD HH:mm:ss') + '.000'
- if (window.GLOB.WebSql) {
- return new Promise((resolve, reject) => {
- CacheUtils.getWebSqlVersion().then(msg => {
- let param = {
- func: 's_get_app_version',
- modifydate: msg.createDate
- }
+ return new Promise((resolve, reject) => {
+ CacheUtils.getIndexDBVersion().then(msg => {
+ let param = {
+ func: 's_get_app_version',
+ modifydate: msg.createDate
+ }
- param.TypeCharOne = ''
- param.typename = ''
+ param.TypeCharOne = ''
+ param.typename = ''
- if (!msg.createDate && !msg.menuids) {
- CacheUtils.updateWebSqlversion('1.00', curTime)
- resolve()
- return
- } else if (!msg.createDate || reload === true) {
- param.modifydate = curTime
+ if (!msg.createDate && !msg.menuids) {
+ CacheUtils.updateIndexDBversion({version: '1.00', createDate: curTime})
+ resolve()
+ return
+ } else if (!msg.createDate || reload === true) {
+ param.modifydate = curTime
+ param.menuids = window.btoa(msg.menuids)
+ } else if (msg.menuids) {
+ let d = localStorage.getItem(db)
+
+ if (!d || curTime.indexOf(d) === -1) {
param.menuids = window.btoa(msg.menuids)
- } else if (msg.menuids) {
- let d = localStorage.getItem(db)
-
- if (!d || curTime.indexOf(d) === -1) {
- param.menuids = window.btoa(msg.menuids)
- }
-
- localStorage.setItem(db, curTime.substr(0, 10))
- }
-
- this.getSystemConfig(param).then(res => {
- if (!res.status) {
- reject()
- return
- }
-
- let list = res.menu_data || []
-
- if (res.menu_del) {
- list.push(...res.menu_del)
- }
-
- list = list.map(mid => mid.menuid)
-
- if (typeof(reload) === 'string' && !list.includes(reload)) {
- list.push(reload)
- }
-
- if (list.length > 0) {
- let clear = false
- list.forEach(mid => {
- if (systemMenuKeys.indexOf(mid) > -1) {
- clear = true
- }
- })
- if (clear) {
- list = ''
- } else {
- list = list.map(mid => `'${mid}'`).join(',')
- }
- CacheUtils.delWebSqlConfig(list)
- }
-
- CacheUtils.updateWebSqlversion(res.app_version || '1.00', curTime)
-
- resolve()
- })
- }, () => {
- reject()
- })
- })
- } else {
- return new Promise((resolve, reject) => {
- CacheUtils.getIndexDBVersion().then(msg => {
- let param = {
- func: 's_get_app_version',
- modifydate: msg.createDate
}
- param.TypeCharOne = ''
- param.typename = ''
+ localStorage.setItem(db, curTime.substr(0, 10))
+ }
- if (!msg.createDate && !msg.menuids) {
- CacheUtils.updateIndexDBversion({version: '1.00', createDate: curTime})
- resolve()
+ this.getSystemConfig(param).then(res => {
+ if (!res.status) {
+ reject()
return
- } else if (!msg.createDate || reload === true) {
- param.modifydate = curTime
- param.menuids = window.btoa(msg.menuids)
- } else if (msg.menuids) {
- let d = localStorage.getItem(db)
-
- if (!d || curTime.indexOf(d) === -1) {
- param.menuids = window.btoa(msg.menuids)
- }
-
- localStorage.setItem(db, curTime.substr(0, 10))
}
- this.getSystemConfig(param).then(res => {
- if (!res.status) {
- reject()
- return
- }
-
- let list = res.menu_data || []
+ let list = res.menu_data || []
- if (res.menu_del) {
- list.push(...res.menu_del)
- }
+ if (res.menu_del) {
+ list.push(...res.menu_del)
+ }
- list = list.map(mid => mid.menuid)
+ list = list.map(mid => mid.menuid)
- if (typeof(reload) === 'string' && !list.includes(reload)) {
- list.push(reload)
- }
+ if (typeof(reload) === 'string' && !list.includes(reload)) {
+ list.push(reload)
+ }
- if (list.length > 0) {
- let clear = false
- list.forEach(mid => {
- if (systemMenuKeys.indexOf(mid) > -1) {
- clear = true
- }
- })
- if (clear) {
- list = ''
+ if (list.length > 0) {
+ let clear = false
+ let _appkey = window.GLOB.appkey.substr(-10)
+ let reg = new RegExp(_appkey + '$', 'ig')
+
+ list.forEach(mid => {
+ if (reg.test(mid)) {
+ clear = true
}
- CacheUtils.delIndexDBConfig(list)
+ })
+ if (clear) {
+ list = ''
}
+ CacheUtils.delIndexDBConfig(list)
+ }
- CacheUtils.updateIndexDBversion({version: res.app_version || '1.00', createDate: curTime})
-
- resolve()
- })
- }, () => {
- reject()
+ CacheUtils.updateIndexDBversion({version: res.app_version || '1.00', createDate: curTime})
+
+ resolve()
})
+ }, () => {
+ reject()
})
- }
+ })
}
/**
* @description 鏇存柊绯荤粺鐗堟湰淇℃伅锛屾竻绌洪厤缃俊鎭�
*/
updateAppVersion () {
- CacheUtils.delWebSqlConfig()
- CacheUtils.updateWebSqlversion()
CacheUtils.delIndexDBConfig()
CacheUtils.updateIndexDBversion()
- CacheUtils.clearFuncs()
+ // CacheUtils.clearFuncs()
}
/**
* @description 鍒犻櫎鏌愪釜鑿滃崟閰嶇疆淇℃伅
*/
deleteMenuStorage (menuId) {
- if (window.GLOB.IndexDB) {
- let key = menuId + (sessionStorage.getItem('UserID') || '')
- return CacheUtils.delMenuIndexDBConfig(key)
- } else {
- return CacheUtils.delMenuWebSqlConfig(menuId)
- }
+ CacheUtils.delIndexDBConfig(menuId)
}
/**
@@ -623,7 +560,7 @@
}
/**
- * @description 鑾峰彇绯荤粺閰嶇疆锛屽彇鍊间紭鍏堢瓑绾ebsql銆佺紦瀛樸�佹湇鍔″櫒
+ * @description 鑾峰彇绯荤粺閰嶇疆锛屽彇鍊间紭鍏堢瓑绾ndexDB銆佺紦瀛樸�佹湇鍔″櫒
*/
getCacheConfig (param) {
param.userid = sessionStorage.getItem('UserID') || ''
@@ -647,36 +584,11 @@
}
}
- let _param = JSON.parse(JSON.stringify(param)) // 缂撳瓨鏍￠獙锛屽幓闄ゆ椂闂村拰鍔犲瘑瀛楃
- delete _param.timestamp
- delete _param.secretkey
- delete _param.open_key
- _param = JSON.stringify(_param)
- _param = md5(_param)
+ let key = md5(param.MenuID + param.userid)
- if (window.GLOB.WebSql) {
+ if (window.GLOB.IndexDB) {
return new Promise(resolve => {
- CacheUtils.getWebSqlMenuConfig(param.MenuID, param.userid).then(res => {
- resolve(res)
- }, () => {
- param = this.encryptParam(param)
- axios({
- url: `${url}${param.func ? '/' + param.func : ''}`,
- method: 'post',
- data: param
- }).then(res => {
- if (res.status && window.GLOB.WebSql) {
- CacheUtils.writeInWebSql([param.MenuID, param.userid, res.open_edition, res.web_edition, res.LongParam, res.LongParamUser])
- } else if (res.status) {
- window.GLOB.CacheMap.set(_param, res)
- }
- resolve(res)
- })
- })
- })
- } else if (window.GLOB.IndexDB) {
- return new Promise(resolve => {
- CacheUtils.getIndexDBMenuConfig(param.MenuID, param.userid).then(res => {
+ CacheUtils.getIndexDBMenuConfig(key).then(res => {
resolve(res)
}, () => {
param = this.encryptParam(param)
@@ -690,18 +602,18 @@
...res,
userid: param.userid,
menuid: param.MenuID,
- id: param.MenuID + param.userid
+ id: key
}
CacheUtils.writeInIndexDB(msg)
} else if (res.status) {
- window.GLOB.CacheMap.set(_param, res)
+ window.GLOB.CacheMap.set(key, res)
}
resolve(res)
})
})
})
- } else if (window.GLOB.CacheMap.has(_param)) {
- return Promise.resolve(window.GLOB.CacheMap.get(_param))
+ } else if (window.GLOB.CacheMap.has(key)) {
+ return Promise.resolve(window.GLOB.CacheMap.get(key))
} else {
param = this.encryptParam(param)
@@ -712,7 +624,7 @@
data: param
}).then(res => {
if (res.status) {
- window.GLOB.CacheMap.set(_param, res)
+ window.GLOB.CacheMap.set(key, res)
}
resolve(res)
})
@@ -731,16 +643,8 @@
param.appkey = window.GLOB.appkey || ''
let _param = md5(JSON.stringify(param))
-
- if (window.GLOB.WebSql) {
- return new Promise(resolve => {
- CacheUtils.getWebSqlMenuConfig(param.MenuID, param.userid).then(res => {
- resolve(res)
- }, () => {
- resolve({ ErrCode: 'S', ErrMesg: '', LongParam: '', message: '', status: false })
- })
- })
- } else if (window.GLOB.CacheMap.has(_param)) {
+
+ if (window.GLOB.CacheMap.has(_param)) {
return Promise.resolve(window.GLOB.CacheMap.get(_param))
} else {
return Promise.resolve({ErrCode: 'S', ErrMesg: '', LongParam: '', message: '', status: false})
@@ -797,12 +701,15 @@
delete param.rduri
}
- let _param = JSON.parse(JSON.stringify(param)) // 缂撳瓨鏍￠獙锛屽幓闄ゆ椂闂村拰鍔犲瘑瀛楃
- delete _param.timestamp
- delete _param.secretkey
- delete _param.open_key
- _param = JSON.stringify(_param)
- _param = md5(_param)
+ let _param = ''
+ if (cache) {
+ _param = JSON.parse(JSON.stringify(param)) // 缂撳瓨鏍￠獙锛屽幓闄ゆ椂闂村拰鍔犲瘑瀛楃
+ delete _param.timestamp
+ delete _param.secretkey
+ delete _param.open_key
+ _param = JSON.stringify(_param)
+ _param = md5(_param)
+ }
if (cache && window.GLOB.CacheMap.has(_param)) {
return Promise.resolve(window.GLOB.CacheMap.get(_param))
@@ -1026,57 +933,6 @@
}
/**
- * @description 瀵煎嚭Excel锛屽悗鍙扮敓鎴愭枃浠�
- */
- // getExcelOut (param, name) {
- // param.userid = sessionStorage.getItem('UserID')
- // param.lang = sessionStorage.getItem('lang') || ''
- // param.SessionUid = localStorage.getItem('SessionUid') || ''
- // param.LoginUID = sessionStorage.getItem('LoginUID') || ''
- // param.appkey = window.GLOB.appkey || ''
-
- // return new Promise(resolve => {
- // axios({
- // url: '/webapi/doexcel',
- // responseType: 'blob',
- // method: 'post',
- // data: param
- // }).then(res => {
- // try {
- // const blob = new Blob([res])
-
- // if (res.type === 'application/json') {
- // const reader = new FileReader()
- // reader.onload = e => resolve(JSON.parse(e.target.result))
- // reader.readAsText(blob)
- // } else {
- // if ('download' in document.createElement('a')) { // 闈濱E涓嬭浇
- // const elink = document.createElement('a')
- // elink.download = name
- // elink.style.display = 'none'
- // elink.href = URL.createObjectURL(blob)
- // document.body.appendChild(elink)
- // elink.click()
- // URL.revokeObjectURL(elink.href) // 閲婃斁URL 瀵硅薄
- // document.body.removeChild(elink)
- // } else { // IE10+涓嬭浇
- // navigator.msSaveBlob(blob, name)
- // }
- // resolve()
- // }
- // } catch (e) {
- // resolve({
- // ErrCode: 'E',
- // ErrMesg: '鏂囦欢瑙ｆ瀽閿欒',
- // message: '',
- // status: false
- // })
- // }
- // })
- // })
- // }
-
- /**
* @description 涓婁紶base64
* @param {String} base64 base64鍥剧墖缂栫爜
*/
@@ -1181,16 +1037,13 @@
})
}
- // /**
- // * @description 鏂囦欢涓婁紶
- // */
- // getFileUpload (param) {
- // return axios({
- // url: '/zh-CN/Home/Upload',
- // method: 'post',
- // data: param
- // })
- // }
+ postekPrint (data) {
+ return axios({
+ url: 'http://127.0.0.1:888/postek/print',
+ method: 'post',
+ data: data
+ })
+ }
}
export default new Api()
\ No newline at end of file
--
Gitblit v1.8.0