replace lazy_static with rust standrad library OnceCell fixed issue #5

Author: TianLangStudio

Cargo.lock

@@ -1,5 +1,5 @@
 [workspace]
-
+resolver = "2"
 members = [
 # common for some functions to share
     "common",

Cargo.toml

@@ -2,7 +2,7 @@
 name = "common"
 version = "0.1.0"
 authors = ["Tianlang <[email protected]>"]
-edition = "2021"
+edition = "2024"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -12,7 +12,6 @@ log = "0.4"
 log4rs="1"
 blake2 = "0.10" # https://github.com/RustCrypto/hashes
 data-encoding = "2"
-lazy_static = "1.4"
 diesel = {version ="2", features=["mysql","r2d2"]}
 uuid = { version = "1", features = ["serde", "v4"] }
 serde = { version = "1", features = ["derive"] }

common/Cargo.toml

@@ -1,44 +1,44 @@
+use std::sync::OnceLock;
 use config::{Config, ConfigBuilder, Value};
-use lazy_static::lazy_static;
-
-lazy_static! {
-    pub static ref APP_CONFIG: Config = {
-        let config_default = Config::builder()
-            .add_source(config::File::with_name("conf/application"))
-            .build()
-            .expect("请提供配置文件confg/application.yaml");
-        let mut config_builder = Config::builder().add_source(config_default.clone());
-        config_builder = match config_default.get_string("tl.app.mode") {
-            Ok(value) => {
-                let config_file_name = format!("conf/application_{}", value);
-                config_builder.add_source(config::File::with_name(&config_file_name))
-            }
-            _ => config_builder.add_source(config::File::with_name("conf/application_dev")),
-        };
-        config_builder
-            .add_source(config::Environment::with_prefix("TL_APP"))
-            .build()
-            .unwrap()
+static APP_CONFIG: OnceLock<Config> = OnceLock::new();
+pub fn get_app_config() -> &'static Config {
+    APP_CONFIG.get_or_init(init_app_config)
+}
+fn init_app_config() -> Config {
+    let config_default = Config::builder()
+        .add_source(config::File::with_name("conf/application"))
+        .build()
+        .expect("请提供配置文件confg/application.yaml");
+    let mut config_builder = Config::builder().add_source(config_default.clone());
+    config_builder = match config_default.get_string("tl.app.mode") {
+        Ok(value) => {
+            let config_file_name = format!("conf/application_{}", value);
+            config_builder.add_source(config::File::with_name(&config_file_name))
+        }
+        _ => config_builder.add_source(config::File::with_name("conf/application_dev")),
     };
+    config_builder
+        .add_source(config::Environment::with_prefix("TL_APP"))
+        .build()
+        .unwrap()
 }
-
 pub fn is_prod() -> bool {
-    match APP_CONFIG.get_string("tl.app.mode") {
+    match get_app_config().get_string("tl.app.mode") {
         Ok(value) if value == "prod" => true,
         _ => false,
     }
 }
 
 pub fn need_approval() -> bool {
-    match APP_CONFIG.get_bool("tl.app.approval.enable") {
+    match get_app_config().get_bool("tl.app.approval.enable") {
         Ok(value) => true,
         _ => false,
     }
 }
 
 //set
 pub fn is_approver(username: &str) -> bool {
-    match APP_CONFIG.get_string("tl.app.approval.users") {
+    match get_app_config().get_string("tl.app.approval.users") {
         Ok(values) => values.split(",").any(|v| v == username),
         _ => false,
     }

common/src/config_util.rs

@@ -1,29 +1,30 @@
+use std::sync::OnceLock;
 use std::time::Duration;
 
 use diesel::prelude::*;
 use diesel::r2d2::{self, ConnectionManager};
-use lazy_static::lazy_static;
 use log::info;
-
-use super::config_util;
+use crate::config_util::get_app_config;
 
 pub type DbConnection = MysqlConnection;
 pub type Pool = r2d2::Pool<ConnectionManager<DbConnection>>;
 pub type PooledConnection = r2d2::PooledConnection<ConnectionManager<DbConnection>>;
-
-lazy_static! {
-    pub static ref POOL: Pool = {
-        info!("db pool init");
-        let connspec = config_util::APP_CONFIG
-            .get_string("tl.app.db.url")
-            .expect("db url is required");
-        let manager = ConnectionManager::<DbConnection>::new(connspec);
-        r2d2::Pool::builder()
-            .build(manager)
-            .expect("Failed to create pool.")
-    };
+// Define the static POOL with OnceLock
+static POOL: OnceLock<Pool> = OnceLock::new();
+// Usage example (you’d call this wherever POOL is accessed)
+pub fn get_pool() -> &'static Pool {
+    POOL.get_or_init(|| init_pool())
+}
+fn init_pool() -> Pool {
+    info!("db pool init");
+    let conn_url = get_app_config()
+        .get_string("tl.app.db.url")
+        .expect("db url is required");
+    let manager = ConnectionManager::<DbConnection>::new(conn_url);
+    r2d2::Pool::builder()
+        .build(manager)
+        .expect("Failed to create pool.")
 }
-
 pub fn get_conn(pool: &Pool) -> Option<PooledConnection> {
     match pool.get_timeout(Duration::new(10, 0)) {
         Ok(conn) => Some(conn),

common/src/db_util.rs

@@ -1,4 +1,3 @@
-use lazy_static::lazy_static;
 use log::{debug, error, info, trace, warn};
 use log4rs;
 

common/src/log_util.rs

@@ -3,7 +3,7 @@ use blake2::{digest::Update, Blake2b, Blake2s256, Digest};
 use data_encoding::BASE64;
 
 fn get_salt() -> String {
-    config_util::APP_CONFIG
+    config_util::get_app_config()
         .get_string("tl.app.sign.salt")
         .expect("tl.app.sign.salt is required")
 }

common/src/sign_util.rs

@@ -2,7 +2,7 @@
 name = "dao"
 version = "0.1.0"
 authors = ["Tianlang <[email protected]>"]
-edition = "2021"
+edition = "2024"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

dao/Cargo.toml

@@ -282,12 +282,12 @@ <h1 class="h4 text-gray-900 mb-4">Welcome</h1>
         <script>
             var _hmt = _hmt || [];
             (function() {
-              var hm = document.createElement("script");
-              hm.src = "https://hm.baidu.com/hm.js?5a990c2b8047428b734d3a86ee9e881f";
-              var s = document.getElementsByTagName("script")[0]; 
-              s.parentNode.insertBefore(hm, s);
+                var hm = document.createElement("script");
+                hm.src = "https://hm.baidu.com/hm.js?6b36cffe6ce0975ce8a6fa60cc433d1f";
+                var s = document.getElementsByTagName("script")[0];
+                s.parentNode.insertBefore(hm, s);
             })();
-            </script>
+        </script>
         <!-- Google tag (gtag.js) -->
         <script async src="https://www.googletagmanager.com/gtag/js?id=G-JZ81SEB2BH"></script>
         <script>

template/freelancer/common/base.html

@@ -285,12 +285,12 @@ <h1 class="h4 text-gray-900 mb-4">欢迎回来</h1>
         <script>
             var _hmt = _hmt || [];
             (function() {
-              var hm = document.createElement("script");
-              hm.src = "https://hm.baidu.com/hm.js?5a990c2b8047428b734d3a86ee9e881f";
-              var s = document.getElementsByTagName("script")[0]; 
-              s.parentNode.insertBefore(hm, s);
+                var hm = document.createElement("script");
+                hm.src = "https://hm.baidu.com/hm.js?6b36cffe6ce0975ce8a6fa60cc433d1f";
+                var s = document.getElementsByTagName("script")[0];
+                s.parentNode.insertBefore(hm, s);
             })();
-            </script>
+        </script>
         <!-- Google tag (gtag.js) -->
         <script async src="https://www.googletagmanager.com/gtag/js?id=G-JZ81SEB2BH"></script>
         <script>

template/freelancer/common/base_cn.html

@@ -2,7 +2,7 @@
 name = "web"
 version = "0.1.0"
 authors = ["Tianlang <[email protected]>"]
-edition = "2021"
+edition = "2024"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

web/Cargo.toml

@@ -10,7 +10,6 @@ use async_std::fs::File;
 use diesel::r2d2::{self, ConnectionManager};
 
 use futures::{AsyncWriteExt, StreamExt};
-use lazy_static::lazy_static;
 
 use log::{error, info};
 
@@ -37,7 +36,7 @@ pub(crate) async fn upload(
 
     let mut file_ids: Vec<String> = Vec::new();
     while let Some(Ok(field)) = multipart.next().await {
-        let path = &*FILE_SAVE_PATH;
+        let path = &get_file_save_path();
         match save_file(field, path, &username, &pool).await {
             Ok(file_id) => file_ids.push(file_id),
             Err(err) => return Either::Right(Err(err)),
@@ -55,37 +54,36 @@ pub(crate) async fn upload(
 pub(crate) async fn view_file(path_params: web::Path<(String,)>) -> Result<fs::NamedFile> {
     let path_params = path_params.into_inner();
     let file_id = &path_params.0;
-    let path = Path::new(&*FILE_SAVE_PATH);
+    let save_path = get_file_save_path();
+    let path = Path::new(&save_path);
     //todo 判断是否是私有文件
     Ok(fs::NamedFile::open(path.join(file_id))?)
 }
 fn success_with_file_ids(file_ids: Vec<String>) -> HttpResponse {
     HttpResponse::Ok().json(result::AjaxResult::success(Some(file_ids)))
 }
 fn get_file_save_path() -> String {
-    let path = match config_util::APP_CONFIG.get_string("tl.app.upload.path") {
-        Ok(path) => path,
-        Err(_) => String::from("upload"),
-    };
+    let path = config_util::get_app_config()
+        .get_string("tl.app.upload.path")
+        .unwrap_or_else(|_| String::from("upload"));
     match std::fs::create_dir_all(&path) {
         Ok(_) => info!(" app upload path:{}", &path),
-        Err(_) => error!("error create app uplod path: {}", &path),
+        Err(_) => error!("error create app upload path: {}", &path),
     }
     path
 }
 
 fn get_file_max_size_bytes() -> usize {
-    let max_size_mb = match config_util::APP_CONFIG.get_float("tl.app.upload.max_size") {
-        Ok(size_mb) => size_mb,
-        Err(_) => 1.0,
-    };
+    let max_size_mb = config_util::get_app_config()
+        .get_float("tl.app.upload.max_size")
+        .unwrap_or_else(|_| 1.0);
     (max_size_mb * 1024.0 * 1024.0) as usize
 }
 
-lazy_static! {
-    static ref FILE_SAVE_PATH: String = get_file_save_path();
-    static ref FILE_MAX_SIZE: usize = get_file_max_size_bytes();
-}
+/*lazy_static! {
+    //static ref FILE_SAVE_PATH: String = get_file_save_path();
+    //static ref FILE_MAX_SIZE: usize = get_file_max_size_bytes();
+}*/
 
 //保存文件
 async fn save_file(
@@ -107,7 +105,7 @@ async fn save_file(
     while let Some(bytes) = field.next().await {
         let bytes = bytes?;
         length += bytes.len();
-        if length > *FILE_MAX_SIZE {
+        if length > get_file_max_size_bytes() {
             error!("err:{}", "上传的文件过大");
             return Err(error::ErrorInternalServerError("上传的文件过大"));
             //return Err(Error::from(Response::new(StatusCode::INTERNAL_SERVER_ERROR).set_body(BoxBody::new("上传的文件过大"))));

web/src/filectrl.rs

@@ -38,17 +38,17 @@ async fn main() -> std::io::Result<()> {
 
         tera.register_function(
             "list_new_articles",
-            funs::article::make_list_new_articles(db_util::POOL.clone()),
+            funs::article::make_list_new_articles(db_util::get_pool().clone()),
         );
         tera.register_function(
             "list_recommend_articles",
-            funs::article::make_list_recommend_articles(db_util::POOL.clone()),
+            funs::article::make_list_recommend_articles(db_util::get_pool().clone()),
         );
         //  tera.full_reload();
 
         App::new()
             .app_data(web::Data::new(tera))
-            .app_data(web::Data::new(db_util::POOL.clone())) //绑定数据库链接池
+            .app_data(web::Data::new(db_util::get_pool().clone())) //绑定数据库链接池
             .wrap(middleware::AuthService) //添加根据Session验证登录状态的中间件
             .wrap(SessionMiddleware::new(
                 CookieSessionStore::default(),
@@ -76,10 +76,10 @@ async fn main() -> std::io::Result<()> {
         let config = load_rustls_config();
         server.bind_rustls("127.0.0.1:8443", config)?.run().await
     } else {
-        let port = config_util::APP_CONFIG
+        let port = config_util::get_app_config()
             .get_string("tl.app.http.port")
             .expect("port is required");
-        let host = config_util::APP_CONFIG
+        let host = config_util::get_app_config()
             .get_string("tl.app.http.host")
             .expect("host is required");
         let host_port = host + ":" + &port;

web/src/main.rs

@@ -45,7 +45,7 @@ pub fn render_html(
     HttpResponse::Ok().content_type("text/html").body(body)
 }
 pub fn get_tmpl_from_session(_session: &Session) -> String {
-    config_util::APP_CONFIG
+    config_util::get_app_config()
         .get_string("tl.app.template.name")
         .expect("default template name is required")
 }