Skip to content

Commit

Permalink
Fix some dependency issues.
Browse files Browse the repository at this point in the history
  • Loading branch information
gudaoxuri committed Jun 11, 2022
1 parent 3e4bca0 commit d1428e0
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
7 changes: 4 additions & 3 deletions Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "tardis"
version = "0.1.0-alpha9"
version = "0.1.0-alpha10"
authors = ["gudaoxuri <i@sunisle.org>"]
description = "Elegant, clean Rust development framework"
keywords = ["http", "database", "web", "redis", "mq"]
Expand Down Expand Up @@ -57,6 +57,7 @@ env_logger = { version = "^0.9" }
config = { version = "^0.13" }
regex = { version = "^1.5" }
url = { version = "^2.2" }
openssl = { version = "^0.10", features = ["vendored"] }

# Tokio
tokio = { version = "^1.18", features = ["macros", "rt-multi-thread", "signal", "time"], optional = true }
Expand All @@ -79,7 +80,7 @@ tracing = { version = "^0.1", optional = true }
tracing-subscriber = { version = "^0.3", features = ["env-filter"], optional = true }

# RelDB
sea-orm = { version = "^0.8", features = ["sqlx-all", "macros", "runtime-tokio-rustls", "debug-print"], optional = true }
sea-orm = { version = "^0.8", features = ["sqlx-all", "macros", "runtime-tokio-native-tls", "debug-print"], optional = true }
sea-query = { version = "^0.24", optional = true }
sqlparser = { version = "^0.17", optional = true }

Expand All @@ -92,7 +93,7 @@ poem = { version = "^1.3", features = ["csrf", "opentelemetry", "rustls", "prome
reqwest = { version = "^0.11", features = ["json"], optional = true }

# Redis
redis = { version = "^0.21", features = ["tokio-comp"], optional = true }
redis = { version = "^0.21", features = ["tokio-comp", "tokio-native-tls-comp"], optional = true }

# Rabbit
lapin = { version = "^2.0", optional = true }
Expand Down
3 changes: 1 addition & 2 deletions src/basic/config.rs
Expand Up @@ -228,8 +228,7 @@ pub struct WebServerConfig {
pub port: u16,
/// Allowed cross-domain sources, default is `*` / 允许的跨域来源,默认为 `*`
pub allowed_origin: String,
/// TLS Key, if this configuration is included then the protocol is HTTPS / TLS Key,如果包含此配置则协议为
/// HTTPS
/// TLS Key, if this configuration is included then the protocol is HTTPS / TLS Key,如果包含此配置则协议为HTTPS
pub tls_key: Option<String>,
/// TLS certificate / TLS 证书
pub tls_cert: Option<String>,
Expand Down

0 comments on commit d1428e0

Please sign in to comment.