From 08929dbc66fb157307921026974c459f762209e2 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期四, 25 二月 2021 15:31:24 +0800 Subject: [PATCH] 2021-02-25 --- src/api/index.js | 745 +++++++++++++++++++++++++++++--------------------------- 1 files changed, 384 insertions(+), 361 deletions(-) diff --git a/src/api/index.js b/src/api/index.js index bae643c..f84456f 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -4,32 +4,21 @@ import md5 from 'md5' import moment from 'moment' import Utils from '@/utils/utils.js' +import CacheUtils from './cacheutils' import options from '@/store/options.js' -let mkDB = 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.GLOB.webSqlUsable) { - let service = window.GLOB.service ? '-' + window.GLOB.service.replace('/', '') : '' - try { - mkDB = openDatabase(`mkdb${service}`, '1', 'mk-pc-database', 50 * 1024 * 1024) - mkDB.transaction(tx => { - tx.executeSql('CREATE TABLE IF NOT EXISTS VERSIONS (id unique, version 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 (id unique, 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' - }) - }) - } catch (e) { - console.warn(e) - mkDB = null - } +if (window.openDatabase) { + CacheUtils.openWebSql() +} else if (window.indexedDB) { + CacheUtils.openIndexDB() } axios.defaults.crossDomain = true @@ -37,13 +26,11 @@ axios.defaults.withCredentials = true axios.interceptors.request.use((config) => { - config.method = 'post' 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 { - // config.headers.token = sessionStorage.getItem('TOKEN') || '' + } else if (config.method === 'post') { config.data = JSON.stringify(config.data) } @@ -52,31 +39,42 @@ return Promise.reject(error) }) -const setCurrentUrl = () => { +const setCurrentUrl = (res) => { if (!!(window.history && window.history.pushState)) { + if (window.location.href.indexOf('paramsmain') > -1) { + let _href = window.location.href.split('#') + localStorage.setItem(_href[0] + 'paramsmain', _href[1]) + } + sessionStorage.clear() + sessionStorage.setItem('loginError', JSON.stringify({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() } } -window.GLOB.CacheMap = new Map() - axios.interceptors.response.use((response) => { if (response.data.ErrCode === 'LoginError') { - setCurrentUrl() + if (window.debugger === true) { + response.data.ErrCode = 'E' + return Promise.resolve(response.data) + } else { + setCurrentUrl(response) + } } else { return Promise.resolve(response.data) } }, (error) => { - notification.error({ - className: 'notification-custom-error', - bottom: 0, - message: '鐘舵�佺爜-' + error.response.status + '锛岃鑱旂郴绠$悊鍛�', - placement: 'bottomRight', - duration: 15 - }) - return Promise.reject(error) + if (error && error.response) { + notification.error({ + className: 'notification-custom-error', + bottom: 0, + message: '鐘舵�佺爜-' + error.response.status + '锛岃鑱旂郴绠$悊鍛�', + placement: 'bottomRight', + duration: 15 + }) + } + return Promise.reject(error.response) }) class Api { @@ -97,8 +95,34 @@ return axios({ url: '/webapi/dostar', + method: 'post', data: param }) + } + + /** + * @description 鐩存帴璇锋眰 + * @param {Object} param 鏌ヨ鍙婃彁浜ゅ弬鏁� + */ + directRequest (url, method = 'post', param) { + let params = { method: 'post' } + let _url = url + + if (method === 'get' && param) { + let keys = Object.keys(param).map(key => `${key}=${param[key]}`) + keys = keys.join('&') + if (keys) { + _url = _url + '?' + keys + } + } else if (method === 'post' && param) { + params.data = param + } + + _url = _url.replace(/&/ig, '%26') + // _url = window.btoa(_url) + params.url = '/trans/redirect?rd=' + _url + '&method=' + method + + return axios(params) } /** @@ -109,23 +133,11 @@ param.userid = param.userid || sessionStorage.getItem('UserID') || '' param.LoginUID = param.LoginUID || sessionStorage.getItem('LoginUID') || '' - param.nonc = Utils.getuuid() - - let keys = Object.keys(param).sort() - let values = '' - keys.forEach(key => { - if (key === 'rduri' || key === 't') return - if (typeof(param[key]) === 'object') { - values += key + JSON.stringify(param[key]) - } else { - values += key + param[key] - } - }) - param.sign = md5(values) - param.t = new Date().getTime() + param = this.encryptParam(param) return axios({ url: '/webapi/dostar', + method: 'post', data: param }) } @@ -143,7 +155,7 @@ let param = { func: 's_visitor_login', - timestamp: moment().format('YYYY-MM-DD HH:mm:ss') + '.000', + timestamp: moment().format('YYYY-MM-DD HH:mm:ss'), SessionUid: _SessionUid, TypeCharOne: 'pc' } @@ -159,6 +171,7 @@ return axios({ url: '/webapi/dologon', + method: 'post', data: param }) } @@ -184,12 +197,16 @@ if (options.cloudServiceApi) { 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 + } param.rduri = window.GLOB.mainSystemApi.replace(/\/webapi(.*)/, '/webapi/dologon') } return axios({ url: '/webapi/dologon', + method: 'post', data: param }) } @@ -214,97 +231,155 @@ if (options.cloudServiceApi) { 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 + } param.rduri = window.GLOB.mainSystemApi.replace(/\/webapi(.*)/, '/webapi/dologon') } return axios({ url: '/webapi/dologon', + method: 'post', data: param }) } /** - * @description 鑾峰彇绯荤粺鍩烘湰璁剧疆锛屽惎鐢ㄦ垨鏇存柊websql + * @description 鑾峰彇绯荤粺鐗堟湰淇℃伅锛屽惎鐢ㄦ垨鏇存柊websql */ - getSystemStyle () { - // 鑾峰彇绯荤粺淇℃伅 - let param = { - func: 's_Get_style', - TypeCharOne: 'PC', - LText: `select '${window.GLOB.appkey}'`, + getAppVersion (_resolve, _reject) { + let appVersion = {} + if (!window.GLOB.WebSql && !window.GLOB.IndexDB) { + return Promise.reject() } - param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') + '.000' - param.secretkey = Utils.encrypt(param.LText, param.timestamp) - - 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.nonc = Utils.getuuid() - - let keys = Object.keys(param).sort() - let values = '' - keys.forEach(key => { - if (key === 'rduri' || key === 't') return - if (typeof(param[key]) === 'object') { - values += key + JSON.stringify(param[key]) - } else { - values += key + param[key] - } - }) - param.sign = md5(values) - param.t = new Date().getTime() - - return new Promise(resolve => { - axios({ - url: `/webapi/dostars${param.func ? '/' + param.func : ''}`, - data: param - }).then(res => { - if (mkDB) { - let version = res.app_version ? `${res.app_version}` : '1' - // mkDB.transaction(tx => { - // tx.executeSql('DROP TABLE CONFIGS') - // }) - - mkDB.transaction(tx => { - tx.executeSql('SELECT * FROM VERSIONS', [], (tx, results) => { - if (results.rows.length === 0) { - tx.executeSql('INSERT INTO VERSIONS (id, version) VALUES (?, ?)', ['pc', version]) - tx.executeSql('DELETE FROM CONFIGS') - } else if (results.rows.length === 1) { - let _ver = results.rows[0] - if (version !== _ver.version) { - tx.executeSql(`UPDATE VERSIONS SET version=${version}`) - tx.executeSql('DELETE FROM CONFIGS') + 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 } - } else if (results.rows.length > 1) { - tx.executeSql('DELETE FROM VERSIONS') - tx.executeSql('INSERT INTO VERSIONS (id, version) VALUES (?, ?)', ['pc', version]) - tx.executeSql('DELETE FROM CONFIGS') + }) + + if (clear) { + CacheUtils.clearWebSqlConfig() + } else { + let keys = res.menu_data.map(mid => `'${mid.menuid}'`).join(',') + CacheUtils.delWebSqlConfig(keys) } - }, (tx, results) => { - console.warn(results) - }) + } + + if (msg.version) { + CacheUtils.updateWebSqlTime(curTime) + } else { + CacheUtils.createWebSqlversion(version, curTime) + } + + resolve(appVersion) }) - } - resolve(res) + }, () => { + 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 if (res.menu_data && res.menu_data.length > 0) { + 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) { + 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) { + if (window.GLOB.IndexDB) { + let key = menuId + (sessionStorage.getItem('UserID') || '') + + if (sessionStorage.getItem('isEditState') === 'true' && options.cloudServiceApi) { + key = menuId + (sessionStorage.getItem('CloudUserID') || '') + } + + 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') || '' @@ -321,25 +396,61 @@ param.LoginUID = sessionStorage.getItem('LoginUID') || '' } - param.nonc = Utils.getuuid() - - let keys = Object.keys(param).sort() - let values = '' - keys.forEach(key => { - if (key === 'rduri' || key === 't') return - if (typeof(param[key]) === 'object') { - values += key + JSON.stringify(param[key]) - } else { - values += key + param[key] - } - }) - param.sign = md5(values) - param.t = new Date().getTime() + param = this.encryptParam(param) return axios({ url: `/webapi/dostars${param.func ? '/' + param.func : ''}`, + method: 'post', data: param }) + } + + /** + * @description 鑾峰彇浜戠閰嶇疆锛屽苟缂撳瓨淇℃伅 + */ + getCloudCacheConfig (param) { + 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') || '' + } + + 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) + }) + }) + } } /** @@ -347,7 +458,7 @@ */ getSystemConfig (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 || '' @@ -360,23 +471,11 @@ param.rduri = window.GLOB.mainSystemApi } - param.nonc = Utils.getuuid() - - let keys = Object.keys(param).sort() - let values = '' - keys.forEach(key => { - if (key === 'rduri' || key === 't') return - if (typeof(param[key]) === 'object') { - values += key + JSON.stringify(param[key]) - } else { - values += key + param[key] - } - }) - param.sign = md5(values) - param.t = new Date().getTime() + param = this.encryptParam(param) return axios({ url: `/webapi/dostars${param.func ? '/' + param.func : ''}`, + method: 'post', data: param }) } @@ -385,29 +484,17 @@ * @description 鑾峰彇鎴栦慨鏀规湰鍦伴厤缃紝澧炲姞appkey */ getLocalConfig (param) { - param.userid = sessionStorage.getItem('UserID') - param.lang = localStorage.getItem('lang') || '' + param.userid = sessionStorage.getItem('UserID') || '' + param.lang = param.lang || sessionStorage.getItem('lang') || '' param.SessionUid = localStorage.getItem('SessionUid') || '' param.LoginUID = sessionStorage.getItem('LoginUID') || '' param.appkey = window.GLOB.appkey || '' - param.nonc = Utils.getuuid() - - let keys = Object.keys(param).sort() - let values = '' - keys.forEach(key => { - if (key === 'rduri' || key === 't') return - if (typeof(param[key]) === 'object') { - values += key + JSON.stringify(param[key]) - } else { - values += key + param[key] - } - }) - param.sign = md5(values) - param.t = new Date().getTime() + param = this.encryptParam(param) return axios({ url: `/webapi/dostars${param.func ? '/' + param.func : ''}`, + method: 'post', data: param }) } @@ -418,7 +505,7 @@ */ 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 || '' @@ -440,84 +527,61 @@ _param = JSON.stringify(_param) _param = md5(_param) - if (mkDB) { - param.nonc = Utils.getuuid() - - let keys = Object.keys(param).sort() - let values = '' - keys.forEach(key => { - if (key === 'rduri' || key === 't') return - if (typeof(param[key]) === 'object') { - values += key + JSON.stringify(param[key]) - } else { - values += key + param[key] - } - }) - param.sign = md5(values) - param.t = new Date().getTime() - + if (window.GLOB.WebSql) { return new Promise(resolve => { - mkDB.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 : ''}`, - data: param - }).then(res => { - if (res.status) { - this.writeInWebSql([param.MenuID, 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: `/webapi/dostars${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) => { - axios({ - url: `/webapi/dostars${param.func ? '/' + param.func : ''}`, - 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: `/webapi/dostars${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) - }) - mkDB = null - console.warn(results) + CacheUtils.writeInIndexDB(msg) + } else if (res.status) { + window.GLOB.CacheMap.set(_param, res) + } + resolve(res) }) }) }) } else if (window.GLOB.CacheMap.has(_param)) { return Promise.resolve(window.GLOB.CacheMap.get(_param)) } else { - param.nonc = Utils.getuuid() - - let keys = Object.keys(param).sort() - let values = '' - keys.forEach(key => { - if (key === 'rduri' || key === 't') return - if (typeof(param[key]) === 'object') { - values += key + JSON.stringify(param[key]) - } else { - values += key + param[key] - } - }) - param.sign = md5(values) - param.t = new Date().getTime() + 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) { @@ -530,13 +594,59 @@ } /** - * @description 灏嗘暟鎹啓鍏ebsql + * @description 鑾峰彇鏈湴绯荤粺閰嶇疆 + * @param {Object} param 璇锋眰鍙傛暟 */ - writeInWebSql (data) { - if (!mkDB) return - mkDB.transaction(tx => { - tx.executeSql('INSERT INTO CONFIGS (id, menuid, userid, openEdition, webEdition, LongParam, LongParamUser) VALUES (?, ?, ?, ?, ?, ?, ?)', data) + getLocalCacheConfig (param) { + param.userid = sessionStorage.getItem('UserID') || '' + 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 (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)) { + return Promise.resolve(window.GLOB.CacheMap.get(_param)) + } else { + return Promise.resolve({ErrCode: 'S', ErrMesg: '', LongParam: '', message: '', status: false}) + } + } + + /** + * @description dostars 鍙傛暟鍔犲瘑 + */ + encryptParam (param) { + param.nonc = Utils.getuuid() + + let keys = Object.keys(param).sort() + let values = '' + keys.forEach(key => { + if (key === 'rduri' || key === 't') return + if (param[key] === undefined) { + delete param[key] + } else if (typeof(param[key]) === 'object') { + values += key + JSON.stringify(param[key]) + } else { + values += key + param[key] + } }) + param.sign = md5(values) + param.t = new Date().getTime() + + return param } /** @@ -544,22 +654,12 @@ * @param {Object} param 璇锋眰鍙傛暟 * @param {Boolean} SSO 鏄惁涓哄崟鐐圭櫥褰曞湴鍧� */ - getSystemCacheConfig (param, SSO = true) { - param.userid = sessionStorage.getItem('UserID') || '' - param.lang = localStorage.getItem('lang') || '' + getSystemCacheConfig (param) { + 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 || '' - - if (sessionStorage.getItem('isEditState') === 'true' && SSO) { // 缂栬緫鐘舵�侊紝鍗曠偣鐧诲綍鏈嶅姟鍣ㄤ负浜戠 - if (options.cloudServiceApi) { // 瀛樺湪浜戠鍦板潃鏃讹紝浣跨敤浜戠绯荤粺鍙傛暟 - param.rduri = options.cloudServiceApi - param.userid = sessionStorage.getItem('CloudUserID') || '' - param.LoginUID = sessionStorage.getItem('CloudLoginUID') || '' - } - } else if (window.GLOB.mainSystemApi && SSO) { - param.rduri = window.GLOB.mainSystemApi - } let _param = JSON.parse(JSON.stringify(param)) // 缂撳瓨鏍¢獙锛屽幓闄ゆ椂闂村拰鍔犲瘑瀛楃 delete _param.timestamp @@ -571,24 +671,12 @@ if (window.GLOB.CacheMap.has(_param)) { return Promise.resolve(window.GLOB.CacheMap.get(_param)) } else { - param.nonc = Utils.getuuid() - - let keys = Object.keys(param).sort() - let values = '' - keys.forEach(key => { - if (key === 'rduri' || key === 't') return - if (typeof(param[key]) === 'object') { - values += key + JSON.stringify(param[key]) - } else { - values += key + param[key] - } - }) - param.sign = md5(values) - param.t = new Date().getTime() + 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) { @@ -605,33 +693,21 @@ */ genericInterface (param) { 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 || '' - if (sessionStorage.getItem('isEditState') === 'true') { // HS涓嬭彍鍗� - param.userid = sessionStorage.getItem('CloudUserID') + if (options.cloudServiceApi && param.rduri === options.cloudServiceApi) { // HS涓嬭彍鍗� + param.userid = sessionStorage.getItem('CloudUserID') || '' param.LoginUID = sessionStorage.getItem('CloudLoginUID') || '' } - param.nonc = Utils.getuuid() - - let keys = Object.keys(param).sort() - let values = '' - keys.forEach(key => { - if (key === 'rduri' || key === 't') return - if (typeof(param[key]) === 'object') { - values += key + JSON.stringify(param[key]) - } else { - values += key + param[key] - } - }) - param.sign = md5(values) - param.t = new Date().getTime() + param = this.encryptParam(param) return axios({ url: `/webapi/dostars${param.func ? '/' + param.func : ''}`, + method: 'post', data: param }) } @@ -641,7 +717,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 || '' @@ -650,6 +726,7 @@ axios({ url: '/webapi/doexcel', responseType: 'blob', + method: 'post', data: param }).then(res => { @@ -691,54 +768,30 @@ * @description 涓婁紶base64 * @param {String} base64 base64鍥剧墖缂栫爜 */ - fileuploadbase64 (base64, service = 'local') { - let param = { - func: '', - BasePath: 'Content/Upload', - lang: localStorage.getItem('lang') || '', - appkey: window.GLOB.appkey || '', - Base64Img: base64 - } + fileuploadbase64 (param) { + param.func = '' + param.BasePath = 'Content/Upload' + param.lang = sessionStorage.getItem('lang') || '' + param.appkey = window.GLOB.appkey || '' param.SessionUid = localStorage.getItem('SessionUid') || '' - if (service === 'sso' && window.GLOB.mainSystemApi) { - param.rduri = window.GLOB.mainSystemApi - param.userid = sessionStorage.getItem('UserID') - param.LoginUID = sessionStorage.getItem('LoginUID') || '' - } else if (service === 'cloud' && options.cloudServiceApi) { - param.rduri = options.cloudServiceApi - param.userid = sessionStorage.getItem('CloudUserID') - param.LoginUID = sessionStorage.getItem('CloudLoginUID') || '' - } else { - param.userid = sessionStorage.getItem('UserID') - param.LoginUID = sessionStorage.getItem('LoginUID') || '' - } + param.userid = param.userid || sessionStorage.getItem('UserID') || '' + param.LoginUID = param.LoginUID || sessionStorage.getItem('LoginUID') || '' - param.nonc = Utils.getuuid() - - let keys = Object.keys(param).sort() - let values = '' - keys.forEach(key => { - if (key === 'rduri' || key === 't') return - if (typeof(param[key]) === 'object') { - values += key + JSON.stringify(param[key]) - } else { - values += key + param[key] - } - }) - param.sign = md5(values) - param.t = new Date().getTime() + param = this.encryptParam(param) if (param.rduri) { param.rduri = param.rduri.replace(/webapi(.*)$/, 'webapi/SaveBase64Image') return axios({ url: '/webapi/dostars', + method: 'post', data: param }) } else { return axios({ url: '/webapi/SaveBase64Image', + method: 'post', data: param }) } @@ -750,6 +803,7 @@ getLargeFileUpload (param) { return axios({ url: '/webapi/doupload', + method: 'post', data: param }) } @@ -760,6 +814,7 @@ getFilePreUpload (param) { return axios({ url: '/webapi/dopreload', + method: 'post', data: param }) } @@ -770,53 +825,21 @@ getWxNativePay (param) { return axios({ url: '/wxpay/wxNativePay', + method: 'post', data: param }) } - /** - * @description 鏂囦欢涓婁紶 - */ - getFileUpload (param) { - return axios({ - url: '/zh-CN/Home/Upload', - data: param - }) - } - - /** - * @description 閫氱敤鎺ュ彛(鏁版嵁绠$悊) - * @param {Object} param 鏌ヨ鍙婃彁浜ゅ弬鏁� - */ - commonInterface (param) { - param.userid = sessionStorage.getItem('UserID') - param.lang = localStorage.getItem('lang') || '' - param.SessionUid = localStorage.getItem('SessionUid') || '' - param.LoginUID = sessionStorage.getItem('LoginUID') || '' - param.BID = param.BID || '' - param.debug = param.debug || '' - - return axios({ - url: '/webapi/dostar', - data: param - }) - } - - /** - * @description 閫氱敤鎺ュ彛(鎻愪氦)(鏁版嵁绠$悊) - * @param {Object} param 鏌ヨ鍙婃彁浜ゅ弬鏁� - */ - submitInterface (param) { - param.userid = sessionStorage.getItem('UserID') - param.lang = localStorage.getItem('lang') || '' - param.SessionUid = localStorage.getItem('SessionUid') || '' - param.LoginUID = sessionStorage.getItem('LoginUID') || '' - - return axios({ - url: '/webapi/dostar', - data: param - }) - } + // /** + // * @description 鏂囦欢涓婁紶 + // */ + // getFileUpload (param) { + // return axios({ + // url: '/zh-CN/Home/Upload', + // method: 'post', + // data: param + // }) + // } } export default new Api() \ No newline at end of file -- Gitblit v1.8.0