refacotr: remove directory ultimates

yangbajing · Aug 29, 2024 · 41a0f41 · 41a0f41
1 parent 8d6e07f
commit 41a0f41
Show file tree

Hide file tree

Showing 80 changed files with 9 additions and 10 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,5 +1,5 @@
 [workspace]
-members = ["ultimates/*", "crates/*", "examples/api-example"]
+members = ["crates/*", "examples/api-example"]
 resolver = "2"
 
 [workspace.package]
@@ -20,10 +20,10 @@ cloud-storage = { version = "0.1", path = "crates/storage" }
 wework-sdk = { version = "0.1", path = "crates/wework-sdk" }
 huaweicloud-sdk-obs = { version = "0.1", path = "crates/huaweicloud-sdk-obs" }
 huaweicloud-sdk-core = { version = "0.1", path = "crates/huaweicloud-sdk-core" }
-ultimate-common = { version = "0.1", path = "ultimates/ultimate-common" }
-ultimate = { version = "0.1", path = "ultimates/ultimate" }
-ultimate-db = { version = "0.1", path = "ultimates/ultimate-db" }
-ultimate-web = { version = "0.1", path = "ultimates/ultimate-web" }
+ultimate-common = { version = "0.1", path = "crates/ultimate-common" }
+ultimate = { version = "0.1", path = "crates/ultimate" }
+ultimate-db = { version = "0.1", path = "crates/ultimate-db" }
+ultimate-web = { version = "0.1", path = "crates/ultimate-web" }
 # -- projects end
 # begin -- memory allocator
 tikv-jemallocator = "0.6"
@@ -100,7 +100,7 @@ sqlx = { version = "0.7", features = [
     "rust_decimal",
     "json",
 ] }
