Merge pull request #95 from Jzow/master

upgrade: upgrade summer-boot 1.4.2 version
wansenai · Dec 27, 2023 · 3bacf5b · 3bacf5b
2 parents 28a55de + c546ddc
commit 3bacf5b
Show file tree

Hide file tree

Showing 13 changed files with 72 additions and 55 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,4 +1,5 @@
 [workspace]
+resolver = "2"
 members = [
   "summer-boot",
   # other members

diff --git a/README.md b/README.md
@@ -49,7 +49,7 @@ summer_boot::log
    ____) | |_| | | | | | | | | | | |  __/ |    | |_) | (_) | (_) | |_ 
   |_____/ \__,_|_| |_| |_|_| |_| |_|\___|_|    |____/ \___/ \___/ \__|
 
-  :: Summer Boot Version::             (1.4.0)                                                                    
+  :: Summer Boot Version::             (1.4.2)                                                                    
 
 summer_boot::server::server Server listening on http://0.0.0.0:8080
 ```
@@ -58,7 +58,7 @@ summer_boot::server::server Server listening on http://0.0.0.0:8080
 
 Cargo.toml:
 ```rust
-summer-boot = "1.4.0"
+summer-boot = "1.4.2"
 ```
 
 Add resuorce configuration file to src directory

diff --git a/example/Cargo.toml b/example/Cargo.toml
@@ -1,11 +1,12 @@
 [package]
 name = "example"
 version = "0.1.0"
-rust-version = "1.60.0"
+rust-version = "1.73.0"
 edition = "2021"
 description = "summer boot example"
 authors = [
-    "James Zow <[email protected]>"
+    "James Zow <[email protected]>",
+    "WanSen AI Team <[email protected]>"
 ]
 license = "Apache-2.0"
 
@@ -18,4 +19,4 @@ schemars = "0.8.8"
 tokio = { version = "1.19.2", features = ["full"] }
 
 #summer
-summer-boot = { version = "1.3", path = "../summer-boot" }
+summer-boot = { version = "1.4.2", path = "../summer-boot" }
diff --git a/example/src/log.rs b/example/src/log.rs
@@ -1,22 +1,15 @@
-use summer_boot::log;
-
 #[cfg(test)]
 mod test {
-
-    use super::*;
-
+    use summer_boot::log;
     #[test]
     fn log_print() {
         // 在使用log的时候需要调用start()方法开启log记录
         log::start();
-
         log::info!("Hello Summer Boot");
 
         // debug 模式下日志记录
         log::debug!("debug apps");
-
         log::error!("process error");
-
         log::warn!("warning apps");
     }
 

diff --git a/example/src/read_yml.rs b/example/src/read_yml.rs
@@ -36,7 +36,7 @@ pub struct EnvConfig {
 加载环境配置
  */
 pub fn load_env_conf() -> Option<EnvConfig> {
-    let path = format!("src/resources/application.yml");
+    let path = "src/resources/application.yml".to_string();
     let schema = yaml_from_str::<RootSchema>(&read_to_string(&path).unwrap_or_else(|_| {
         panic!(
             "Error loading configuration file {}, please check the configuration!",
@@ -128,4 +128,22 @@ mod tests {
             }
         }
     }
+
+    #[test]
+    fn test_load_global_config() {
+        let pro = load_global_config("dev".to_string());
+        println!("{:?}", pro);
+        pro.as_ref().map(|a| {
+            println!("mysqlConfig:{}", serde_json::to_string(&a.mysql).unwrap());
+        });
+    }
+
+    #[test]
+    fn test_load_conf() {
+        let pro = load_conf();
+        println!("{:?}", pro);
+        pro.as_ref().map(|a| {
+            println!("mysqlConfig:{}", serde_json::to_string(&a.mysql).unwrap());
+        });
+    }
 }
diff --git a/summer-boot-actuator/src/configuration_properties.rs b/summer-boot-actuator/src/configuration_properties.rs
@@ -2,25 +2,31 @@
 //! Configuration properties
 //! 
 pub struct ConfigurationProperties {
-    pub keys_sanitize : Vec<String>,
-    pub additional_keys_sanitize : Vec<String>,
+    pub keys_sanitize: Vec<String>,
+    pub additional_keys_sanitize: Vec<String>,
 }
 
 impl ConfigurationProperties {
+    pub fn new() -> ConfigurationProperties {
+        ConfigurationProperties {
+            keys_sanitize: Vec::new(),
+            additional_keys_sanitize: Vec::new(),
+        }
+    }
 
-    pub fn getKeysSanitize() -> Vec<String> {
-        ConfigurationProperties.keys_sanitize
+    pub fn get_keys_sanitize(&self) -> &Vec<String> {
+        &self.keys_sanitize
     }
 
-    pub fn setKeysSanitize(keys_sanitize: Vec<String>) {
-        ConfigurationProperties.keys_sanitize = keys_sanitize;
+    pub fn set_keys_sanitize(&mut self, keys_sanitize: Vec<String>) {
+        self.keys_sanitize = keys_sanitize;
     }
 
-    pub fn getAdditionalKeysSanitize() -> Vec<String> {
-        ConfigurationProperties.additional_keys_sanitize
+    pub fn get_additional_keys_sanitize(&self) -> &Vec<String> {
+        &self.additional_keys_sanitize
     }
 
-    pub fn setAdditionalKeysSanitize(additional_keys_sanitize: Vec<String>) {
-        ConfigurationProperties.additional_keys_sanitize = additional_keys_sanitize;
+    pub fn set_additional_keys_sanitize(&mut self, additional_keys_sanitize: Vec<String>) {
+        self.additional_keys_sanitize = additional_keys_sanitize;
     }
-}
+}
diff --git a/summer-boot-actuator/src/lib.rs b/summer-boot-actuator/src/lib.rs
@@ -1 +1 @@
-
+mod configuration_properties;
diff --git a/summer-boot-autoconfigure/Cargo.toml b/summer-boot-autoconfigure/Cargo.toml
@@ -1,20 +1,20 @@
 [package]
 name = "summer-boot-autoconfigure"
-version = "1.4.0"
-rust-version = "1.60.0"
+version = "1.4.1"
+rust-version = "1.73.0"
 edition = "2021"
 description = "summer boot autoconfigure"
 authors = [
     "James Zow <[email protected]>",
     "Xinyu Gao <[email protected]>",
-    "Summeros Team <team@summeros.org>"
+    "WanSen AI Team <team@wansenai.com>"
 ]
 license = "Apache-2.0"
 readme = "README.md"
 keywords = ["middleware", "autoconfigure", "summer"]
-documentation = "https://github.com/summer-os/summer-boot/summer-boot-autoconfigure/#readme"
-repository = "https://github.com/summer-os/summer-boot"
-homepage = "https://summeros.io/"
+documentation = "https://github.com/wansenai/summer-boot#readme"
+repository = "https://github.com/wansenai/summer-boot"
+homepage = "https://crates.io/crates/summer-boot"
 
 
 [dependencies]

diff --git a/summer-boot-macro/Cargo.toml b/summer-boot-macro/Cargo.toml
@@ -1,19 +1,19 @@
 [package]
 name = "summer-boot-macro"
-version = "1.4.0"
-rust-version = "1.60.0"
+version = "1.4.1"
+rust-version = "1.73.0"
 edition = "2021"
 description = "summer boot macro"
 license = "Apache-2.0"
 authors = [
     "James Zow <[email protected]>",
     "Yangandmore <[email protected]>",
-    "Summeros Team <team@summeros.org>"
+    "WanSen AI Team <team@wansenai.com>"
 ]
 readme = "README.md"
-documentation = "https://github.com/summer-os/summer-boot/blob/master/summer-boot-macro/README.md"
-repository = "https://github.com/summer-os/summer-boot"
-homepage = "https://summeros.io/"
+documentation = "https://github.com/wansenai/summer-boot#readme"
+repository = "https://github.com/wansenai/summer-boot"
+homepage = "https://crates.io/crates/summer-boot"
 
 [lib]
 proc-macro = true
@@ -25,7 +25,7 @@ syn = { version = "1.0", features = ["full"] }
 toml = "0.8"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
-summer-boot-autoconfigure = { version = "1.4", path = "../summer-boot-autoconfigure"}
+summer-boot-autoconfigure = { version = "1.4.1", path = "../summer-boot-autoconfigure"}
 
 [dev-dependencies]
-summer-boot = { version = "1.4", path = "../summer-boot" }
+summer-boot = { version = "1.4.1", path = "../summer-boot" }
diff --git a/summer-boot-macro/README.md b/summer-boot-macro/README.md
@@ -5,7 +5,7 @@ Used to write all macros of summer boot
 ## Getting Started
 
 ```rust
