From 66d8bff8b40d048ec455c6cddf63108b31dfb0d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=91=E5=85=88=E6=A3=AE?= <leizi97@126.com>
Date: Mon, 25 Nov 2024 15:23:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=89=93=E5=8D=B0=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97config=EF=BC=8C=E4=BF=AE=E5=A4=8D=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=90=AF=E5=8A=A8=E6=9D=83=E9=87=8D=E4=B8=8D?=
 =?UTF-8?q?=E6=98=AF=E6=9C=80=E9=AB=98=E6=9D=83=E9=87=8D=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index.vue  | 26 ++++++++++++++------------
 pages/member.vue |  2 +-
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/pages/index.vue b/pages/index.vue
index 58324fd..00c4b38 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -984,18 +984,6 @@
 	const getArgs = async () => {
 		// console.error(config.proxyNetworks);
 		const args = [];
-		if (mainStore.enableCreateServer) {
-			if (config.relayAllPeerrpc) {
-				args.push("--relay-all-peer-rpc");
-			}
-			const whiteList = mainStore.ServerWhiteList.trim().split("\n").map(el => el.trim()).filter(el => el).join(" ");
-			if(whiteList && mainStore.enableWhiteList) {
-				args.push("--relay-network-whitelist", whiteList);
-			}if(!whiteList && mainStore.enableWhiteList) {
-				args.push("--relay-network-whitelist");
-			}
-			return args
-		}
 		if (mainStore.configStartEnable) {
 			if (mainStore.configPath) {
 				const isExists = await exists(mainStore.configPath, { baseDir: BaseDirectory.Resource });
@@ -1022,6 +1010,20 @@
 				return [];
 			}
 		}
+
+		if (mainStore.enableCreateServer) {
+			if (config.relayAllPeerrpc) {
+				args.push("--relay-all-peer-rpc");
+			}
+			const whiteList = mainStore.ServerWhiteList.trim().split("\n").map(el => el.trim()).filter(el => el).join(" ");
+			if(whiteList && mainStore.enableWhiteList) {
+				args.push("--relay-network-whitelist", whiteList);
+			}if(!whiteList && mainStore.enableWhiteList) {
+				args.push("--relay-network-whitelist");
+			}
+			return args
+		}
+		
 		if (config.dhcp) {
 			args.push("-d");
 		}
diff --git a/pages/member.vue b/pages/member.vue
index d8a4316..1249c41 100644
--- a/pages/member.vue
+++ b/pages/member.vue
@@ -133,7 +133,7 @@
 				value.ipv4 = value.ipv4.split("/")[0];
 			}
 		});
-		console.error(peerInfo);
+		// console.error(peerInfo);
 		data.member = peerInfo;
 	};