diff --git a/Cargo.toml b/Cargo.toml index fe3d76d..7a2ec1c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [workspace] members = ["gameserver", "proto", "sdkserver"] -resolver = "2" +resolver = "3" [workspace.package] version = "0.1.0" @@ -11,13 +11,13 @@ ansi_term = "0.12.1" atomic_refcell = "0.1.13" lazy_static = "1.4.0" -axum = "0.7.4" -axum-server = "0.6.0" +axum = "0.8.1" +axum-server = "0.7.1" env_logger = "0.11.3" rbase64 = "2.0.3" -rand = "0.8.5" +rand = "0.9.0" rsa = { version = "0.9.6", features = [ "sha1", "nightly", @@ -26,12 +26,12 @@ rsa = { version = "0.9.6", features = [ "sha2", ] } -prost = "0.12.3" -prost-types = "0.12.3" -prost-build = "0.12.3" +prost = "0.13.5" +prost-types = "0.13.5" +prost-build = "0.13.5" paste = "1.0.14" -sysinfo = "0.30.7" +sysinfo = "0.33.1" hex = "0.4.3" diff --git a/gameserver/Cargo.toml b/gameserver/Cargo.toml index 3ce7f5d..6b96a2c 100644 --- a/gameserver/Cargo.toml +++ b/gameserver/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "gameserver" -edition = "2021" +edition = "2024" version.workspace = true [dependencies] @@ -31,4 +31,4 @@ proto.workspace = true proto-derive.workspace = true rand.workspace = true -mhy-kcp.workspace = true \ No newline at end of file +mhy-kcp.workspace = true diff --git a/gameserver/src/net/gateway.rs b/gameserver/src/net/gateway.rs index 43a0676..f993be0 100644 --- a/gameserver/src/net/gateway.rs +++ b/gameserver/src/net/gateway.rs @@ -144,7 +144,7 @@ impl Gateway { fn next_conv_pair(&mut self) -> (u32, u32) { ( self.id_counter.fetch_add(1, Ordering::SeqCst) + 1, - rand::thread_rng().next_u32(), + rand::rng().next_u32(), ) } } diff --git a/gameserver/src/net/handlers/battle.rs b/gameserver/src/net/handlers/battle.rs index 5a1a4c5..2bb2f2a 100644 --- a/gameserver/src/net/handlers/battle.rs +++ b/gameserver/src/net/handlers/battle.rs @@ -72,7 +72,7 @@ async fn create_battle_info(caster_id: u32, skill_index: u32) -> SceneBattleInfo let mut battle_info = SceneBattleInfo { stage_id: player.battle_config.stage_id, - logic_random_seed: rand::thread_rng().gen::(), + logic_random_seed: rand::rng().random::(), battle_id: 1, rounds_limit: player.battle_config.cycle_count, world_level: 6, diff --git a/kcp/Cargo.toml b/kcp/Cargo.toml index 4ae6b28..92fd94e 100644 --- a/kcp/Cargo.toml +++ b/kcp/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "mhy-kcp" version.workspace = true -edition = "2021" +edition = "2024" [features] fastack-conserve = [] @@ -10,11 +10,11 @@ tokio = ["dep:tokio"] [dependencies] bytes = "1.6.0" log = "0.4.21" -thiserror = "1.0.58" +thiserror = "2.0.11" tokio = { version = "1.37.0", optional = true, features = ["io-util"] } [dev-dependencies] time = "0.3.34" -rand = "0.8.5" +rand = "0.9.0" env_logger = "0.11.3" diff --git a/proto/Cargo.toml b/proto/Cargo.toml index 6bd878e..97a30bc 100644 --- a/proto/Cargo.toml +++ b/proto/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "proto" -edition = "2021" +edition = "2024" version.workspace = true [dependencies] diff --git a/proto/proto-derive/Cargo.toml b/proto/proto-derive/Cargo.toml index ff83aed..9b640a7 100644 --- a/proto/proto-derive/Cargo.toml +++ b/proto/proto-derive/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "proto-derive" version = "0.1.0" -edition = "2021" +edition = "2024" [dependencies] syn = "2.0.53" diff --git a/sdkserver/Cargo.toml b/sdkserver/Cargo.toml index ac794df..072770d 100644 --- a/sdkserver/Cargo.toml +++ b/sdkserver/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "sdkserver" version = "0.1.0" -edition = "2021" +edition = "2024" [dependencies] anyhow.workspace = true diff --git a/sdkserver/src/services/auth.rs b/sdkserver/src/services/auth.rs index 463c48c..9e9259b 100644 --- a/sdkserver/src/services/auth.rs +++ b/sdkserver/src/services/auth.rs @@ -1,9 +1,9 @@ use axum::Json; use serde_json::json; -pub const LOGIN_WITH_PASSWORD_ENDPOINT: &str = "/:product_name/mdk/shield/api/login"; -pub const LOGIN_WITH_SESSION_TOKEN_ENDPOINT: &str = "/:product_name/mdk/shield/api/verify"; -pub const GRANTER_LOGIN_VERIFICATION_ENDPOINT: &str = "/:product_name/combo/granter/login/v2/login"; +pub const LOGIN_WITH_PASSWORD_ENDPOINT: &str = "/{product_name}/mdk/shield/api/login"; +pub const LOGIN_WITH_SESSION_TOKEN_ENDPOINT: &str = "/{product_name}/mdk/shield/api/verify"; +pub const GRANTER_LOGIN_VERIFICATION_ENDPOINT: &str = "/{product_name}/combo/granter/login/v2/login"; pub const RISKY_API_CHECK_ENDPOINT: &str = "/account/risky/api/check"; #[tracing::instrument]