From c2e36c45578e63ad17c5e258c92d62d9ae03dadb Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期五, 30 五月 2025 11:55:52 +0800
Subject: [PATCH] Merge branch 'master' of ssh://114.215.109.124:29418/underway-vue

---
 src/api/index.js |   18 ++++++++++++++----
 1 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/api/index.js b/src/api/index.js
index ef5ed5c..674b83a 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -1,21 +1,26 @@
 import axios from 'axios';
 import { ElMessage } from 'element-plus';
 
-const debug = true;
+const debug = false;
 
 let ip1 = 'http://47.100.191.150:9029/';
+let ws = `47.100.191.150:9030`;
 // console.log(import.meta.env);
 if (import.meta.env.VITE_DATA_MODE == 'jingan') {
   ip1 = 'http://114.215.109.124:8805/';
+  ws = `114.215.109.124:9030`;
 }
 
 if (debug) {
-  ip1 = 'http://192.168.0.138:8084/';
+  // ip1 = 'http://192.168.0.110:8084/';
+  ip1 = 'http://localhost:8084/';
+  // ws = `192.168.0.110:9031`;
+  ws = `localhost:9031`;
 }
 
 const $http = axios.create({
   baseURL: ip1,
-  timeout: 20000
+  timeout: 30000
 });
 
 //娣诲姞鎷︽埅鍣�
@@ -93,4 +98,9 @@
   );
 });
 
-export { $http };
+function resToData(res) {
+  res.resp = res.resp.then((res) => res.data);
+  return res;
+}
+
+export { $http, resToData, ws };

--
Gitblit v1.9.3