|
@@ -24,11 +24,11 @@ impl IClashTemp {
|
|
|
pub fn template() -> Self {
|
|
|
let mut map = Mapping::new();
|
|
|
|
|
|
- map.insert("mixed-port".into(), 7890.into());
|
|
|
+ map.insert("mixed-port".into(), 7897.into());
|
|
|
map.insert("log-level".into(), "info".into());
|
|
|
map.insert("allow-lan".into(), false.into());
|
|
|
map.insert("mode".into(), "rule".into());
|
|
|
- map.insert("external-controller".into(), "127.0.0.1:9090".into());
|
|
|
+ map.insert("external-controller".into(), "127.0.0.1:9097".into());
|
|
|
map.insert("secret".into(), "".into());
|
|
|
|
|
|
Self(map)
|
|
@@ -84,9 +84,9 @@ impl IClashTemp {
|
|
|
Value::Number(val_num) => val_num.as_u64().map(|u| u as u16),
|
|
|
_ => None,
|
|
|
})
|
|
|
- .unwrap_or(7890);
|
|
|
+ .unwrap_or(7897);
|
|
|
if port == 0 {
|
|
|
- port = 7890;
|
|
|
+ port = 7897;
|
|
|
}
|
|
|
port
|
|
|
}
|
|
@@ -109,7 +109,7 @@ impl IClashTemp {
|
|
|
}
|
|
|
None => None,
|
|
|
})
|
|
|
- .unwrap_or("127.0.0.1:9090".into())
|
|
|
+ .unwrap_or("127.0.0.1:9097".into())
|
|
|
}
|
|
|
|
|
|
pub fn guard_client_ctrl(config: &Mapping) -> String {
|
|
@@ -121,7 +121,7 @@ impl IClashTemp {
|
|
|
}
|
|
|
socket.to_string()
|
|
|
}
|
|
|
- Err(_) => "127.0.0.1:9090".into(),
|
|
|
+ Err(_) => "127.0.0.1:9097".into(),
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -156,12 +156,12 @@ fn test_clash_info() {
|
|
|
|
|
|
assert_eq!(
|
|
|
IClashTemp(IClashTemp::guard(Mapping::new())).get_client_info(),
|
|
|
- get_result(7890, "127.0.0.1:9090")
|
|
|
+ get_result(7897, "127.0.0.1:9097")
|
|
|
);
|
|
|
|
|
|
- assert_eq!(get_case("", ""), get_result(7890, "127.0.0.1:9090"));
|
|
|
+ assert_eq!(get_case("", ""), get_result(7897, "127.0.0.1:9097"));
|
|
|
|
|
|
- assert_eq!(get_case(65537, ""), get_result(1, "127.0.0.1:9090"));
|
|
|
+ assert_eq!(get_case(65537, ""), get_result(1, "127.0.0.1:9097"));
|
|
|
|
|
|
assert_eq!(
|
|
|
get_case(8888, "127.0.0.1:8888"),
|
|
@@ -170,7 +170,7 @@ fn test_clash_info() {
|
|
|
|
|
|
assert_eq!(
|
|
|
get_case(8888, " :98888 "),
|
|
|
- get_result(8888, "127.0.0.1:9090")
|
|
|
+ get_result(8888, "127.0.0.1:9097")
|
|
|
);
|
|
|
|
|
|
assert_eq!(
|
|
@@ -195,7 +195,7 @@ fn test_clash_info() {
|
|
|
|
|
|
assert_eq!(
|
|
|
get_case(8888, "192.168.1.1:80800"),
|
|
|
- get_result(8888, "127.0.0.1:9090")
|
|
|
+ get_result(8888, "127.0.0.1:9097")
|
|
|
);
|
|
|
}
|
|
|
|