From be107069b14c8d23b9d1aa50391897324dfa9f35 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 05 九月 2023 21:57:27 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/api/index.js | 16 +++-------------
1 files changed, 3 insertions(+), 13 deletions(-)
diff --git a/src/api/index.js b/src/api/index.js
index 21617d1..ca423f9 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -560,11 +560,7 @@
param.appkey = param.appkey || window.GLOB.appkey
let url = '/webapi/dostars'
- 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) {
+ if (window.GLOB.mainSystemApi) {
if (!window.GLOB.transfer) {
url = window.GLOB.mainSystemApi
} else {
@@ -592,13 +588,7 @@
param.appkey = param.appkey || window.GLOB.appkey || ''
let url = '/webapi/dostars'
- if (window.GLOB.mkHS) { // HS涓嬶紝鍗曠偣鐧诲綍鏈嶅姟鍣ㄤ负浜戠
- if (window.GLOB.cloudServiceApi) { // 瀛樺湪浜戠鍦板潃鏃讹紝浣跨敤浜戠绯荤粺鍙傛暟
- url = window.GLOB.cloudServiceApi
- param.userid = sessionStorage.getItem('CloudUserID') || ''
- param.LoginUID = sessionStorage.getItem('CloudLoginUID') || ''
- }
- } else if (window.GLOB.mainSystemApi) {
+ if (window.GLOB.mainSystemApi) {
if (!window.GLOB.transfer) {
url = window.GLOB.mainSystemApi
} else {
@@ -915,7 +905,7 @@
let time = +sessionStorage.getItem(rduri)
let c_time = Math.round(new Date().getTime() / 1000)
- if (time && c_time - time <= 60) {
+ if (time && c_time - time <= 1800) {
sessionStorage.setItem(rduri, c_time)
return axios({
url: `${url}${param.func ? '/' + param.func : ''}`,
--
Gitblit v1.8.0