From c562fa2e66f4972ae23fa57ef7412da6e18991ed Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期二, 12 七月 2022 14:31:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/shf' into master

---
 config/dev.env.js |   32 ++++++++++++++++++--------------
 1 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/config/dev.env.js b/config/dev.env.js
index 6fd0eb6..aa7a368 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -8,20 +8,24 @@
   // BASE_API: '"http://222.92.213.22:8006/zhongtai"',
   // IMG_API: '"http://222.92.213.22:8006/zhongtai/upload/"',
   //
-  // BASE_API: '"https://sinanoaq.cn:8100"',
-  //  BASE_API: '"http://127.0.0.1:8100"',
-  //  IMG_API: '"http://127.0.0.1:8100/upload/"',
-  //    BASE_API: '"http://192.168.0.35:8100"',
-  //    IMG_API: '"http://127.0.0.1:8100/upload/"',
-  // IMG_API: '"https://sinanoaq.com:8100/upload/"',
-  //   BASE_API: '"http://220.171.99.118:4100"',
-  //   IMG_API: '"http://220.171.99.118:4100/upload/"',
-      // BASE_API: '"http://192.168.0.35:8006"',
-      // IMG_API: '"http://192.168.0.35:8006/upload/"',
-      BASE_API: '"http://192.168.0.35:8006"',
-      IMG_API: '"http://192.168.0.35:8006/upload/"',
-      // BASE_API: '"http://192.168.0.62:8006"',
-      // IMG_API: '"http://192.168.0.62:8006/upload/"',
+  //     BASE_API: '"https://sinanoaq.cn:8100"',
+  //      BASE_API: '"http://127.0.0.1:8100"',
+  //      IMG_API: '"http://127.0.0.1:8100/upload/"',
+  //        BASE_API: '"http://192.168.0.35:8100"',
+  //        IMG_API: '"http://127.0.0.1:8100/upload/"',
+  //     IMG_API: '"https://sinanoaq.com:8100/upload/"',
+  //       BASE_API: '"http://220.171.99.118:4100"',
+  //       IMG_API: '"http://220.171.99.118:4100/upload/"',
+  //     BASE_API: '"http://192.168.0.35:8006"',
+  //     IMG_API: '"http://192.168.0.35:8006/upload/"',
+
+    // BASE_API: '"http://192.168.0.8:8006"',
+    // IMG_API: '"http://192.168.0.8:8006/upload/"',
+
+    BASE_API: '"http://192.168.0.35:8006"',
+    IMG_API: '"http://192.168.0.35:8006/upload/"',
+    // BASE_API: '"http://192.168.0.62:8006"',
+    // IMG_API: '"http://192.168.0.62:8006/upload/"',
     // BASE_API: '"http://222.92.213.22:8006/zhongtai"',
     // IMG_API: '"http://222.92.213.22:8006/zhongtai/upload/"',
     // NANO_API: '"http://222.92.213.22:8006/nanoweb"',

--
Gitblit v1.9.2