mirror of
https://github.com/EasyTier/EasytierGame.git
synced 2025-05-19 10:27:56 +00:00
修复打印日志config,修复配置文件启动权重不是最高权重的bug
This commit is contained in:
+14
-12
@@ -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");
|
||||
}
|
||||
|
||||
+1
-1
@@ -133,7 +133,7 @@
|
||||
value.ipv4 = value.ipv4.split("/")[0];
|
||||
}
|
||||
});
|
||||
console.error(peerInfo);
|
||||
// console.error(peerInfo);
|
||||
data.member = peerInfo;
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user