-summer-boot-macro = "1.4.0"
+summer-boot-macro = "1.4.1"
 ```
 
 ## Macro description

diff --git a/summer-boot/Cargo.toml b/summer-boot/Cargo.toml
@@ -1,22 +1,22 @@
 [package]
 name = "summer-boot"
-version = "1.4.0"
-rust-version = "1.60.0"
+version = "1.4.2"
+rust-version = "1.73.0"
 edition = "2021"
 description = "summer boot"
 authors = [
     "James Zow <[email protected]>",
-    "Summeros Team <team@summeros.org>"
+    "WanSen AI Team <team@wansenai.com>"
 ]
 license = "Apache-2.0"
 readme = "README.md"
 keywords = ["tcp", "http", "web", "summer"]
-documentation = "https://github.com/summer-os/summer-boot#readme"
-repository = "https://github.com/summer-os/summer-boot"
-homepage = "https://summeros.io/"
+documentation = "https://github.com/wansenai/summer-boot#readme"
+repository = "https://github.com/wansenai/summer-boot"
+homepage = "https://crates.io/crates/summer-boot"
 
 [features]
-default = ["macros", "async-h1"]
+default = ["macros"]
 macros = [
     "summer-boot-macro"
 ]
@@ -33,7 +33,6 @@ async-std = { version = "1.8.0", features = ["attributes"] }
 async-trait = "0.1.41"
 async-channel = "1.5.1"
 async-dup = "1.2.2"
-async-h1 = { version = "2.3.0", optional = true }
 
 #pin
 pin-project = "1.0.2"
@@ -46,7 +45,7 @@ futures-util = "0.3.6"
 
 
 # summer dependencies
-summer-boot-macro = { version = "1.4" , optional = true, path = "../summer-boot-macro"}
+summer-boot-macro = { version = "1.4.1" , optional = true, path = "../summer-boot-macro"}
 
 #log
 femme = { version = "2.1.1"}

diff --git a/summer-boot/README.md b/summer-boot/README.md
@@ -16,7 +16,7 @@ summer_boot::log
    ____) | |_| | | | | | | | | | | |  __/ |    | |_) | (_) | (_) | |_ 
   |_____/ \__,_|_| |_| |_|_| |_| |_|\___|_|    |____/ \___/ \___/ \__|
 
-  :: Summer Boot Version::             (1.4.0)                                                                    
+  :: Summer Boot Version::             (1.4.2)                                                                    
 
 summer_boot::web2::server::server Server listening on http://0.0.0.0:8080
 ```
@@ -25,7 +25,7 @@ summer_boot::web2::server::server Server listening on http://0.0.0.0:8080
 
 Cargo.toml:
 ```rust
-summer-boot = "1.4.0"
+summer-boot = "1.4.2"
 ```
 
 Add resuorce configuration file to src directory

diff --git a/summer-boot/src/tcp/unix.rs b/summer-boot/src/tcp/unix.rs
@@ -1,7 +1,7 @@
 use super::{is_transient_error, ListenInfo};
 
 use super::Listener;
-use crate::Server;
+use crate::{http1, Server};
 
 use std::fmt::{self, Display, Formatter};
 
@@ -42,8 +42,7 @@ fn handle_unix<State: Clone + Send + Sync + 'static>(app: Server<State>, stream:
     task::spawn(async move {
         let local_addr = unix_socket_addr_to_string(stream.local_addr());
         let peer_addr = unix_socket_addr_to_string(stream.peer_addr());
-
-        let fut = async_h1::accept(stream, |mut req| async {
+        let fut = http1::http::accept(stream, |mut req| async {
             req.set_local_addr(local_addr.as_ref());
             req.set_peer_addr(peer_addr.as_ref());
             app.respond(req).await