From ba616e9307681da4781b7610ec3c27721d793379 Mon Sep 17 00:00:00 2001
From: guifei zhu <guifeizhu@guifeideiMac.local>
Date: 星期三, 18 九月 2024 12:13:37 +0800
Subject: [PATCH] 添加mqtt通讯
---
common/request/fly.js | 35 ++++++++++++++++++++++++++++++-----
1 files changed, 30 insertions(+), 5 deletions(-)
diff --git a/common/request/fly.js b/common/request/fly.js
index b31bcb3..49cbd5b 100644
--- a/common/request/fly.js
+++ b/common/request/fly.js
@@ -4,7 +4,7 @@
fly.config.loading = true;
//瀹炰緥绾ч厤缃�
-//fly.config.timeout=6000;
+fly.config.timeout=10000;
//娣诲姞鎷︽埅鍣�
fly.interceptors.request.use((config, promise) => {
console.info(fly.config.loading)
@@ -15,9 +15,14 @@
}
//缁欐墍鏈夎姹傛坊鍔犺嚜瀹氫箟header
- let token = getApp().globalData.token
+ //let token = getApp().globalData.token
+ const token = uni.getStorageSync('token');
+ const userinfo = uni.getStorageSync('userinfo');
if (token) {
config.headers["X-Access-Token"] = token;
+ }
+ if (userinfo) {
+ config.headers["X-Tenant-Id"] = userinfo.loginTenantId;
}
console.log('========================================== ')
console.log('== 璇锋眰鏁版嵁锛�' + JSON.stringify(config))
@@ -45,8 +50,25 @@
console.info(err)
uni.hideLoading()
//鐧诲綍瓒呮椂锛岄噸鏂扮櫥褰�
- if (err.response.status == 401) {
- jumpToLogin();
+ if (err.response && err.response.status == 401) {
+ uni.showToast({
+ title: "鐧诲綍鐘舵�佸凡澶辨晥锛岄噸鏂扮櫥褰�!",
+ icon: 'none',
+ mask: true,
+ complete: function(res) {
+ setTimeout(() => {
+ jumpToLogin();
+ }, 1000)
+
+ },
+ });
+
+ } else {
+ uni.showToast({
+ title: '缃戠粶閿欒锛岃绋嶅悗閲嶈瘯~',
+ icon: 'none',
+ mask: true
+ });
}
//鍙戠敓缃戠粶閿欒鍚庝細璧板埌杩欓噷
//return Promise.resolve("ssss")
@@ -58,8 +80,11 @@
//璺宠浆鍒扮櫥褰曢〉
function jumpToLogin() {
console.log('鍏抽棴鎵�鏈夐〉闈㈣烦杞埌login')
+ uni.reLaunch({
+ url: '/pages/login/login'
+ });
}
module.exports = {
fly
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3