From 22ce3a4c8453b54c2bfe6d582b734195f899f195 Mon Sep 17 00:00:00 2001
From: hcong <1050828145@qq.com>
Date: 星期二, 10 十二月 2024 14:59:50 +0800
Subject: [PATCH] 1. 新增socket生命周期管理、心跳机制、重连机制 2. 新增socket消息校验、解析、生成 3. 新增socket消息类型枚举类src\enum\socketMessage 3. 新增消息管理类src\socket\MessageManager 4. 新增观察者模式消息的发布订阅机制src\socket\eventBus 5. 修改后台任务页面注册后台任务状态消息并修改状态的逻辑
---
src/api/index.js | 76 ++++++++++++++++++++++---------------
1 files changed, 45 insertions(+), 31 deletions(-)
diff --git a/src/api/index.js b/src/api/index.js
index f21aba3..3b5d513 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -1,26 +1,29 @@
import axios from 'axios';
import { ElMessage } from 'element-plus';
-const debug = true;
+const debug = false;
let ip1 = 'http://47.100.191.150:9005/';
let ip1_file = 'http://47.100.191.150:9005/';
+// let ip1 = 'https://fyami.com.cn:447/';
+// let ip1_file = 'https://fyami.com.cn:447/';
let ip2 = 'https://fyami.com.cn/';
let ip2_file = 'https://fyami.com.cn/';
if (debug) {
- // ip1 = 'http://192.168.0.123:8082/';
- // ip1_file = 'http://47.100.191.150:9005/';
- ip2 = 'http://192.168.0.138:8080/';
+ ip1 = 'http://192.168.0.138:9001/';
+ // ip1_file = 'http://192.168.0.138:8080/';
+ // ip2 = 'http://192.168.0.138:8080/';
// ip2_file = 'https://fyami.com.cn/';
}
-// const ip2 = 'http://192.168.0.123:8080/';
+// socket
+const $socket_base_url = 'ws://192.168.0.150:8080/workstream'
//椋炵窘鐩戠
const $fysp = axios.create({
baseURL: ip1,
- timeout: 10000,
+ timeout: 20000
});
$fysp.imgUrl = `${ip1_file}images/`;
$fysp.downloadUrl = `${ip1_file}files/`;
@@ -28,7 +31,7 @@
//椋炵窘鐜
const $fytz = axios.create({
baseURL: ip2,
- timeout: 10000,
+ timeout: 20000
});
$fytz.imgUrl = `${ip2_file}images/`;
@@ -38,21 +41,24 @@
i.interceptors.request.use(
function (config) {
// 鍦ㄥ彂閫佽姹備箣鍓嶅仛浜涗粈涔�
- console.log('==>璇锋眰寮�濮�');
- console.log(`${config.baseURL}${config.url}`);
- if (config.data) {
- console.log('==>璇锋眰鏁版嵁', config.data);
- }
+ // if (import.meta.env.DEV) {
+ // console.log('==>璇锋眰寮�濮�');
+ // console.log(`${config.baseURL}${config.url}`);
+ // if (config.data) {
+ // console.log('==>璇锋眰鏁版嵁', config.data);
+ // }
+ // }
return config;
},
function (error) {
// 瀵硅姹傞敊璇仛浜涗粈涔�
- console.log('==>璇锋眰寮�濮�');
- console.log(error);
- ElMessage({
- message: error,
- type: 'error',
- });
+ if (import.meta.env.DEV) {
+ console.error('|--璇锋眰閿欒: ', error);
+ }
+ // ElMessage({
+ // message: error,
+ // type: 'error'
+ // });
return Promise.reject(error);
}
);
@@ -62,16 +68,23 @@
function (response) {
// 2xx 鑼冨洿鍐呯殑鐘舵�佺爜閮戒細瑙﹀彂璇ュ嚱鏁般��
// 瀵瑰搷搴旀暟鎹仛鐐逛粈涔�
- console.log(response);
- console.log('==>璇锋眰缁撴潫');
+ if (import.meta.env.DEV) {
+ console.log('|------------------------------------------');
+ console.log('|--璇锋眰: ', `${response.request.responseURL}`);
+ if (response.config.data) {
+ console.log('|--鏁版嵁: ', response.config.data);
+ }
+ console.log('|--缁撴灉: ', response.data);
+ }
if (response.status == 200) {
- if (
- response.data.success != undefined &&
- response.data.success != null
- ) {
+ if (response.data.success != undefined && response.data.success != null) {
if (response.data.success == true) {
return response;
} else {
+ ElMessage({
+ message: response.data.message,
+ type: 'error'
+ });
return Promise.reject(response.data.message);
}
} else {
@@ -84,15 +97,16 @@
function (error) {
// 瓒呭嚭 2xx 鑼冨洿鐨勭姸鎬佺爜閮戒細瑙﹀彂璇ュ嚱鏁般��
// 瀵瑰搷搴旈敊璇仛鐐逛粈涔�
- console.log(error);
- console.log('==>璇锋眰缁撴潫');
- ElMessage({
- message: error,
- type: 'error',
- });
+ if (import.meta.env.DEV) {
+ console.error('|--璇锋眰閿欒: ', error);
+ }
+ // ElMessage({
+ // message: error,
+ // type: 'error'
+ // });
return Promise.reject(error);
}
);
});
-export { $fysp, $fytz };
+export { $fysp, $fytz, $socket_base_url };
--
Gitblit v1.9.3