From 9a11f818f304bc13bbd920313792e9560734922f Mon Sep 17 00:00:00 2001
From: hcong <1050828145@qq.com>
Date: 星期五, 27 九月 2024 15:31:25 +0800
Subject: [PATCH] 合并冲突
---
src/api/index.js | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/api/index.js b/src/api/index.js
index 36408b4..a31a27c 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -11,9 +11,9 @@
let ip2_file = 'https://fyami.com.cn/';
if (debug) {
- ip1 = 'http://192.168.0.138:8082/';
- // ip1_file = 'http://47.100.191.150:9005/';
- ip2 = 'http://192.168.0.138:8080/';
+ ip1 = 'http://192.168.0.138:9091/';
+ // ip1_file = 'http://192.168.0.138:8080/';
+ // ip2 = 'http://192.168.0.138:8080/';
// ip2_file = 'https://fyami.com.cn/';
}
--
Gitblit v1.9.3