From f078c137d61270d243cd8e03077fa9cf000e276b Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 14 八月 2023 14:02:40 +0800
Subject: [PATCH] 2023-08-14
---
src/api/index.js | 80 ++++++++++++++++++++++++++++++---------
1 files changed, 61 insertions(+), 19 deletions(-)
diff --git a/src/api/index.js b/src/api/index.js
index 6d70710..9ce1f21 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -5,9 +5,9 @@
import CryptoJS from 'crypto-js'
import jsSHA from 'jssha'
import moment from 'moment'
+
import Utils from '@/utils/utils.js'
import CacheUtils from './cacheutils'
-import options from '@/store/options.js'
window.GLOB.IndexDB = null
window.GLOB.OuterToken = {}
@@ -61,7 +61,7 @@
}, (error) => {
let response = error.response || ''
- if (response && (!response.data || !response.data.errors)) { // 杩囨护鏃疯鎶ラ敊淇℃伅
+ if (response && response.status) {
notification.error({
className: 'notification-custom-error',
bottom: 0,
@@ -241,7 +241,7 @@
Password: '',
check_code: checkcode,
way_no: 'sms_vcode',
- systemType: options.sysType,
+ systemType: window.GLOB.sysType,
login_city: sessionStorage.getItem('city') || '',
login_id_address: sessionStorage.getItem('ipAddress') || '',
kei_id: window.btoa(window.encodeURIComponent(window.GLOB.host)),
@@ -252,11 +252,11 @@
let url = '/webapi/dologon'
if (isCloud) {
param.debug = 'Y'
- if (options.cloudServiceApi) {
- param.rduri = options.cloudServiceApi.replace(/\/webapi(.*)/, '/webapi/dologon')
+ if (window.GLOB.cloudServiceApi) {
+ param.rduri = window.GLOB.cloudServiceApi.replace(/\/webapi(.*)/, '/webapi/dologon')
}
} else if (window.GLOB.mainSystemApi) {
- if (options.sysType !== 'cloud' && window.GLOB.systemType !== 'production') {
+ if (window.GLOB.sysType !== 'cloud' && window.GLOB.systemType !== 'production') {
param.linkurl = window.GLOB.linkurl
}
param.rduri = window.GLOB.mainSystemApi.replace(/\/webapi(.*)/, '/webapi/dologon')
@@ -277,7 +277,7 @@
let param = {
// func: 'webapi_login',
UserName: username,
- systemType: options.sysType,
+ systemType: window.GLOB.sysType,
Type: 'S',
login_city: sessionStorage.getItem('city') || '',
login_id_address: sessionStorage.getItem('ipAddress') || '',
@@ -303,15 +303,20 @@
// Type: 'X' 鏃�
// param.Password = Utils.formatOptions(password)
+ // positecgroup
+ if (window.GLOB.appkey === '202011021844144334E823A3011414082AD77') {
+ param.svccode = 'oms'
+ }
+
let url = '/webapi/dologon'
if (isCloud) {
param.debug = 'Y'
- if (options.cloudServiceApi) {
- param.rduri = options.cloudServiceApi.replace(/\/webapi(.*)/, '/webapi/dologon')
+ if (window.GLOB.cloudServiceApi) {
+ param.rduri = window.GLOB.cloudServiceApi.replace(/\/webapi(.*)/, '/webapi/dologon')
}
} else if (window.GLOB.mainSystemApi) {
- if (options.sysType !== 'cloud' && window.GLOB.systemType !== 'production') {
+ if (window.GLOB.sysType !== 'cloud' && window.GLOB.systemType !== 'production') {
param.linkurl = window.GLOB.linkurl
}
param.rduri = window.GLOB.mainSystemApi.replace(/\/webapi(.*)/, '/webapi/dologon')
@@ -333,14 +338,17 @@
if (!menuid) return
let date = moment().format('YYYY-MM-DD HH:mm:ss')
let _data = data ? JSON.stringify(data) : ''
+ let userid = sessionStorage.getItem('UserID') || ''
- CacheUtils.writeCacheInIndexDB({menuid, CreateDate: date, LongParam: _data})
+ CacheUtils.writeCacheInIndexDB({menuid: md5(menuid + userid), CreateDate: date, LongParam: _data})
}
getLCacheConfig (menuid, minutes) {
return new Promise((resolve, reject) => {
let limit = minutes ? moment().subtract(minutes, 'minutes').format('YYYY-MM-DD HH:mm:ss') : ''
- CacheUtils.getIndexDBCacheConfig(menuid).then(res => {
+ let userid = sessionStorage.getItem('UserID') || ''
+
+ CacheUtils.getIndexDBCacheConfig(md5(menuid + userid)).then(res => {
if (res && res.LongParam) {
resolve({data: JSON.parse(res.LongParam), valid: !limit || res.CreateDate > limit})
} else {
@@ -351,7 +359,41 @@
}
/**
+<<<<<<< HEAD
+ * @description 鐧诲綍浜屾楠岃瘉 // positecgroup
+ */
+ verifycode (verify) {
+ let param = {
+ certificate: 'certificate',
+ captcha: verify.code,
+ token: verify.token,
+ ati: verify.ati,
+ vid: verify.vid,
+ uid: verify.uid,
+ shopId: verify.shopId,
+ loginId: verify.loginId,
+ phone: verify.phone,
+ sellerNick: verify.sellerNick,
+ isRisk: verify.isRisk,
+ requestId: verify.requestId,
+ riskNum: verify.riskNum,
+ username: verify.username
+ }
+
+ let url = '/webapi/dologon'
+
+ return axios({
+ url,
+ method: 'post',
+ data: param
+ })
+ }
+
+ /**
+ * @description 鑾峰彇绯荤粺鐗堟湰淇℃伅锛屽惎鐢ㄦ垨鏇存柊websql
+=======
* @description 鑾峰彇绯荤粺鐗堟湰淇℃伅
+>>>>>>> master
*/
getAppVersion (reload) {
if (!window.GLOB.IndexDB) {
@@ -461,7 +503,7 @@
param = this.encryptParam(param)
- let url = options.cloudServiceApi ? options.cloudServiceApi : '/webapi/dostars'
+ let url = window.GLOB.cloudServiceApi ? window.GLOB.cloudServiceApi : '/webapi/dostars'
if (param.func) {
url = url + '/' + param.func
}
@@ -508,8 +550,8 @@
param.appkey = param.appkey || window.GLOB.appkey
let url = '/webapi/dostars'
- if (window.GLOB.mkHS && options.cloudServiceApi) { // HS涓嬶紝涓斿瓨鍦ㄤ簯绔湴鍧�
- url = options.cloudServiceApi
+ if (window.GLOB.mkHS && window.GLOB.cloudServiceApi) { // HS涓嬶紝涓斿瓨鍦ㄤ簯绔湴鍧�
+ url = window.GLOB.cloudServiceApi
param.userid = sessionStorage.getItem('CloudUserID') || ''
param.LoginUID = sessionStorage.getItem('CloudLoginUID') || ''
} else if (window.GLOB.mainSystemApi) {
@@ -541,8 +583,8 @@
let url = '/webapi/dostars'
if (window.GLOB.mkHS) { // HS涓嬶紝鍗曠偣鐧诲綍鏈嶅姟鍣ㄤ负浜戠
- if (options.cloudServiceApi) { // 瀛樺湪浜戠鍦板潃鏃讹紝浣跨敤浜戠绯荤粺鍙傛暟
- url = options.cloudServiceApi
+ if (window.GLOB.cloudServiceApi) { // 瀛樺湪浜戠鍦板潃鏃讹紝浣跨敤浜戠绯荤粺鍙傛暟
+ url = window.GLOB.cloudServiceApi
param.userid = sessionStorage.getItem('CloudUserID') || ''
param.LoginUID = sessionStorage.getItem('CloudLoginUID') || ''
}
@@ -666,7 +708,7 @@
param.appkey = window.GLOB.appkey || ''
let url = '/webapi/dostars'
- if (param.rduri && !window.GLOB.transfer) {
+ if (param.rduri && !window.GLOB.transfer) { // positecgroup
url = param.rduri
delete param.rduri
}
@@ -761,7 +803,7 @@
} else {
let _param = {
UserName: token.username,
- systemType: options.sysType,
+ systemType: window.GLOB.sysType,
login_city: sessionStorage.getItem('city') || '',
device_id: token.appkey || '',
timestamp: moment().format('YYYY-MM-DD HH:mm:ss'),
--
Gitblit v1.8.0