From f3167f8371d19d0ea8fe7d0e7af5517ff0b08cd2 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 07 四月 2021 23:25:29 +0800
Subject: [PATCH] 2021-04-07
---
src/api/index.js | 636 +++++++++++++++++++++++++--------------------------------
1 files changed, 276 insertions(+), 360 deletions(-)
diff --git a/src/api/index.js b/src/api/index.js
index 9595a99..ad91d61 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -2,50 +2,36 @@
import qs from 'qs'
import { notification } from 'antd'
import md5 from 'md5'
+import jsSHA from 'jssha'
import moment from 'moment'
import Utils from '@/utils/utils.js'
+import CacheUtils from './cacheutils'
import options from '@/store/options.js'
-let mkDataBase = null
+window.GLOB.WebSql = null
+window.GLOB.IndexDB = null
+const systemMenuKeys = `1581067625930haged11ieaivpavv77k,1581734956310scks442ul2d955g9tu5,1583991994144ndddg0bhh0is6shi0v1,1583979633842550imkchl4qt4qppsiv,1578900109100np8aqd0a77q3na46oas,16044812935562g807p3p12huk8kokmb,
+ 1585192949946f3et2ts8tn82krmumdf,15855615451212m12ip23vpcm79kloro,1587005717541lov40vg61q7l1rbveon,1590458676585agbbr63t6ihighg2i1g,1602315375262ikd33ii0nii34pt861o,1582771068837vsv54a089lgp45migbg,
+ 1582777675954ifu05upurs465omoth7,158294809668898cklbv6c5bou8e1fpu,1584676379094iktph45fb8imhg96bql,1584695125339vo5g7iqgfn01qmrd6s2,1584699661372vhmpp9dn9foo0eob722,15848421131551gg04ie8sitsd3f7467,
+ 1589782279158ngr675kk3oksin35sul,1589788042787ffdt9hle4s45k9r1nvs,15900310928174dro07ihfckghpb5h13,1594095599055qicg2eb642v5qglhnuo,1599613340050c8nu6rbst9d4emnnbsq,1577972969199lei1g0qkvlh4tkc908m,
+ 1578479100252lfbp29v1kafk4s4q4ig,1577971621421tg4v0i1ur8873k7e0ob,1577929944419lgc5h3hepum765e2k7u,1588493493409k9guqp067d31lu7blsv`
if (window.openDatabase) {
- let service = window.GLOB.service ? '-' + window.GLOB.service.replace('/', '') : ''
- try {
- mkDataBase = openDatabase(`mkdb${service}`, '1', 'mk-pc-database', 50 * 1024 * 1024)
- mkDataBase.transaction(tx => {
- tx.executeSql('CREATE TABLE IF NOT EXISTS VERSIONS (version varchar(50), createDate varchar(50), CDefine1 varchar(50), CDefine2 varchar(50), CDefine3 varchar(50))', [], () => {
-
- }, () => {
- // eslint-disable-next-line
- throw 'CREATE TABLE ERROR'
- })
- tx.executeSql('CREATE TABLE IF NOT EXISTS CONFIGS (menuid varchar(50), userid varchar(50), openEdition varchar(50), webEdition varchar(50), LongParam text, LongParamUser text, CDefine1 varchar(50), CDefine2 varchar(50), CDefine3 varchar(50), CDefine4 varchar(50), CDefine5 varchar(50))', [], () => {
-
- }, () => {
- // eslint-disable-next-line
- throw 'CREATE TABLE ERROR'
- })
- })
- // mkDataBase.transaction(tx => {
- // tx.executeSql('DROP TABLE VERSIONS')
- // tx.executeSql('DROP TABLE CONFIGS')
- // })
- } catch (e) {
- console.warn(e)
- mkDataBase = null
- }
+ CacheUtils.openWebSql()
+} else if (window.indexedDB) {
+ CacheUtils.openIndexDB()
}
axios.defaults.crossDomain = true
axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded;charset=UTF-8'
-axios.defaults.withCredentials = true
+axios.defaults.withCredentials = false
axios.interceptors.request.use((config) => {
if (config.url.includes('LoginAndRedirect') || config.url.includes('getjsonresult') || config.url.includes('wxNativePay')) {
config.data = qs.stringify(config.data)
} else if (config.url.includes('Upload') || config.url.includes('doupload') || config.url.includes('dopreload')) {
config.headers = { 'Content-Type': 'multipart/form-data' }
- } else if (config.method === 'post') {
+ } else if (config.method === 'post' && config.data) {
config.data = JSON.stringify(config.data)
}
@@ -107,7 +93,7 @@
if (process.env.NODE_ENV === 'production') {
axios.defaults.baseURL = document.location.origin + '/' + window.GLOB.service
} else {
- // axios.defaults.baseURL = 'http://127.0.0.1:8888'
+ axios.defaults.baseURL = window.GLOB.location + '/' + window.GLOB.service
}
}
@@ -147,7 +133,20 @@
/* @description 鐩存帴璇锋眰
* @param {Object} param 鏌ヨ鍙婃彁浜ゅ弬鏁�
*/
- directRequest (url, method = 'post', param) {
+ directRequest (url, method = 'post', param, cross) {
+ if (cross === 'true' && param) {
+ return axios({
+ url,
+ method,
+ data: param
+ })
+ } else if (cross === 'true') {
+ return axios({
+ url,
+ method
+ })
+ }
+
let params = { method: 'post' }
let _url = url
@@ -162,27 +161,9 @@
}
_url = _url.replace(/&/ig, '%26')
- // _url = window.btoa(_url)
params.url = '/trans/redirect?rd=' + _url + '&method=' + method
return axios(params)
- }
-
- /**
- * @description 浣跨敤dostar鎺ュ彛锛岃烦杞嚦dostars
- * @param {Object} param 鏌ヨ鍙婃彁浜ゅ弬鏁�
- */
- dostarToDostars (param) {
- param.userid = param.userid || sessionStorage.getItem('UserID') || ''
- param.LoginUID = param.LoginUID || sessionStorage.getItem('LoginUID') || ''
-
- param = this.encryptParam(param)
-
- return axios({
- url: '/webapi/dostar',
- method: 'post',
- data: param
- })
}
/**
@@ -208,12 +189,14 @@
param.appkey = window.GLOB.appkey || ''
+ let url = '/webapi/dologon/s_visitor_login'
if (window.GLOB.mainSystemApi) {
- param.rduri = window.GLOB.mainSystemApi.replace(/\/webapi(.*)/, '/webapi/dologon')
+ // url = window.GLOB.mainSystemApi.replace(/\/webapi(.*)/, '/webapi/dologon/s_visitor_login')
+ param.rduri = window.GLOB.mainSystemApi.replace(/\/webapi(.*)/, '/webapi/dologon/s_visitor_login')
}
return axios({
- url: '/webapi/dologon',
+ url: url,
method: 'post',
data: param
})
@@ -222,7 +205,7 @@
/**
* @description 鎵嬫満鍙烽獙璇佺爜鐧诲綍
*/
- getphoneusermsg (phoneNo, checkcode, isCloud = false) {
+ getphoneusermsg (phoneNo, checkcode, isCloud = false, ipAddress, city) {
let param = {
// func: 'webapi_login',
mob: phoneNo,
@@ -230,22 +213,30 @@
Password: '',
check_code: checkcode,
way_no: 'sms_vcode',
- systemType: options.sysType
+ systemType: options.sysType,
+ login_city: city,
+ login_id_address: ipAddress
}
param.appkey = window.GLOB.appkey || ''
+ let url = '/webapi/dologon'
if (isCloud) {
param.debug = 'Y'
if (options.cloudServiceApi) {
+ // url = options.cloudServiceApi.replace(/\/webapi(.*)/, '/webapi/dologon')
param.rduri = options.cloudServiceApi.replace(/\/webapi(.*)/, '/webapi/dologon')
}
- } else if (!isCloud && window.GLOB.mainSystemApi) {
+ } else if (window.GLOB.mainSystemApi) {
+ if (options.sysType !== 'cloud' && window.GLOB.systemType !== 'production') {
+ param.linkurl = window.GLOB.linkurl
+ }
+ // url = window.GLOB.mainSystemApi.replace(/\/webapi(.*)/, '/webapi/dologon')
param.rduri = window.GLOB.mainSystemApi.replace(/\/webapi(.*)/, '/webapi/dologon')
}
return axios({
- url: '/webapi/dologon',
+ url,
method: 'post',
data: param
})
@@ -254,29 +245,44 @@
/**
* @description 鐧诲綍绯荤粺, 鑾峰彇鐢ㄦ埛淇℃伅
*/
- getusermsg (username, password, isCloud = false) {
+ getusermsg (username, password, isCloud = false, ipAddress, city) {
let param = {
// func: 'webapi_login',
UserName: username,
- Password: password,
systemType: options.sysType,
- Type: 'X'
+ Type: 'S',
+ login_city: city,
+ login_id_address: ipAddress
}
- param.Password = Utils.formatOptions(param.Password)
+ // Type: 'S' 鏃�
+ let shaObj = new jsSHA('SHA-1', 'TEXT')
+ param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
+ shaObj.update(password)
+ param.Password = shaObj.getHash('HEX').toUpperCase()
+ param.Password = md5(username + param.Password + param.timestamp)
+
+ // Type: 'X' 鏃�
+ // param.Password = Utils.formatOptions(password)
param.appkey = window.GLOB.appkey || ''
+ let url = '/webapi/dologon'
if (isCloud) {
param.debug = 'Y'
if (options.cloudServiceApi) {
+ // url = options.cloudServiceApi.replace(/\/webapi(.*)/, '/webapi/dologon')
param.rduri = options.cloudServiceApi.replace(/\/webapi(.*)/, '/webapi/dologon')
}
- } else if (!isCloud && window.GLOB.mainSystemApi) {
+ } else if (window.GLOB.mainSystemApi) {
+ if (options.sysType !== 'cloud' && window.GLOB.systemType !== 'production') {
+ param.linkurl = window.GLOB.linkurl
+ }
+ // url = window.GLOB.mainSystemApi.replace(/\/webapi(.*)/, '/webapi/dologon')
param.rduri = window.GLOB.mainSystemApi.replace(/\/webapi(.*)/, '/webapi/dologon')
}
return axios({
- url: '/webapi/dologon',
+ url,
method: 'post',
data: param
})
@@ -287,265 +293,178 @@
*/
getAppVersion (_resolve, _reject) {
let appVersion = {}
-
- new Promise((resolve, reject) => {
- if (!mkDataBase) {
- reject()
- } else {
- mkDataBase.transaction(tx => {
- if (!mkDataBase) {
- reject()
- return
- }
- tx.executeSql('SELECT * FROM VERSIONS', [], (tx, results) => {
- if (results.rows.length === 0) {
- tx.executeSql('DELETE FROM CONFIGS')
- resolve({version: '', createDate: ''})
- } else if (results.rows.length === 1) {
- resolve(results.rows[0])
- } else if (results.rows.length > 1) {
- tx.executeSql('DELETE FROM VERSIONS')
- tx.executeSql('DELETE FROM CONFIGS')
- resolve({version: '', createDate: ''})
- }
- }, (tx, results) => {
- reject()
- console.warn(results)
- })
- })
- }
- }).then(msg => {
- if (msg.version) {
- appVersion.oldVersion = msg.version
- }
- let curTime = moment().format('YYYY-MM-DD HH:mm:ss') + '.000'
-
- let param = {
- func: 's_get_app_version',
- modifydate: msg.createDate || curTime,
- }
-
- param.userid = sessionStorage.getItem('UserID') || ''
- param.lang = localStorage.getItem('lang') || ''
- param.SessionUid = localStorage.getItem('SessionUid') || ''
- param.LoginUID = sessionStorage.getItem('LoginUID') || ''
- param.appkey = window.GLOB.appkey || ''
-
- if (window.GLOB.mainSystemApi) {
- param.rduri = window.GLOB.mainSystemApi
- }
-
- param = this.encryptParam(param)
-
- return new Promise((resolve, reject) => {
- axios({
- url: `/webapi/dostars${param.func ? '/' + param.func : ''}`,
- method: 'post',
- data: param
- }).then(res => {
- if (!res.status) {
- reject()
- return
- }
- let clear = false
- let version = res.app_version || '1.00'
- appVersion.newVersion = version
- appVersion.oldVersion = appVersion.oldVersion || version
-
- if (res.menu_data && res.menu_data.length > 0) {
- let keys = `1581067625930haged11ieaivpavv77k,1581734956310scks442ul2d955g9tu5,1583991994144ndddg0bhh0is6shi0v1,1583979633842550imkchl4qt4qppsiv,1578900109100np8aqd0a77q3na46oas,16044812935562g807p3p12huk8kokmb,
- 1585192949946f3et2ts8tn82krmumdf,15855615451212m12ip23vpcm79kloro,1587005717541lov40vg61q7l1rbveon,1590458676585agbbr63t6ihighg2i1g,1602315375262ikd33ii0nii34pt861o,1582771068837vsv54a089lgp45migbg,
- 1582777675954ifu05upurs465omoth7,158294809668898cklbv6c5bou8e1fpu,1584676379094iktph45fb8imhg96bql,1584695125339vo5g7iqgfn01qmrd6s2,1584699661372vhmpp9dn9foo0eob722,15848421131551gg04ie8sitsd3f7467,
- 1589782279158ngr675kk3oksin35sul,1589788042787ffdt9hle4s45k9r1nvs,15900310928174dro07ihfckghpb5h13,1594095599055qicg2eb642v5qglhnuo,1599613340050c8nu6rbst9d4emnnbsq,1577972969199lei1g0qkvlh4tkc908m,
- 1578479100252lfbp29v1kafk4s4q4ig,1577971621421tg4v0i1ur8873k7e0ob,1577929944419lgc5h3hepum765e2k7u,1588493493409k9guqp067d31lu7blsv`
-
- res.menu_data.forEach(mid => {
- if (keys.indexOf(mid.menuid) > -1) {
- clear = true
- }
- })
- }
-
- mkDataBase.transaction(tx => {
- if (clear) {
- tx.executeSql(`DELETE FROM CONFIGS`, [], () => {}, () => { reject() })
- } else if (res.menu_data && res.menu_data.length > 0) {
- let keys = res.menu_data.map(mid => `'${mid.menuid}'`)
- tx.executeSql(`DELETE FROM CONFIGS where menuid in (${keys.join(',')})`, [], () => {}, () => {
- reject()
- })
- }
- if (msg.version) {
- tx.executeSql(`UPDATE VERSIONS SET createDate='${curTime}'`, [], () => {
- resolve()
- }, () => {
- reject()
- })
- } else {
- tx.executeSql('INSERT INTO VERSIONS (version, createDate) VALUES (?, ?)', [version, curTime], () => {
- resolve()
- }, () => {
- reject()
- })
- }
- })
- })
- })
- }, () => {
- mkDataBase = null
- _reject()
+ if (!window.GLOB.WebSql && !window.GLOB.IndexDB) {
return Promise.reject()
- }).then(() => {
- _resolve(appVersion)
- }, () => {
- mkDataBase = null
- _reject()
- })
+ }
+
+ if (window.GLOB.WebSql) {
+ return new Promise((resolve, reject) => {
+ CacheUtils.getWebSqlVersion().then(msg => {
+ appVersion.oldVersion = msg.version || ''
+ let curTime = moment().format('YYYY-MM-DD HH:mm:ss') + '.000'
+ let param = {
+ func: 's_get_app_version',
+ modifydate: msg.createDate || curTime,
+ }
+
+ this.getSystemConfig(param).then(res => {
+ if (!res.status) {
+ reject()
+ return
+ }
+ let clear = false
+ let version = res.app_version || '1.00'
+ appVersion.newVersion = version
+ appVersion.oldVersion = appVersion.oldVersion || version
+
+ if (res.menu_data && res.menu_data.length > 0) {
+ res.menu_data.forEach(mid => {
+ if (systemMenuKeys.indexOf(mid.menuid) > -1) {
+ clear = true
+ }
+ })
+
+ if (clear) {
+ CacheUtils.clearWebSqlConfig()
+ } else {
+ let keys = res.menu_data.map(mid => `'${mid.menuid}'`).join(',')
+ CacheUtils.delWebSqlConfig(keys)
+ }
+ }
+
+ if (msg.version) {
+ CacheUtils.updateWebSqlTime(curTime)
+ } else {
+ CacheUtils.createWebSqlversion(version, curTime)
+ }
+
+ resolve(appVersion)
+ })
+ }, () => {
+ reject()
+ })
+ })
+ } else {
+ return new Promise((resolve, reject) => {
+ CacheUtils.getIndexDBVersion().then(msg => {
+ appVersion.oldVersion = msg.version || ''
+ let curTime = moment().format('YYYY-MM-DD HH:mm:ss') + '.000'
+ let param = {
+ func: 's_get_app_version',
+ modifydate: msg.createDate || curTime,
+ }
+
+ this.getSystemConfig(param).then(res => {
+ if (!res.status) {
+ reject()
+ return
+ }
+ let clear = false
+ let version = res.app_version || '1.00'
+ appVersion.newVersion = version
+ appVersion.oldVersion = appVersion.oldVersion || version
+
+ if (res.menu_data && res.menu_data.length > 0) {
+ res.menu_data.forEach(mid => {
+ if (systemMenuKeys.indexOf(mid.menuid) > -1) {
+ clear = true
+ }
+ })
+
+ if (clear) {
+ CacheUtils.clearIndexDBConfig()
+ } else {
+ let keys = res.menu_data.map(mid => `'${mid.menuid}'`)
+ CacheUtils.delIndexDBConfig(keys)
+ }
+ }
+
+ CacheUtils.updateIndexDBversion({version: appVersion.oldVersion, createDate: curTime})
+
+ resolve(appVersion)
+ })
+ }, () => {
+ reject()
+ })
+ })
+ }
}
/**
* @description 鏇存柊绯荤粺鐗堟湰淇℃伅锛屾竻绌洪厤缃俊鎭�
*/
updateAppVersion (newVersion) {
- return new Promise(resolve => {
- if (!mkDataBase) {
- resolve({status: false})
- return
- }
- let curTime = moment().format('YYYY-MM-DD HH:mm:ss') + '.000'
-
- mkDataBase.transaction(tx => {
- tx.executeSql(`DELETE FROM CONFIGS`, [], () => {}, () => {
- resolve({status: false})
- })
- tx.executeSql(`UPDATE VERSIONS SET version='${newVersion}', createDate='${curTime}'`, [], () => {
- resolve({status: true})
- }, () => {
- resolve({status: false})
- })
- })
- })
+ let curTime = moment().format('YYYY-MM-DD HH:mm:ss') + '.000'
+ CacheUtils.clearWebSqlConfig()
+ CacheUtils.updateWebSqlversion(newVersion, curTime)
+ CacheUtils.clearIndexDBConfig()
+ CacheUtils.updateIndexDBversion({version: newVersion, createDate: curTime})
}
/**
* @description 鍒犻櫎鏌愪釜鑿滃崟閰嶇疆淇℃伅
*/
deleteMenuStorage (menuId) {
- return new Promise(resolve => {
- if (!mkDataBase) {
- resolve()
- return
+ if (window.GLOB.IndexDB) {
+ let key = menuId + (sessionStorage.getItem('UserID') || '')
+
+ if (sessionStorage.getItem('isEditState') === 'true' && options.cloudServiceApi) {
+ key = menuId + (sessionStorage.getItem('CloudUserID') || '')
}
- mkDataBase.transaction(tx => {
- tx.executeSql(`DELETE FROM CONFIGS where menuid='${menuId}'`, [], () => {
- resolve()
- }, () => {
- mkDataBase = null
- })
- })
- })
+
+ return CacheUtils.delMenuIndexDBConfig(key)
+ } else {
+ return CacheUtils.delMenuWebSqlConfig(menuId)
+ }
}
/**
* @description 鑾峰彇鎴栦慨鏀逛簯绔厤缃�
*/
getCloudConfig (param) {
- param.lang = localStorage.getItem('lang') || ''
+ param.lang = param.lang || sessionStorage.getItem('lang') || ''
param.appkey = window.GLOB.appkey || ''
param.SessionUid = localStorage.getItem('SessionUid') || ''
-
- if (sessionStorage.getItem('CloudUserID') && options.cloudServiceApi) { // 瀛樺湪浜戠鐧诲綍淇℃伅锛屼笖瀛樺湪浜戠鍦板潃
- param.rduri = options.cloudServiceApi
- param.userid = sessionStorage.getItem('CloudUserID')
- param.LoginUID = sessionStorage.getItem('CloudLoginUID') || ''
- } else if (window.GLOB.mainSystemApi) {
- param.rduri = window.GLOB.mainSystemApi
- param.userid = sessionStorage.getItem('UserID')
- param.LoginUID = sessionStorage.getItem('LoginUID') || ''
- } else {
- param.userid = sessionStorage.getItem('UserID')
- param.LoginUID = sessionStorage.getItem('LoginUID') || ''
- }
+ param.userid = sessionStorage.getItem('CloudUserID') || ''
+ param.LoginUID = sessionStorage.getItem('CloudLoginUID') || ''
param = this.encryptParam(param)
+ let url = options.cloudServiceApi ? options.cloudServiceApi : '/webapi/dostars'
+ if (param.func) {
+ url = url + '/' + param.func
+ }
+
return axios({
- url: `/webapi/dostars${param.func ? '/' + param.func : ''}`,
+ url,
method: 'post',
data: param
})
}
/**
- * @description 鑾峰彇浜戠閰嶇疆锛屽苟缂撳瓨淇℃伅
- */
- getCloudCacheConfig (param) {
- param.lang = localStorage.getItem('lang') || ''
- param.appkey = window.GLOB.appkey || ''
- param.SessionUid = localStorage.getItem('SessionUid') || ''
-
- if (sessionStorage.getItem('CloudUserID') && options.cloudServiceApi) { // 瀛樺湪浜戠鐧诲綍淇℃伅锛屼笖瀛樺湪浜戠鍦板潃
- param.rduri = options.cloudServiceApi
- param.userid = sessionStorage.getItem('CloudUserID')
- param.LoginUID = sessionStorage.getItem('CloudLoginUID') || ''
- } else if (window.GLOB.mainSystemApi) {
- param.rduri = window.GLOB.mainSystemApi
- param.userid = sessionStorage.getItem('UserID')
- param.LoginUID = sessionStorage.getItem('LoginUID') || ''
- } else {
- param.userid = sessionStorage.getItem('UserID')
- param.LoginUID = sessionStorage.getItem('LoginUID') || ''
- }
-
- let _param = JSON.parse(JSON.stringify(param)) // 缂撳瓨鏍￠獙锛屽幓闄ゆ椂闂村拰鍔犲瘑瀛楃
- delete _param.timestamp
- delete _param.secretkey
- delete _param.open_key
- _param = JSON.stringify(_param)
- _param = md5(_param)
-
- if (window.GLOB.CacheMap.has(_param)) {
- return Promise.resolve(window.GLOB.CacheMap.get(_param))
- } else {
- param = this.encryptParam(param)
-
- return new Promise(resolve => {
- axios({
- url: `/webapi/dostars${param.func ? '/' + param.func : ''}`,
- method: 'post',
- data: param
- }).then(res => {
- if (res.status) {
- window.GLOB.CacheMap.set(_param, res)
- }
- resolve(res)
- })
- })
- }
- }
-
- /**
* @description 鑾峰彇鎴栦慨鏀圭郴缁熼厤缃紝澧炲姞appkey
*/
getSystemConfig (param) {
- param.userid = sessionStorage.getItem('UserID') || ''
- param.lang = localStorage.getItem('lang') || ''
+ param.userid = param.userid || sessionStorage.getItem('UserID') || ''
+ param.lang = param.lang || sessionStorage.getItem('lang') || ''
param.SessionUid = localStorage.getItem('SessionUid') || ''
- param.LoginUID = sessionStorage.getItem('LoginUID') || ''
+ param.LoginUID = param.LoginUID || sessionStorage.getItem('LoginUID') || ''
param.appkey = window.GLOB.appkey || ''
+ let url = '/webapi/dostars'
if (sessionStorage.getItem('isEditState') === 'true' && options.cloudServiceApi) { // 缂栬緫鐘舵�侊紝涓斿瓨鍦ㄤ簯绔湴鍧�
- param.rduri = options.cloudServiceApi
+ url = options.cloudServiceApi
param.userid = sessionStorage.getItem('CloudUserID') || ''
param.LoginUID = sessionStorage.getItem('CloudLoginUID') || ''
} else if (window.GLOB.mainSystemApi) {
- param.rduri = window.GLOB.mainSystemApi
+ url = window.GLOB.mainSystemApi
}
param = this.encryptParam(param)
return axios({
- url: `/webapi/dostars${param.func ? '/' + param.func : ''}`,
+ url: `${url}${param.func ? '/' + param.func : ''}`,
method: 'post',
data: param
})
@@ -555,16 +474,22 @@
* @description 鑾峰彇鎴栦慨鏀规湰鍦伴厤缃紝澧炲姞appkey
*/
getLocalConfig (param) {
- param.userid = sessionStorage.getItem('UserID') || ''
- param.lang = localStorage.getItem('lang') || ''
+ param.userid = param.userid || sessionStorage.getItem('UserID') || ''
+ param.lang = param.lang || sessionStorage.getItem('lang') || ''
param.SessionUid = localStorage.getItem('SessionUid') || ''
- param.LoginUID = sessionStorage.getItem('LoginUID') || ''
+ param.LoginUID = param.LoginUID || sessionStorage.getItem('LoginUID') || ''
param.appkey = window.GLOB.appkey || ''
+
+ let url = '/webapi/dostars'
+ if (param.rduri) {
+ url = param.rduri
+ delete param.rduri
+ }
param = this.encryptParam(param)
return axios({
- url: `/webapi/dostars${param.func ? '/' + param.func : ''}`,
+ url: `${url}${param.func ? '/' + param.func : ''}`,
method: 'post',
data: param
})
@@ -576,19 +501,20 @@
*/
getCacheConfig (param) {
param.userid = sessionStorage.getItem('UserID') || ''
- param.lang = localStorage.getItem('lang') || ''
+ param.lang = param.lang || sessionStorage.getItem('lang') || ''
param.SessionUid = localStorage.getItem('SessionUid') || ''
param.LoginUID = sessionStorage.getItem('LoginUID') || ''
param.appkey = window.GLOB.appkey || ''
+ let url = '/webapi/dostars'
if (sessionStorage.getItem('isEditState') === 'true') { // 缂栬緫鐘舵�侊紝鍗曠偣鐧诲綍鏈嶅姟鍣ㄤ负浜戠
if (options.cloudServiceApi) { // 瀛樺湪浜戠鍦板潃鏃讹紝浣跨敤浜戠绯荤粺鍙傛暟
- param.rduri = options.cloudServiceApi
+ url = options.cloudServiceApi
param.userid = sessionStorage.getItem('CloudUserID') || ''
param.LoginUID = sessionStorage.getItem('CloudLoginUID') || ''
}
} else if (window.GLOB.mainSystemApi) {
- param.rduri = window.GLOB.mainSystemApi
+ url = window.GLOB.mainSystemApi
}
let _param = JSON.parse(JSON.stringify(param)) // 缂撳瓨鏍￠獙锛屽幓闄ゆ椂闂村拰鍔犲瘑瀛楃
@@ -598,50 +524,49 @@
_param = JSON.stringify(_param)
_param = md5(_param)
- if (mkDataBase) {
- param = this.encryptParam(param)
-
+ if (window.GLOB.WebSql) {
return new Promise(resolve => {
- mkDataBase.transaction(tx => {
- tx.executeSql(`SELECT * FROM CONFIGS WHERE menuid='${param.MenuID}' and userid='${param.userid}'`, [], (tx, results) => {
- let paramItem = results.rows[0]
- if (paramItem) {
- resolve({
- ErrCode: 'S',
- ErrMesg: '',
- LongParam: paramItem.LongParam,
- LongParamUser: paramItem.LongParamUser,
- message: '',
- open_edition: paramItem.openEdition,
- status: true,
- web_edition: paramItem.webEdition
- })
- } else {
- axios({
- url: `/webapi/dostars${param.func ? '/' + param.func : ''}`,
- method: 'post',
- data: param
- }).then(res => {
- if (res.status) {
- this.writeInWebSql([param.MenuID, param.userid, res.open_edition, res.web_edition, res.LongParam, res.LongParamUser])
- }
- resolve(res)
- })
+ 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)
}
- }, (tx, results) => {
- mkDataBase = null
- console.warn(results)
-
- axios({
- url: `/webapi/dostars${param.func ? '/' + param.func : ''}`,
- method: 'post',
- data: param
- }).then(res => {
- 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 => {
+ resolve(res)
+ }, () => {
+ param = this.encryptParam(param)
+ axios({
+ url: `${url}${param.func ? '/' + param.func : ''}`,
+ method: 'post',
+ data: param
+ }).then(res => {
+ if (res.status && window.GLOB.IndexDB) {
+ let msg = {
+ ...res,
+ userid: param.userid,
+ menuid: param.MenuID,
+ id: param.MenuID + param.userid
}
- resolve(res)
- })
+ CacheUtils.writeInIndexDB(msg)
+ } else if (res.status) {
+ window.GLOB.CacheMap.set(_param, res)
+ }
+ resolve(res)
})
})
})
@@ -652,7 +577,7 @@
return new Promise(resolve => {
axios({
- url: `/webapi/dostars${param.func ? '/' + param.func : ''}`,
+ url: `${url}${param.func ? '/' + param.func : ''}`,
method: 'post',
data: param
}).then(res => {
@@ -671,31 +596,19 @@
*/
getLocalCacheConfig (param) {
param.userid = sessionStorage.getItem('UserID') || ''
- param.lang = localStorage.getItem('lang') || ''
+ param.lang = param.lang || sessionStorage.getItem('lang') || ''
param.SessionUid = localStorage.getItem('SessionUid') || ''
param.LoginUID = sessionStorage.getItem('LoginUID') || ''
param.appkey = window.GLOB.appkey || ''
- if (window.GLOB.mainSystemApi) {
- param.rduri = window.GLOB.mainSystemApi
- }
-
let _param = md5(JSON.stringify(param))
- if (mkDataBase) {
+ if (window.GLOB.WebSql) {
return new Promise(resolve => {
- mkDataBase.transaction(tx => {
- tx.executeSql(`SELECT * FROM CONFIGS WHERE menuid='${param.MenuID}' and userid='${param.userid}'`, [], (tx, results) => {
- let paramItem = results.rows[0]
- if (paramItem) {
- resolve({ ErrCode: 'S', ErrMesg: '', LongParam: paramItem.LongParam, message: '', status: true })
- } else {
- resolve({ ErrCode: 'S', ErrMesg: '', LongParam: '', message: '', status: false })
- }
- }, (tx, results) => {
- mkDataBase = null
- resolve({ErrCode: 'S', ErrMesg: '', LongParam: '', message: '', status: false})
- })
+ 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)) {
@@ -703,16 +616,6 @@
} else {
return Promise.resolve({ErrCode: 'S', ErrMesg: '', LongParam: '', message: '', status: false})
}
- }
-
- /**
- * @description 灏嗘暟鎹啓鍏ebsql
- */
- writeInWebSql (data) {
- if (!mkDataBase) return
- mkDataBase.transaction(tx => {
- tx.executeSql('INSERT INTO CONFIGS (menuid, userid, openEdition, webEdition, LongParam, LongParamUser) VALUES (?, ?, ?, ?, ?, ?)', data)
- })
}
/**
@@ -746,10 +649,16 @@
*/
getSystemCacheConfig (param) {
param.userid = param.userid || sessionStorage.getItem('UserID') || ''
- param.lang = localStorage.getItem('lang') || ''
+ param.lang = param.lang || sessionStorage.getItem('lang') || ''
param.SessionUid = localStorage.getItem('SessionUid') || ''
param.LoginUID = param.LoginUID || sessionStorage.getItem('LoginUID') || ''
param.appkey = window.GLOB.appkey || ''
+
+ let url = '/webapi/dostars'
+ if (param.rduri) {
+ url = param.rduri
+ delete param.rduri
+ }
let _param = JSON.parse(JSON.stringify(param)) // 缂撳瓨鏍￠獙锛屽幓闄ゆ椂闂村拰鍔犲瘑瀛楃
delete _param.timestamp
@@ -765,7 +674,7 @@
return new Promise(resolve => {
axios({
- url: `/webapi/dostars${param.func ? '/' + param.func : ''}`,
+ url: `${url}${param.func ? '/' + param.func : ''}`,
method: 'post',
data: param
}).then(res => {
@@ -782,16 +691,23 @@
* @description 鑾峰彇涓氬姟閫氱敤鎺ュ彛
*/
genericInterface (param) {
- param.userid = sessionStorage.getItem('UserID')
- param.lang = localStorage.getItem('lang') || ''
+ 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 || ''
if (options.cloudServiceApi && param.rduri === options.cloudServiceApi) { // HS涓嬭彍鍗�
- param.userid = sessionStorage.getItem('CloudUserID') || ''
- param.LoginUID = sessionStorage.getItem('CloudLoginUID') || ''
+ param.userid = sessionStorage.getItem('CloudUserID') || param.userid || ''
+ param.LoginUID = sessionStorage.getItem('CloudLoginUID') || param.LoginUID || ''
}
+
+ // 寰呬紭鍖栵紝澧炲姞鏄惁鏀寔璺ㄥ煙璇锋眰
+ // let url = '/webapi/dostars'
+ // if (param.rduri) {
+ // url = param.rduri
+ // delete param.rduri
+ // }
param = this.encryptParam(param)
@@ -807,7 +723,7 @@
*/
getExcelOut (param, name) {
param.userid = sessionStorage.getItem('UserID')
- param.lang = localStorage.getItem('lang') || ''
+ param.lang = sessionStorage.getItem('lang') || ''
param.SessionUid = localStorage.getItem('SessionUid') || ''
param.LoginUID = sessionStorage.getItem('LoginUID') || ''
param.appkey = window.GLOB.appkey || ''
@@ -819,7 +735,6 @@
method: 'post',
data: param
}).then(res => {
-
try {
const blob = new Blob([res])
@@ -861,7 +776,7 @@
fileuploadbase64 (param) {
param.func = ''
param.BasePath = 'Content/Upload'
- param.lang = localStorage.getItem('lang') || ''
+ param.lang = sessionStorage.getItem('lang') || ''
param.appkey = window.GLOB.appkey || ''
param.SessionUid = localStorage.getItem('SessionUid') || ''
@@ -871,10 +786,11 @@
param = this.encryptParam(param)
if (param.rduri) {
- param.rduri = param.rduri.replace(/webapi(.*)$/, 'webapi/SaveBase64Image')
+ let url = param.rduri.replace(/webapi(.*)$/, 'webapi/SaveBase64Image')
+ delete param.rduri
return axios({
- url: '/webapi/dostars',
+ url,
method: 'post',
data: param
})
--
Gitblit v1.8.0