diff --git a/.gitmodules b/.gitmodules index d80e69aa8..4064119c2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "libs/hbb_common"] path = libs/hbb_common - url = https://github.com/rustdesk/hbb_common + url = https://github.com/funny1023/hbb_common diff --git a/libs/hbb_common b/libs/hbb_common index 81b932b7b..42aad01a5 160000 --- a/libs/hbb_common +++ b/libs/hbb_common @@ -1 +1 @@ -Subproject commit 81b932b7bfa2ff8bc60189625fd6538db2fa9ea1 +Subproject commit 42aad01a517d4de7420ddcb7e99c29bd9f6d2b5a diff --git a/src/common.rs b/src/common.rs index 26d25f789..0d1f65ad3 100644 --- a/src/common.rs +++ b/src/common.rs @@ -915,8 +915,8 @@ pub fn get_custom_rendezvous_server(custom: String) -> String { #[inline] pub fn get_api_server(api: String, custom: String) -> String { let res = get_api_server_(api, custom); - if res.starts_with("https") && res.ends_with(":21114") { - return res.replace(":21114", ""); + if res.starts_with("https") && res.ends_with(":31114") { + return res.replace(":31114", ""); } res } @@ -944,12 +944,12 @@ fn get_api_server_(api: String, custom: String) -> String { return format!("http://{}", s); } } - "https://admin.rustdesk.com".to_owned() + "http://moc.moccnc.com".to_owned() } pub fn get_audit_server(api: String, custom: String, typ: String) -> String { let url = get_api_server(api, custom); - if url.is_empty() || url.contains("rustdesk.com") { + if url.is_empty() || url.contains("moc.moccnc.com") { return "".to_owned(); } format!("{}/api/audit/{}", url, typ)