-modql = { version = "0.4.0-rc", features = ["with-sea-query"] }
+modql = { version = "0.4", features = ["with-sea-query"] }
 sea-query = { version = "0.31", features = ["attr"] }
 sea-query-binder = { version = "0.6", features = [
     "sqlx-postgres",

diff --git a/crates/README.md b/crates/README.md
@@ -1,5 +1,8 @@
 # crates
 
 - [ultimate-common](ultimate-common): Rust 公共库
+- [ultimate](ultimate): 可复用组件库，比如：对 `tonic` 等的封装
+- [ultimate-db](ultimate): 可复用组件库，比如：对 `sqlx`、`tonic` 等的封装
+- [ultimate-web](ultimate-web): 可复用 WEB 组件库，比如：对 `axum` 等的封装
 - [huaweicloud-sdk-obs](huaweicloud-sdk-core): 华为云 OBS SDK
 - [huaweicloud-sdk-core](huaweicloud-sdk-core): 华为云全局服务 SDK，包含：Token、IAM
diff --git a/ultimates/ultimate-common/Cargo.toml → crates/ultimate-common/Cargo.toml b/ultimates/ultimate-common/Cargo.toml → crates/ultimate-common/Cargo.toml
diff --git a/ultimates/ultimate-common/README.md → crates/ultimate-common/README.md b/ultimates/ultimate-common/README.md → crates/ultimate-common/README.md
diff --git a/...ultimate-common/examples/example-metas.rs → ...ultimate-common/examples/example-metas.rs b/...ultimate-common/examples/example-metas.rs → ...ultimate-common/examples/example-metas.rs
diff --git a/ultimates/ultimate-common/src/digest.rs → crates/ultimate-common/src/digest.rs b/ultimates/ultimate-common/src/digest.rs → crates/ultimate-common/src/digest.rs
diff --git a/ultimates/ultimate-common/src/env.rs → crates/ultimate-common/src/env.rs b/ultimates/ultimate-common/src/env.rs → crates/ultimate-common/src/env.rs
diff --git a/ultimates/ultimate-common/src/error.rs → crates/ultimate-common/src/error.rs b/ultimates/ultimate-common/src/error.rs → crates/ultimate-common/src/error.rs
diff --git a/ultimates/ultimate-common/src/lib.rs → crates/ultimate-common/src/lib.rs b/ultimates/ultimate-common/src/lib.rs → crates/ultimate-common/src/lib.rs
diff --git a/ultimates/ultimate-common/src/meta.rs → crates/ultimate-common/src/meta.rs b/ultimates/ultimate-common/src/meta.rs → crates/ultimate-common/src/meta.rs
diff --git a/ultimates/ultimate-common/src/model/mod.rs → crates/ultimate-common/src/model/mod.rs b/ultimates/ultimate-common/src/model/mod.rs → crates/ultimate-common/src/model/mod.rs
diff --git a/...ltimate-common/src/model/sensitive/mod.rs → ...ltimate-common/src/model/sensitive/mod.rs b/...ltimate-common/src/model/sensitive/mod.rs → ...ltimate-common/src/model/sensitive/mod.rs
diff --git a/...n/src/model/sensitive/sensitive_string.rs → ...n/src/model/sensitive/sensitive_string.rs b/...n/src/model/sensitive/sensitive_string.rs → ...n/src/model/sensitive/sensitive_string.rs
diff --git a/...-common/src/model/sensitive/uri_string.rs → ...-common/src/model/sensitive/uri_string.rs b/...-common/src/model/sensitive/uri_string.rs → ...-common/src/model/sensitive/uri_string.rs
diff --git a/ultimates/ultimate-common/src/regex.rs → crates/ultimate-common/src/regex.rs b/ultimates/ultimate-common/src/regex.rs → crates/ultimate-common/src/regex.rs
diff --git a/ultimates/ultimate-common/src/runtime.rs → crates/ultimate-common/src/runtime.rs b/ultimates/ultimate-common/src/runtime.rs → crates/ultimate-common/src/runtime.rs
diff --git a/ultimates/ultimate-common/src/serde.rs → crates/ultimate-common/src/serde.rs b/ultimates/ultimate-common/src/serde.rs → crates/ultimate-common/src/serde.rs
diff --git a/ultimates/ultimate-common/src/string.rs → crates/ultimate-common/src/string.rs b/ultimates/ultimate-common/src/string.rs → crates/ultimate-common/src/string.rs
diff --git a/ultimates/ultimate-common/src/time.rs → crates/ultimate-common/src/time.rs b/ultimates/ultimate-common/src/time.rs → crates/ultimate-common/src/time.rs
diff --git a/ultimates/ultimate-db/Cargo.toml → crates/ultimate-db/Cargo.toml b/ultimates/ultimate-db/Cargo.toml → crates/ultimate-db/Cargo.toml
diff --git a/...ates/ultimate-db/examples/example-sqlx.rs → crates/ultimate-db/examples/example-sqlx.rs b/...ates/ultimate-db/examples/example-sqlx.rs → crates/ultimate-db/examples/example-sqlx.rs
diff --git a/ultimates/ultimate-db/examples/lookup.rs → crates/ultimate-db/examples/lookup.rs b/ultimates/ultimate-db/examples/lookup.rs → crates/ultimate-db/examples/lookup.rs
diff --git a/ultimates/ultimate-db/src/acs/mod.rs → crates/ultimate-db/src/acs/mod.rs b/ultimates/ultimate-db/src/acs/mod.rs → crates/ultimate-db/src/acs/mod.rs
diff --git a/ultimates/ultimate-db/src/base/crud_fns.rs → crates/ultimate-db/src/base/crud_fns.rs b/ultimates/ultimate-db/src/base/crud_fns.rs → crates/ultimate-db/src/base/crud_fns.rs
diff --git a/ultimates/ultimate-db/src/base/db_bmc.rs → crates/ultimate-db/src/base/db_bmc.rs b/ultimates/ultimate-db/src/base/db_bmc.rs → crates/ultimate-db/src/base/db_bmc.rs
diff --git a/...mates/ultimate-db/src/base/macro_utils.rs → crates/ultimate-db/src/base/macro_utils.rs b/...mates/ultimate-db/src/base/macro_utils.rs → crates/ultimate-db/src/base/macro_utils.rs
diff --git a/ultimates/ultimate-db/src/base/mod.rs → crates/ultimate-db/src/base/mod.rs b/ultimates/ultimate-db/src/base/mod.rs → crates/ultimate-db/src/base/mod.rs
diff --git a/ultimates/ultimate-db/src/base/utils.rs → crates/ultimate-db/src/base/utils.rs b/ultimates/ultimate-db/src/base/utils.rs → crates/ultimate-db/src/base/utils.rs
diff --git a/ultimates/ultimate-db/src/error.rs → crates/ultimate-db/src/error.rs b/ultimates/ultimate-db/src/error.rs → crates/ultimate-db/src/error.rs
diff --git a/ultimates/ultimate-db/src/id.rs → crates/ultimate-db/src/id.rs b/ultimates/ultimate-db/src/id.rs → crates/ultimate-db/src/id.rs
diff --git a/ultimates/ultimate-db/src/lib.rs → crates/ultimate-db/src/lib.rs b/ultimates/ultimate-db/src/lib.rs → crates/ultimate-db/src/lib.rs
diff --git a/ultimates/ultimate-db/src/model_manager.rs → crates/ultimate-db/src/model_manager.rs b/ultimates/ultimate-db/src/model_manager.rs → crates/ultimate-db/src/model_manager.rs
diff --git a/ultimates/ultimate-db/src/modql_utils.rs → crates/ultimate-db/src/modql_utils.rs b/ultimates/ultimate-db/src/modql_utils.rs → crates/ultimate-db/src/modql_utils.rs
diff --git a/ultimates/ultimate-db/src/page.rs → crates/ultimate-db/src/page.rs b/ultimates/ultimate-db/src/page.rs → crates/ultimate-db/src/page.rs
diff --git a/ultimates/ultimate-db/src/store/dbx/error.rs → crates/ultimate-db/src/store/dbx/error.rs b/ultimates/ultimate-db/src/store/dbx/error.rs → crates/ultimate-db/src/store/dbx/error.rs
diff --git a/ultimates/ultimate-db/src/store/dbx/mod.rs → crates/ultimate-db/src/store/dbx/mod.rs b/ultimates/ultimate-db/src/store/dbx/mod.rs → crates/ultimate-db/src/store/dbx/mod.rs
diff --git a/ultimates/ultimate-db/src/store/mod.rs → crates/ultimate-db/src/store/mod.rs b/ultimates/ultimate-db/src/store/mod.rs → crates/ultimate-db/src/store/mod.rs
diff --git a/ultimates/ultimate-web/Cargo.toml → crates/ultimate-web/Cargo.toml b/ultimates/ultimate-web/Cargo.toml → crates/ultimate-web/Cargo.toml
diff --git a/ultimates/ultimate-web/src/error.rs → crates/ultimate-web/src/error.rs b/ultimates/ultimate-web/src/error.rs → crates/ultimate-web/src/error.rs
diff --git a/ultimates/ultimate-web/src/extract.rs → crates/ultimate-web/src/extract.rs b/ultimates/ultimate-web/src/extract.rs → crates/ultimate-web/src/extract.rs
diff --git a/ultimates/ultimate-web/src/lib.rs → crates/ultimate-web/src/lib.rs b/ultimates/ultimate-web/src/lib.rs → crates/ultimate-web/src/lib.rs
diff --git a/ultimates/ultimate-web/src/server.rs → crates/ultimate-web/src/server.rs b/ultimates/ultimate-web/src/server.rs → crates/ultimate-web/src/server.rs
diff --git a/ultimates/ultimate-web/src/util.rs → crates/ultimate-web/src/util.rs b/ultimates/ultimate-web/src/util.rs → crates/ultimate-web/src/util.rs
diff --git a/ultimates/ultimate/Cargo.toml → crates/ultimate/Cargo.toml b/ultimates/ultimate/Cargo.toml → crates/ultimate/Cargo.toml
diff --git a/ultimates/ultimate/README.md → crates/ultimate/README.md b/ultimates/ultimate/README.md → crates/ultimate/README.md
diff --git a/ultimates/ultimate/data/README.md → crates/ultimate/data/README.md b/ultimates/ultimate/data/README.md → crates/ultimate/data/README.md
diff --git a/...es/ultimate/data/pem/EC_P-256_private.pem → ...es/ultimate/data/pem/EC_P-256_private.pem b/...es/ultimate/data/pem/EC_P-256_private.pem → ...es/ultimate/data/pem/EC_P-256_private.pem
diff --git a/...tes/ultimate/data/pem/EC_P-256_public.pem → crates/ultimate/data/pem/EC_P-256_public.pem b/...tes/ultimate/data/pem/EC_P-256_public.pem → crates/ultimate/data/pem/EC_P-256_public.pem
diff --git a/...mates/ultimate/examples/example-config.rs → crates/ultimate/examples/example-config.rs b/...mates/ultimate/examples/example-config.rs → crates/ultimate/examples/example-config.rs
diff --git a/ultimates/ultimate/examples/example-envs.rs → crates/ultimate/examples/example-envs.rs b/ultimates/ultimate/examples/example-envs.rs → crates/ultimate/examples/example-envs.rs
diff --git a/ultimates/ultimate/examples/example-regex.rs → crates/ultimate/examples/example-regex.rs b/ultimates/ultimate/examples/example-regex.rs → crates/ultimate/examples/example-regex.rs
diff --git a/...s/ultimate/src/configuration/default.toml → ...s/ultimate/src/configuration/default.toml b/...s/ultimate/src/configuration/default.toml → ...s/ultimate/src/configuration/default.toml
diff --git a/...mates/ultimate/src/configuration/error.rs → crates/ultimate/src/configuration/error.rs b/...mates/ultimate/src/configuration/error.rs → crates/ultimate/src/configuration/error.rs
diff --git a/ultimates/ultimate/src/configuration/mod.rs → crates/ultimate/src/configuration/mod.rs b/ultimates/ultimate/src/configuration/mod.rs → crates/ultimate/src/configuration/mod.rs
diff --git a/...ate/src/configuration/model/app_config.rs → ...ate/src/configuration/model/app_config.rs b/...ate/src/configuration/model/app_config.rs → ...ate/src/configuration/model/app_config.rs
diff --git a/...mate/src/configuration/model/db_config.rs → ...mate/src/configuration/model/db_config.rs b/...mate/src/configuration/model/db_config.rs → ...mate/src/configuration/model/db_config.rs
diff --git a/...te/src/configuration/model/grpc_config.rs → ...te/src/configuration/model/grpc_config.rs b/...te/src/configuration/model/grpc_config.rs → ...te/src/configuration/model/grpc_config.rs
diff --git a/...s/ultimate/src/configuration/model/mod.rs → ...s/ultimate/src/configuration/model/mod.rs b/...s/ultimate/src/configuration/model/mod.rs → ...s/ultimate/src/configuration/model/mod.rs
diff --git a/...rc/configuration/model/security_config.rs → ...rc/configuration/model/security_config.rs b/...rc/configuration/model/security_config.rs → ...rc/configuration/model/security_config.rs
diff --git a/...e/src/configuration/model/trace_config.rs → ...e/src/configuration/model/trace_config.rs b/...e/src/configuration/model/trace_config.rs → ...e/src/configuration/model/trace_config.rs
diff --git a/...ate/src/configuration/model/web_config.rs → ...ate/src/configuration/model/web_config.rs b/...ate/src/configuration/model/web_config.rs → ...ate/src/configuration/model/web_config.rs
diff --git a/...mate/src/configuration/ultimate_config.rs → ...mate/src/configuration/ultimate_config.rs b/...mate/src/configuration/ultimate_config.rs → ...mate/src/configuration/ultimate_config.rs
diff --git a/ultimates/ultimate/src/configuration/util.rs → crates/ultimate/src/configuration/util.rs b/ultimates/ultimate/src/configuration/util.rs → crates/ultimate/src/configuration/util.rs
diff --git a/ultimates/ultimate/src/ctx.rs → crates/ultimate/src/ctx.rs b/ultimates/ultimate/src/ctx.rs → crates/ultimate/src/ctx.rs
diff --git a/ultimates/ultimate/src/data_error.rs → crates/ultimate/src/data_error.rs b/ultimates/ultimate/src/data_error.rs → crates/ultimate/src/data_error.rs
diff --git a/ultimates/ultimate/src/lib.rs → crates/ultimate/src/lib.rs b/ultimates/ultimate/src/lib.rs → crates/ultimate/src/lib.rs
diff --git a/ultimates/ultimate/src/metas.rs → crates/ultimate/src/metas.rs b/ultimates/ultimate/src/metas.rs → crates/ultimate/src/metas.rs
diff --git a/ultimates/ultimate/src/model.rs → crates/ultimate/src/model.rs b/ultimates/ultimate/src/model.rs → crates/ultimate/src/model.rs
diff --git a/ultimates/ultimate/src/run_mode.rs → crates/ultimate/src/run_mode.rs b/ultimates/ultimate/src/run_mode.rs → crates/ultimate/src/run_mode.rs
diff --git a/ultimates/ultimate/src/security/error.rs → crates/ultimate/src/security/error.rs b/ultimates/ultimate/src/security/error.rs → crates/ultimate/src/security/error.rs
diff --git a/ultimates/ultimate/src/security/jose.rs → crates/ultimate/src/security/jose.rs b/ultimates/ultimate/src/security/jose.rs → crates/ultimate/src/security/jose.rs
diff --git a/ultimates/ultimate/src/security/mod.rs → crates/ultimate/src/security/mod.rs b/ultimates/ultimate/src/security/mod.rs → crates/ultimate/src/security/mod.rs
diff --git a/ultimates/ultimate/src/security/pwd.rs → crates/ultimate/src/security/pwd.rs b/ultimates/ultimate/src/security/pwd.rs → crates/ultimate/src/security/pwd.rs
diff --git a/...s/ultimate/src/security/security_utils.rs → ...s/ultimate/src/security/security_utils.rs b/...s/ultimate/src/security/security_utils.rs → ...s/ultimate/src/security/security_utils.rs
diff --git a/ultimates/ultimate/src/signal/mod.rs → crates/ultimate/src/signal/mod.rs b/ultimates/ultimate/src/signal/mod.rs → crates/ultimate/src/signal/mod.rs
diff --git a/ultimates/ultimate/src/signal/monitor.rs → crates/ultimate/src/signal/monitor.rs b/ultimates/ultimate/src/signal/monitor.rs → crates/ultimate/src/signal/monitor.rs
diff --git a/ultimates/ultimate/src/starter.rs → crates/ultimate/src/starter.rs b/ultimates/ultimate/src/starter.rs → crates/ultimate/src/starter.rs
diff --git a/ultimates/ultimate/src/trace/mod.rs → crates/ultimate/src/trace/mod.rs b/ultimates/ultimate/src/trace/mod.rs → crates/ultimate/src/trace/mod.rs
diff --git a/ultimates/ultimate/src/trace/util.rs → crates/ultimate/src/trace/util.rs b/ultimates/ultimate/src/trace/util.rs → crates/ultimate/src/trace/util.rs
diff --git a/ultimates/README.md b/ultimates/README.md