From e543372cc70a19ff2630c79d8421c2c593e54e5f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 02 六月 2021 17:15:21 +0800
Subject: [PATCH] 2021-06-02
---
src/api/index.js | 82 +++++++++++++++++++++++++---------------
1 files changed, 51 insertions(+), 31 deletions(-)
diff --git a/src/api/index.js b/src/api/index.js
index 6e85dc6..87db4d9 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -31,7 +31,7 @@
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)
}
@@ -106,11 +106,16 @@
* @param {Object} param 鏌ヨ鍙婃彁浜ゅ弬鏁�
*/
directRequest (url, method = 'post', param, cross) {
- if (cross === 'true') {
+ if (cross === 'true' && param) {
return axios({
url,
method,
data: param
+ })
+ } else if (cross === 'true') {
+ return axios({
+ url,
+ method
})
}
@@ -172,7 +177,7 @@
/**
* @description 鎵嬫満鍙烽獙璇佺爜鐧诲綍
*/
- getphoneusermsg (phoneNo, checkcode, isCloud = false) {
+ getphoneusermsg (phoneNo, checkcode, isCloud = false, ipAddress, city) {
let param = {
// func: 'webapi_login',
mob: phoneNo,
@@ -180,7 +185,9 @@
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 || ''
@@ -210,17 +217,27 @@
/**
* @description 鐧诲綍绯荤粺, 鑾峰彇鐢ㄦ埛淇℃伅
*/
- getusermsg (username, password, isCloud = false) {
+ getusermsg (username, password, isCloud = false, ipAddress, city) {
let param = {
// func: 'webapi_login',
UserName: username,
systemType: options.sysType,
- Type: 'S'
+ Type: 'S',
+ login_city: city,
+ login_id_address: ipAddress
}
// Type: 'S' 鏃�
let shaObj = new jsSHA('SHA-1', 'TEXT')
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')
+ }
+
shaObj.update(password)
param.Password = shaObj.getHash('HEX').toUpperCase()
param.Password = md5(username + param.Password + param.timestamp)
@@ -260,11 +277,18 @@
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 param = {
func: 's_get_app_version',
modifydate: msg.createDate || curTime,
@@ -311,7 +335,6 @@
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,
@@ -409,10 +432,10 @@
* @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.LoginUID = param.LoginUID || sessionStorage.getItem('LoginUID') || ''
param.appkey = window.GLOB.appkey || ''
let url = '/webapi/dostars'
@@ -437,10 +460,10 @@
* @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'
@@ -664,16 +687,18 @@
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
- }
+
+ // 寰呬紭鍖栵紝澧炲姞鏄惁鏀寔璺ㄥ煙璇锋眰
+ // let url = '/webapi/dostars'
+ // if (param.rduri) {
+ // url = param.rduri
+ // delete param.rduri
+ // }
param = this.encryptParam(param)
return axios({
- url: `${url}${param.func ? '/' + param.func : ''}`,
+ url: `/webapi/dostars${param.func ? '/' + param.func : ''}`,
method: 'post',
data: param
})
@@ -746,22 +771,17 @@
param = this.encryptParam(param)
+ let url = '/webapi/SaveBase64Image'
if (param.rduri) {
- let url = param.rduri.replace(/webapi(.*)$/, 'webapi/SaveBase64Image')
+ url = param.rduri.replace(/webapi(.*)$/, 'webapi/SaveBase64Image')
delete param.rduri
-
- return axios({
- url,
- method: 'post',
- data: param
- })
- } else {
- return axios({
- url: '/webapi/SaveBase64Image',
- method: 'post',
- data: param
- })
}
+
+ return axios({
+ url,
+ method: 'post',
+ data: param
+ })
}
/**
--
Gitblit v1.8.0