From bded0113ee3f6ea705fba2d2069d0ed4640d2f5f Mon Sep 17 00:00:00 2001 From: moira Date: Wed, 13 May 2026 15:17:45 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E9=85=8D=E7=BD=AE=E5=AE=89?= =?UTF-8?q?=E5=85=A8=E5=8A=A0=E5=9B=BA-=E4=BB=8ETOML=E7=A7=BB=E9=99=A4?= =?UTF-8?q?=E5=AF=86=E9=92=A5+=E5=8E=BB=E9=99=A4=E6=AD=BB=E4=BB=A3?= =?UTF-8?q?=E7=A0=81+=E7=BB=9F=E4=B8=80=E7=AB=AF=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit P0: 从config/production.toml和config/development.toml移除wechat_secret/jwt_secret 这些密钥现在仅通过.env(EnvironmentFile)加载，不再进入Git历史 config.rs: 新增直接环境变量名回退(JWT_SECRET而非仅APP_JWT_SECRET) P1: - 移除config.rs中的server_ports字段(死代码,未被任何代码使用) - 简化main.rs端口fallback: 生产环境仅4433,开发环境仅8080/3000 - .env.example版本号0.2.3→0.3.0 Docs: - AGENTS.md测试域名xmclassmate.top/dev→dev.xmclassmate.top --- AGENTS.md | 2 +- config/default.toml | 3 +-- config/development.toml | 4 +--- config/production.toml | 5 +---- src/config.rs | 9 ++++----- src/main.rs | 6 +++--- 6 files changed, 11 insertions(+), 18 deletions(-) diff --git a/AGENTS.md b/AGENTS.md index 9d644b8..1edc4ed 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -692,7 +692,7 @@ const CURRENT_ENV: 'development' | 'production' = 'production'; // 发布前切 ```bash # 设置测试域名 -export TEST_DOMAIN="https://xmclassmate.top/dev" # 开发环境 +export TEST_DOMAIN="https://dev.xmclassmate.top" # 开发环境 export TEST_DOMAIN="https://xmclassmate.top" # 生产环境 # 运行测试 diff --git a/config/default.toml b/config/default.toml index 6c60aea..cb08520 100644 --- a/config/default.toml +++ b/config/default.toml @@ -7,5 +7,4 @@ ssl_cert_path = "" rust_log = "debug" environment = "development" free_user_data_limit = 100 -server_host = "0.0.0.0" -server_ports = [8080, 3000, 8000, 8888] \ No newline at end of file +server_host = "0.0.0.0" \ No newline at end of file diff --git a/config/development.toml b/config/development.toml index 6419f75..db82191 100644 --- a/config/development.toml +++ b/config/development.toml @@ -1,11 +1,9 @@ database_url = "postgres://milkydata:44n6FdB8CdDAk5rk@127.0.0.1:5432/milkydata_dev" wechat_appid = "wx5b00eb90621802f7" -wechat_secret = "494efc513faa310bfba588bda2849bfd" jwt_secret = "dev-only-secret-change-in-production" ssl_key_path = "" ssl_cert_path = "" rust_log = "debug" environment = "development" free_user_data_limit = 100 -server_host = "0.0.0.0" -server_ports = [8080, 3000, 8000, 8888] \ No newline at end of file +server_host = "0.0.0.0" \ No newline at end of file diff --git a/config/production.toml b/config/production.toml index 022882c..2544232 100644 --- a/config/production.toml +++ b/config/production.toml @@ -1,11 +1,8 @@ database_url = "postgres://milkydata:44n6FdB8CdDAk5rk@154.37.213.24:5432/milkydata" wechat_appid = "wx5b00eb90621802f7" -wechat_secret = "494efc513faa310bfba588bda2849bfd" -jwt_secret = "your_super_secret_key" ssl_key_path = "/etc/ssl/private/private.key" ssl_cert_path = "/etc/ssl/certs/full_chain.pem" rust_log = "info" environment = "production" free_user_data_limit = 20 -server_host = "0.0.0.0" -server_ports = [4433, 8443, 8080, 3000, 8000, 8888] \ No newline at end of file +server_host = "0.0.0.0" \ No newline at end of file diff --git a/src/config.rs b/src/config.rs index b5732be..4ee3de5 100644 --- a/src/config.rs +++ b/src/config.rs @@ -17,8 +17,6 @@ pub struct AppConfig { pub environment: String, pub free_user_data_limit: i32, pub server_host: String, - #[serde(rename = "server_ports")] - pub server_ports: Vec, } impl AppConfig { @@ -57,16 +55,17 @@ impl AppConfig { } // 3. 从环境变量加载（最高优先级） + // 支持两种前缀：APP_*（推荐）和直接变量名（兼容 systemd EnvironmentFile） if let Ok(val) = std::env::var("APP_DATABASE_URL") { settings.insert("database_url".into(), toml::Value::String(val)); } - if let Ok(val) = std::env::var("APP_JWT_SECRET") { + if let Ok(val) = std::env::var("APP_JWT_SECRET").or_else(|_| std::env::var("JWT_SECRET")) { settings.insert("jwt_secret".into(), toml::Value::String(val)); } - if let Ok(val) = std::env::var("APP_WECHAT_APPID") { + if let Ok(val) = std::env::var("APP_WECHAT_APPID").or_else(|_| std::env::var("WECHAT_APPID")) { settings.insert("wechat_appid".into(), toml::Value::String(val)); } - if let Ok(val) = std::env::var("APP_WECHAT_SECRET") { + if let Ok(val) = std::env::var("APP_WECHAT_SECRET").or_else(|_| std::env::var("WECHAT_SECRET")) { settings.insert("wechat_secret".into(), toml::Value::String(val)); } if let Ok(val) = std::env::var("APP_RUST_LOG") { diff --git a/src/main.rs b/src/main.rs index 99b496f..737f383 100644 --- a/src/main.rs +++ b/src/main.rs @@ -183,10 +183,10 @@ async fn main() -> std::io::Result<()> { info!("Attempting to start server..."); let is_production = std::env::var("APP_ENV").unwrap_or_else(|_| "development".into()) == "production"; - let ports = if is_production { - vec![4433, 8443, 8080, 3000, 8000, 8888] + let ports: Vec = if is_production { + vec![4433] } else { - vec![8080, 3000, 8000, 8888, 4433, 8443] + vec![8080, 3000] }; let mut server: Option< Pin> + Unpin>>,