Skip to content

Commit ed793c3

Browse files
committed
chore: 调整代码
1 parent 5040f4b commit ed793c3

4 files changed

Lines changed: 72 additions & 70 deletions

File tree

Script/Script.js

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -234,24 +234,6 @@ const urlTestBaseOption = {
234234
hidden: true,
235235
};
236236

237-
// 定义创建地区策略组的函数
238-
function createRegionGroup(name, icon, proxies) {
239-
const autoTestName = `${name}-自动选择`;
240-
return [
241-
{
242-
...urlTestBaseOption,
243-
name: autoTestName,
244-
proxies,
245-
},
246-
{
247-
...selectBaseOption,
248-
name,
249-
icon,
250-
proxies: [autoTestName, ...proxies],
251-
},
252-
];
253-
}
254-
255237
// 定义分流策略组配置
256238
const serviceConfigs = [
257239
{
@@ -336,6 +318,24 @@ const serviceConfigs = [
336318
},
337319
];
338320

321+
// 定义创建地区策略组的函数
322+
function createRegionGroup(name, icon, proxies) {
323+
const autoTestName = `${name}-自动选择`;
324+
return [
325+
{
326+
...urlTestBaseOption,
327+
name: autoTestName,
328+
proxies,
329+
},
330+
{
331+
...selectBaseOption,
332+
name,
333+
icon,
334+
proxies: [autoTestName, ...proxies],
335+
},
336+
];
337+
}
338+
339339
// --- 主入口 ---
340340

341341
function main(config) {

Script/mihomoScript.js

Lines changed: 27 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -269,24 +269,6 @@ const urlTestBaseOption = {
269269
hidden: true,
270270
};
271271

272-
// 定义创建地区策略组的函数
273-
function createRegionGroup(name, icon, proxies) {
274-
const autoTestName = `${name}-自动选择`;
275-
return [
276-
{
277-
...urlTestBaseOption,
278-
name: autoTestName,
279-
proxies,
280-
},
281-
{
282-
...selectBaseOption,
283-
name,
284-
icon,
285-
proxies: [autoTestName, ...proxies],
286-
},
287-
];
288-
}
289-
290272
// 定义分流策略组配置
291273
const serviceConfigs = [
292274
{
@@ -605,6 +587,24 @@ const serviceConfigs = [
605587
},
606588
];
607589

590+
// 定义创建地区策略组的函数
591+
function createRegionGroup(name, icon, proxies) {
592+
const autoTestName = `${name}-自动选择`;
593+
return [
594+
{
595+
...urlTestBaseOption,
596+
name: autoTestName,
597+
proxies,
598+
},
599+
{
600+
...selectBaseOption,
601+
name,
602+
icon,
603+
proxies: [autoTestName, ...proxies],
604+
},
605+
];
606+
}
607+
608608
// --- 主入口 ---
609609

610610
function main(config) {
@@ -763,14 +763,6 @@ function main(config) {
763763
...generatedRegionGroups,
764764
];
765765
config['rule-providers'] = finalRuleProviders;
766-
config['rules'] = [
767-
...finalRules,
768-
769-
// 兜底规则
770-
'RULE-SET,gfw,默认代理',
771-
'RULE-SET,cn_ip,直连',
772-
'MATCH,默认代理',
773-
];
774766

775767
config['allow-lan'] = true;
776768
config['ipv6'] = true;
@@ -862,5 +854,14 @@ function main(config) {
862854
'dns-hijack': ['udp://any:53', 'tcp://any:53'],
863855
};
864856

857+
config['rules'] = [
858+
...finalRules,
859+
860+
// 兜底规则
861+
'RULE-SET,gfw,默认代理',
862+
'RULE-SET,cn_ip,直连',
863+
'MATCH,默认代理',
864+
];
865+
865866
return config;
866867
}

src/config/main.js

Lines changed: 27 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
// 定义创建地区策略组的函数
2+
function createRegionGroup(name, icon, proxies) {
3+
const autoTestName = `${name}-自动选择`;
4+
return [
5+
{
6+
...urlTestBaseOption,
7+
name: autoTestName,
8+
proxies,
9+
},
10+
{
11+
...selectBaseOption,
12+
name,
13+
icon,
14+
proxies: [autoTestName, ...proxies],
15+
},
16+
];
17+
}
18+
119
// --- 主入口 ---
220

321
function main(config) {
@@ -156,14 +174,6 @@ function main(config) {
156174
...generatedRegionGroups,
157175
];
158176
config['rule-providers'] = finalRuleProviders;
159-
config['rules'] = [
160-
...finalRules,
161-
162-
// 兜底规则
163-
'RULE-SET,gfw,默认代理',
164-
'RULE-SET,cn_ip,直连',
165-
'MATCH,默认代理',
166-
];
167177

168178
config['allow-lan'] = true;
169179
config['ipv6'] = true;
@@ -255,5 +265,14 @@ function main(config) {
255265
'dns-hijack': ['udp://any:53', 'tcp://any:53'],
256266
};
257267

268+
config['rules'] = [
269+
...finalRules,
270+
271+
// 兜底规则
272+
'RULE-SET,gfw,默认代理',
273+
'RULE-SET,cn_ip,直连',
274+
'MATCH,默认代理',
275+
];
276+
258277
return config;
259278
}

src/config/serviceConfigs.js

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -23,24 +23,6 @@ const urlTestBaseOption = {
2323
hidden: true,
2424
};
2525

26-
// 定义创建地区策略组的函数
27-
function createRegionGroup(name, icon, proxies) {
28-
const autoTestName = `${name}-自动选择`;
29-
return [
30-
{
31-
...urlTestBaseOption,
32-
name: autoTestName,
33-
proxies,
34-
},
35-
{
36-
...selectBaseOption,
37-
name,
38-
icon,
39-
proxies: [autoTestName, ...proxies],
40-
},
41-
];
42-
}
43-
4426
// 定义分流策略组配置
4527
const serviceConfigs = [
4628
{

0 commit comments

Comments
 (0)