From daf6c7c16a48ad07c20a2c2e5d0ff33147129a0d Mon Sep 17 00:00:00 2001 From: brian Date: Sun, 21 Sep 2025 18:40:41 +0800 Subject: [PATCH] feat: add print default config cmd --- .gitignore | 3 +- Cargo.lock | 104 +++++++++++++++++++++++++++++++++++++--------------- Cargo.toml | 5 ++- src/main.rs | 37 +++++++++++++++---- 4 files changed, 110 insertions(+), 39 deletions(-) diff --git a/.gitignore b/.gitignore index 2f90a4a..8c92ba8 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,5 @@ .vscode .DS_Store .env -conf.toml \ No newline at end of file +conf.toml +.fleet\ \ No newline at end of file diff --git a/Cargo.lock b/Cargo.lock index 29fb9ba..8ad3861 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1121,6 +1121,7 @@ dependencies = [ "jsonwebtoken", "once_cell", "pbkdf2", + "rand 0.9.2", "rand_core 0.9.3", "sea-orm", "serde", @@ -1392,9 +1393,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.9.0" +version = "2.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e" +checksum = "4b0f83760fb341a774ed326568e19f5a863af4a952def8c39f9ab92fd95b88e5" dependencies = [ "equivalent", "hashbrown 0.15.3", @@ -1616,7 +1617,7 @@ dependencies = [ "num-integer", "num-iter", "num-traits", - "rand", + "rand 0.8.5", "smallvec", "zeroize", ] @@ -1993,10 +1994,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", - "rand_chacha", + "rand_chacha 0.3.1", "rand_core 0.6.4", ] +[[package]] +name = "rand" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1" +dependencies = [ + "rand_chacha 0.9.0", + "rand_core 0.9.3", +] + [[package]] name = "rand_chacha" version = "0.3.1" @@ -2007,6 +2018,16 @@ dependencies = [ "rand_core 0.6.4", ] +[[package]] +name = "rand_chacha" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb" +dependencies = [ + "ppv-lite86", + "rand_core 0.9.3", +] + [[package]] name = "rand_core" version = "0.6.4" @@ -2160,7 +2181,7 @@ dependencies = [ "borsh", "bytes", "num-traits", - "rand", + "rand 0.8.5", "rkyv", "serde", "serde_json", @@ -2407,18 +2428,28 @@ checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" [[package]] name = "serde" -version = "1.0.219" +version = "1.0.226" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" +checksum = "0dca6411025b24b60bfa7ec1fe1f8e710ac09782dca409ee8237ba74b51295fd" +dependencies = [ + "serde_core", + "serde_derive", +] + +[[package]] +name = "serde_core" +version = "1.0.226" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba2ba63999edb9dac981fb34b3e5c0d111a69b0924e253ed29d83f7c99e966a4" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.219" +version = "1.0.226" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" +checksum = "8db53ae22f34573731bafa1db20f04027b2d25e02d8205921b569171699cdb33" dependencies = [ "proc-macro2", "quote", @@ -2462,11 +2493,11 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.8" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1" +checksum = "5417783452c2be558477e104686f7de5dae53dba813c28435e0e70f82d9b04ee" dependencies = [ - "serde", + "serde_core", ] [[package]] @@ -2725,7 +2756,7 @@ dependencies = [ "memchr", "once_cell", "percent-encoding", - "rand", + "rand 0.8.5", "rsa", "rust_decimal", "serde", @@ -2769,7 +2800,7 @@ dependencies = [ "memchr", "num-bigint", "once_cell", - "rand", + "rand 0.8.5", "rust_decimal", "serde", "serde_json", @@ -3025,14 +3056,17 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.22" +version = "0.9.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05ae329d1f08c4d17a59bed7ff5b5a769d062e64a62d34a3261b219e62cd5aae" +checksum = "00e5e5d9bf2475ac9d4f0d9edab68cc573dc2fd644b0dba36b0c30a92dd9eaa0" dependencies = [ - "serde", + "indexmap", + "serde_core", "serde_spanned", - "toml_datetime", - "toml_edit", + "toml_datetime 0.7.2", + "toml_parser", + "toml_writer", + "winnow", ] [[package]] @@ -3040,8 +3074,14 @@ name = "toml_datetime" version = "0.6.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3da5db5a963e24bc68be8b17b6fa82814bb22ee8660f192bb182771d498f09a3" + +[[package]] +name = "toml_datetime" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32f1085dec27c2b6632b04c80b3bb1b4300d6495d1e129693bdda7d91e72eec1" dependencies = [ - "serde", + "serde_core", ] [[package]] @@ -3051,18 +3091,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "310068873db2c5b3e7659d2cc35d21855dbafa50d1ce336397c666e3cb08137e" dependencies = [ "indexmap", - "serde", - "serde_spanned", - "toml_datetime", - "toml_write", + "toml_datetime 0.6.9", "winnow", ] [[package]] -name = "toml_write" -version = "0.1.1" +name = "toml_parser" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfb942dfe1d8e29a7ee7fcbde5bd2b9a25fb89aa70caea2eba3bee836ff41076" +checksum = "4cf893c33be71572e0e9aa6dd15e6677937abd686b066eac3f8cd3531688a627" +dependencies = [ + "winnow", +] + +[[package]] +name = "toml_writer" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d163a63c116ce562a22cda521fcc4d79152e7aba014456fb5eb442f6d6a10109" [[package]] name = "tower" @@ -3628,9 +3674,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.7.10" +version = "0.7.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06928c8748d81b05c9be96aad92e1b6ff01833332f281e8cfca3be4b35fc9ec" +checksum = "21a0236b59786fed61e2a80582dd500fe61f18b5dca67a4a067d0bc9039339cf" dependencies = [ "memchr", ] diff --git a/Cargo.toml b/Cargo.toml index b5d5b4a..34dae68 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,11 +23,12 @@ tokio = { version = "1.0", features = ["full"] } tracing = "0.1" tracing-subscriber = { version = "0.3", features = ["env-filter"] } dotenvy = "0.15.7" -toml = "0.8.22" +toml = "0.9.7" clap = { version = "4.0", features = ["derive"] } pbkdf2 = { version = "0.12", features = ["simple"] } rand_core = { version = "0.9.3", features = ["std"] } jsonwebtoken = "9" once_cell = "1.21.3" tower-http = {version= "0.6", features = ["trace", "cors"] } -tower = "0.5.2" \ No newline at end of file +tower = "0.5.2" +rand = "0.9.2" diff --git a/src/main.rs b/src/main.rs index 9d64f64..beba6c2 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,8 +1,8 @@ use crate::middleware::auth; use axum::{http::Method, Router}; use clap::Parser; -use sea_orm::{Database, DatabaseConnection}; -use serde::Deserialize; +use sea_orm::{Database, DatabaseConnection, Iden}; +use serde::{Deserialize, Serialize}; use tower::ServiceBuilder; use tower_http::cors::{Any, CorsLayer}; use tower_http::trace::TraceLayer; @@ -18,7 +18,7 @@ mod query; #[tokio::main] async fn main() { - dotenvy::dotenv().unwrap(); + // dotenvy::dotenv().unwrap(); // initialize tracing tracing_subscriber::registry() .with(tracing_subscriber::fmt::layer()) @@ -35,6 +35,9 @@ async fn main() { eprintln!("Failed to load config from {}", config_path); } } + Command::PrintExampleConfig {}=>{ + print_default_config().await; + } } } @@ -43,23 +46,23 @@ struct AppState { conn: DatabaseConnection, } -#[derive(Deserialize)] +#[derive(Deserialize,Serialize)] struct Key { jwt: String, user: String, } -#[derive(Deserialize)] +#[derive(Deserialize,Serialize)] struct DatabaseConf { connection: String, } -#[derive(Deserialize)] +#[derive(Deserialize,Serialize)] struct ServiceConf { host: String, port: u32, } -#[derive(Deserialize)] +#[derive(Deserialize,Serialize)] struct Config { service: ServiceConf, database: DatabaseConf, @@ -78,6 +81,7 @@ enum Command { #[arg(long = "conf")] config_path: String, }, + PrintExampleConfig {}, } async fn load_config(path: &str) -> Result> { let content = tokio::fs::read_to_string(path).await?; @@ -118,3 +122,22 @@ async fn start_server(config: &Config) { .await .expect("Service panic happened"); } + +async fn print_default_config() { + let example_conf = Config{ + service: ServiceConf { + host: "localhost".to_string(), + port: 8080, + }, + database: DatabaseConf { + connection: "postgres://postgres:postgres@localhost/test_db".to_string(), + }, + keys: Key { + jwt: "THIS_IS_TEST_CONFIG".to_string(), + user: "test_user".to_string(), + }, + }; + // 序列化为 TOML 字符串 + let toml_string = toml::to_string(&example_conf); + println!("#This is an example config.\n{}", toml_string.unwrap()); +} \ No newline at end of file