From cbeffcc0902631909c0373f274752a97ddaf2d4e Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 06 八月 2022 01:41:54 +0800
Subject: [PATCH] 2022-08-06
---
src/api/index.js | 443 ++++++++++++++++++++++++++++++++++--------------------
1 files changed, 278 insertions(+), 165 deletions(-)
diff --git a/src/api/index.js b/src/api/index.js
index cc33aa0..1487f05 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -2,6 +2,7 @@
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'
@@ -13,24 +14,24 @@
1585192949946f3et2ts8tn82krmumdf,15855615451212m12ip23vpcm79kloro,1587005717541lov40vg61q7l1rbveon,1590458676585agbbr63t6ihighg2i1g,1602315375262ikd33ii0nii34pt861o,1582771068837vsv54a089lgp45migbg,
1582777675954ifu05upurs465omoth7,158294809668898cklbv6c5bou8e1fpu,1584676379094iktph45fb8imhg96bql,1584695125339vo5g7iqgfn01qmrd6s2,1584699661372vhmpp9dn9foo0eob722,15848421131551gg04ie8sitsd3f7467,
1589782279158ngr675kk3oksin35sul,1589788042787ffdt9hle4s45k9r1nvs,15900310928174dro07ihfckghpb5h13,1594095599055qicg2eb642v5qglhnuo,1599613340050c8nu6rbst9d4emnnbsq,1577972969199lei1g0qkvlh4tkc908m,
- 1578479100252lfbp29v1kafk4s4q4ig,1577971621421tg4v0i1ur8873k7e0ob,1577929944419lgc5h3hepum765e2k7u,1588493493409k9guqp067d31lu7blsv`
+ 1578479100252lfbp29v1kafk4s4q4ig,1577971621421tg4v0i1ur8873k7e0ob,1577929944419lgc5h3hepum765e2k7u,1588493493409k9guqp067d31lu7blsv,15827879285193g85m3i2uprektpgmpf`
if (window.openDatabase) {
- CacheUtils.openWebSql()
+ CacheUtils.openWebSql(options.sysType)
} else if (window.indexedDB) {
- CacheUtils.openIndexDB()
+ CacheUtils.openIndexDB(options.sysType)
}
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')) {
+ } else if (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)
}
@@ -47,7 +48,7 @@
}
sessionStorage.clear()
- sessionStorage.setItem('loginError', JSON.stringify({request: res.config ? res.config.data : '', response: JSON.stringify(res.data)}))
+ 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()
}
@@ -58,23 +59,29 @@
if (window.debugger === true) {
response.data.ErrCode = 'E'
return Promise.resolve(response.data)
- } else {
+ } else if (!sessionStorage.getItem('loginError')) {
setCurrentUrl(response)
}
} else {
return Promise.resolve(response.data)
}
}, (error) => {
- if (error && error.response) {
- notification.error({
- className: 'notification-custom-error',
- bottom: 0,
- message: '鐘舵�佺爜-' + error.response.status + '锛岃鑱旂郴绠＄悊鍛�',
- placement: 'bottomRight',
- duration: 15
- })
+ 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()
}
- return Promise.reject(error.response)
})
class Api {
@@ -82,7 +89,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
}
}
@@ -101,10 +108,86 @@
}
/**
+ * @description 寰俊涓氬姟璇锋眰
+ */
+ wxAccessToken () {
+ let _url = document.location.origin + '/' + window.GLOB.service + 'wxpay/getaccesstoken'
+ if (process.env.NODE_ENV !== 'production') {
+ _url = document.location.origin + '/wxpay/getaccesstoken'
+ }
+
+ return new Promise(resolve => {
+ if (window.GLOB.accessToken.accessTime && (parseInt(new Date().getTime() / 1000) - window.GLOB.accessToken.accessTime < 30)) {
+ resolve(window.GLOB.accessToken)
+ } else {
+ window.GLOB.accessToken = {}
+ axios({
+ url: _url,
+ method: 'get'
+ }).then(res => {
+ if (res.oa_access_token || res.mini_access_token) {
+ window.GLOB.accessToken.accessTime = parseInt(new Date().getTime() / 1000)
+ window.GLOB.accessToken.oa_access_token = res.oa_access_token
+ window.GLOB.accessToken.mini_access_token = res.mini_access_token
+ }
+ resolve(res)
+ })
+ }
+ })
+ }
+
+ /**
+ * @description 寰俊涓氬姟璇锋眰
+ */
+ wxNginxRequest (url, method, param) {
+ let _url = window.GLOB.location + '/' + url
+ if (process.env.NODE_ENV === 'production') {
+ _url = document.location.origin + '/' + url
+ }
+ if (/^http:\/\/(qingqiumarket.cn|cloud.mk9h.cn|sso.mk9h.cn)/.test(_url)) {
+ _url = window.GLOB.location + ':8080/' + url
+ if (process.env.NODE_ENV === 'production') {
+ _url = document.location.origin + ':8080/' + url
+ }
+ } else if (/^https:\/\/(qingqiumarket.cn|cloud.mk9h.cn|sso.mk9h.cn)/.test(_url)) {
+ _url = window.GLOB.location + ':8443/' + url
+ if (process.env.NODE_ENV === 'production') {
+ _url = document.location.origin + ':8443/' + url
+ }
+ }
+
+ if (param) {
+ return axios({
+ url: _url,
+ method,
+ data: param
+ })
+ }
+
+ return axios({
+ url: _url,
+ method
+ })
+ }
+
+ /**
* @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
@@ -119,33 +202,15 @@
}
_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
- })
- }
-
- /**
* @description 娓稿鐧诲綍
*/
- getTouristMsg () {
+ getTouristMsg (appid, openid, memberid, scanId) {
let _SessionUid = localStorage.getItem('SessionUid')
if (!_SessionUid) { // 鎵嬪姩娓呴櫎SessionUid鏃讹紝瀹炴椂鐢熸垚
@@ -157,7 +222,8 @@
func: 's_visitor_login',
timestamp: moment().format('YYYY-MM-DD HH:mm:ss'),
SessionUid: _SessionUid,
- TypeCharOne: 'pc'
+ TypeCharOne: 'pc',
+ kei_id: window.btoa(window.encodeURIComponent(window.GLOB.host))
}
param.LText = md5(window.btoa(_SessionUid + param.timestamp))
@@ -165,12 +231,21 @@
param.appkey = window.GLOB.appkey || ''
+ if (appid) {
+ param.binding_type = 'mk'
+ param.thd_party_member_id = memberid
+ param.thd_party_openid = openid
+ param.thd_party_appid = appid
+ param.id = scanId
+ }
+
+ let url = '/webapi/dologon/s_visitor_login'
if (window.GLOB.mainSystemApi) {
- param.rduri = window.GLOB.mainSystemApi.replace(/\/webapi(.*)/, '/webapi/dologon')
+ param.rduri = window.GLOB.mainSystemApi.replace(/\/webapi(.*)/, '/webapi/dologon/s_visitor_login')
}
return axios({
- url: '/webapi/dologon',
+ url: url,
method: 'post',
data: param
})
@@ -179,7 +254,7 @@
/**
* @description 鎵嬫満鍙烽獙璇佺爜鐧诲綍
*/
- getphoneusermsg (phoneNo, checkcode, isCloud = false) {
+ getphoneusermsg (phoneNo, checkcode, isCloud = false, ipAddress, city) {
let param = {
// func: 'webapi_login',
mob: phoneNo,
@@ -187,11 +262,16 @@
Password: '',
check_code: checkcode,
way_no: 'sms_vcode',
- systemType: options.sysType
+ systemType: options.sysType,
+ login_city: city,
+ login_id_address: ipAddress,
+ kei_id: window.btoa(window.encodeURIComponent(window.GLOB.host)),
+ device_id: localStorage.getItem('SessionUid')
}
param.appkey = window.GLOB.appkey || ''
+ let url = '/webapi/dologon'
if (isCloud) {
param.debug = 'Y'
if (options.cloudServiceApi) {
@@ -205,7 +285,7 @@
}
return axios({
- url: '/webapi/dologon',
+ url,
method: 'post',
data: param
})
@@ -214,32 +294,62 @@
/**
* @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,
+ kei_id: window.btoa(window.encodeURIComponent(window.GLOB.host)),
+ device_id: localStorage.getItem('SessionUid')
}
- param.Password = Utils.formatOptions(param.Password)
+ param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
+
+ 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' 鏃�
+ let shaObj = new jsSHA('SHA-1', 'TEXT')
+ shaObj.update(password)
+ param.Password = shaObj.getHash('HEX').toUpperCase()
+ param.Password = md5(username + param.Password + param.timestamp)
+
+ // Type: 'mk_' 鏃�
+ // param.Type = '鍏挜'
+ // let shaObj = new jsSHA('SHA-1', 'TEXT')
+ // 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 (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
})
@@ -249,19 +359,29 @@
* @description 鑾峰彇绯荤粺鐗堟湰淇℃伅锛屽惎鐢ㄦ垨鏇存柊websql
*/
getAppVersion (_resolve, _reject) {
- let appVersion = {}
if (!window.GLOB.WebSql && !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)
+ curTime = moment(sys_datetime, 'YYYY-MM-DD HH:mm:ss').add(seconds, 'seconds').format('YYYY-MM-DD HH:mm:ss') + '.000'
}
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 modifydate = msg.createDate || curTime
+ if (modifydate.indexOf('Invalid date') > -1) {
+ modifydate = curTime
+ }
+
let param = {
func: 's_get_app_version',
- modifydate: msg.createDate || curTime,
+ modifydate
}
this.getSystemConfig(param).then(res => {
@@ -270,9 +390,7 @@
return
}
let clear = false
- let version = res.app_version || '1.00'
- appVersion.newVersion = version
- appVersion.oldVersion = appVersion.oldVersion || version
+ let version = '1.00'
if (res.menu_data && res.menu_data.length > 0) {
res.menu_data.forEach(mid => {
@@ -295,7 +413,7 @@
CacheUtils.createWebSqlversion(version, curTime)
}
- resolve(appVersion)
+ resolve()
})
}, () => {
reject()
@@ -304,11 +422,13 @@
} 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 modifydate = msg.createDate || curTime
+ if (modifydate.indexOf('Invalid date') > -1) {
+ modifydate = curTime
+ }
let param = {
func: 's_get_app_version',
- modifydate: msg.createDate || curTime,
+ modifydate
}
this.getSystemConfig(param).then(res => {
@@ -317,9 +437,7 @@
return
}
let clear = false
- let version = res.app_version || '1.00'
- appVersion.newVersion = version
- appVersion.oldVersion = appVersion.oldVersion || version
+ let version = '1.00'
if (res.menu_data && res.menu_data.length > 0) {
res.menu_data.forEach(mid => {
@@ -336,9 +454,9 @@
}
}
- CacheUtils.updateIndexDBversion({version: appVersion.oldVersion, createDate: curTime})
+ CacheUtils.updateIndexDBversion({version: version, createDate: curTime})
- resolve(appVersion)
+ resolve()
})
}, () => {
reject()
@@ -350,12 +468,13 @@
/**
* @description 鏇存柊绯荤粺鐗堟湰淇℃伅锛屾竻绌洪厤缃俊鎭�
*/
- updateAppVersion (newVersion) {
+ updateAppVersion () {
let curTime = moment().format('YYYY-MM-DD HH:mm:ss') + '.000'
CacheUtils.clearWebSqlConfig()
- CacheUtils.updateWebSqlversion(newVersion, curTime)
+ CacheUtils.updateWebSqlversion('1.00', curTime)
CacheUtils.clearIndexDBConfig()
- CacheUtils.updateIndexDBversion({version: newVersion, createDate: curTime})
+ CacheUtils.updateIndexDBversion({version: '1.00', createDate: curTime})
+ CacheUtils.clearFuncs(options.sysType)
}
/**
@@ -382,99 +501,70 @@
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 鑾峰彇浜戠閰嶇疆锛屽苟缂撳瓨淇℃伅
+ * @description 鑾峰彇鎴栦慨鏀圭郴缁熼厤缃紝澧炲姞appkey
*/
- 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') || ''
+ getSystemFuncs (time) {
+ let param = {
+ func: 's_get_func_base_sso',
+ update_date: time,
+ userid: sessionStorage.getItem('UserID') || '',
+ lang: sessionStorage.getItem('lang') || '',
+ SessionUid: localStorage.getItem('SessionUid') || '',
+ LoginUID: sessionStorage.getItem('LoginUID') || '',
+ appkey: window.GLOB.appkey
}
- 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)
+ let url = window.GLOB.mainSystemApi || '/webapi/dostars'
+ 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)
- })
- })
- }
+ return axios({
+ url: `${url}/${param.func}`,
+ method: 'post',
+ data: param
+ })
}
/**
* @description 鑾峰彇鎴栦慨鏀圭郴缁熼厤缃紝澧炲姞appkey
*/
getSystemConfig (param) {
- param.userid = sessionStorage.getItem('UserID') || ''
+ 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.appkey = window.GLOB.appkey || ''
+ param.LoginUID = param.LoginUID || sessionStorage.getItem('LoginUID') || ''
+ param.appkey = 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
})
@@ -484,16 +574,22 @@
* @description 鑾峰彇鎴栦慨鏀规湰鍦伴厤缃紝澧炲姞appkey
*/
getLocalConfig (param) {
- param.userid = sessionStorage.getItem('UserID') || ''
+ 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
})
@@ -510,14 +606,15 @@
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)) // 缂撳瓨鏍￠獙锛屽幓闄ゆ椂闂村拰鍔犲瘑瀛楃
@@ -534,7 +631,7 @@
}, () => {
param = this.encryptParam(param)
axios({
- url: `/webapi/dostars${param.func ? '/' + param.func : ''}`,
+ url: `${url}${param.func ? '/' + param.func : ''}`,
method: 'post',
data: param
}).then(res => {
@@ -554,7 +651,7 @@
}, () => {
param = this.encryptParam(param)
axios({
- url: `/webapi/dostars${param.func ? '/' + param.func : ''}`,
+ url: `${url}${param.func ? '/' + param.func : ''}`,
method: 'post',
data: param
}).then(res => {
@@ -580,7 +677,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 => {
@@ -603,10 +700,6 @@
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))
@@ -644,7 +737,15 @@
}
})
param.sign = md5(values)
- param.t = new Date().getTime()
+ param.t = new Date().getTime();
+
+ ['arr_field', 'LText_field', 'custom_script', 'LText1', 'LText', 'LText2', 'DateCount'].forEach(key => {
+ if (param[key]) {
+ let val = param[key]
+ delete param[key]
+ param[key] = val
+ }
+ })
return param
}
@@ -654,12 +755,18 @@
* @param {Object} param 璇锋眰鍙傛暟
* @param {Boolean} SSO 鏄惁涓哄崟鐐圭櫥褰曞湴鍧�
*/
- getSystemCacheConfig (param) {
+ getSystemCacheConfig (param, cache = true) {
param.userid = param.userid || sessionStorage.getItem('UserID') || ''
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
@@ -668,14 +775,14 @@
_param = JSON.stringify(_param)
_param = md5(_param)
- if (window.GLOB.CacheMap.has(_param)) {
+ if (cache && 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 : ''}`,
+ url: `${url}${param.func ? '/' + param.func : ''}`,
method: 'post',
data: param
}).then(res => {
@@ -692,21 +799,27 @@
* @description 鑾峰彇涓氬姟閫氱敤鎺ュ彛
*/
genericInterface (param) {
- param.userid = sessionStorage.getItem('UserID')
+ 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 && /\/dostars/.test(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
})
@@ -729,7 +842,6 @@
method: 'post',
data: param
}).then(res => {
-
try {
const blob = new Blob([res])
@@ -752,7 +864,7 @@
}
resolve()
}
- } catch {
+ } catch (e) {
resolve({
ErrCode: 'E',
ErrMesg: '鏂囦欢瑙ｆ瀽閿欒',
@@ -780,21 +892,17 @@
param = this.encryptParam(param)
+ let url = '/webapi/SaveBase64Image'
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
- })
+ url = param.rduri.replace(/webapi(.*)$/, 'webapi/SaveBase64Image')
+ delete param.rduri
}
+
+ return axios({
+ url,
+ method: 'post',
+ data: param
+ })
}
/**
@@ -823,8 +931,13 @@
* @description 鑾峰彇寰俊鏀粯浜岀淮鐮�
*/
getWxNativePay (param) {
+ let _url = document.location.origin + '/' + window.GLOB.service + 'wxpay/wxNativePay'
+ if (process.env.NODE_ENV !== 'production') {
+ _url = document.location.origin + '/wxpay/wxNativePay'
+ }
+
return axios({
- url: '/wxpay/wxNativePay',
+ url: _url,
method: 'post',
data: param
})
--
Gitblit v1.8.0