feat: api-example 实现数据访问逻辑

yangbajing · Aug 15, 2024 · 2b0eff7 · 2b0eff7
1 parent f5162da
commit 2b0eff7
Show file tree

Hide file tree

Showing 17 changed files with 60 additions and 136 deletions.
diff --git a/.cargo/config.toml b/.cargo/config.toml
@@ -1,6 +1,6 @@
 # 设置运行 cargo 时的系统环境变量
 [env]
-RUST_LOG = "info,ultimate=debug,ultimate_common=debug"
+RUST_LOG = "info,tower_http=debug,ultimate=debug,ultimate_common=debug"
 
 [alias]
 clippy-all = "clippy --all-features -- -D warnings"

diff --git a/Cargo.toml b/Cargo.toml
@@ -1,10 +1,5 @@
 [workspace]
-members = [
-    "ultimates/*",
-    "crates/*",
-    "examples/db-example",
-    "examples/api-example",
-]
+members = ["ultimates/*", "crates/*", "examples/api-example"]
 resolver = "2"
 
 [workspace.package]
@@ -30,6 +25,9 @@ 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" }
 # -- projects end
+# begin -- memory allocator
+tikv-jemallocator = "0.6"
+# end   -- memory allocator
 derive_more = { version = "1.0", features = ["from", "display", "constructor"] }
 toml = "0.8"
 config = { version = "0.14", default-features = false, features = [

diff --git a/examples/README.md b/examples/README.md
@@ -1,5 +1,10 @@
 # Examples
 
+```sh
+git clone https://github.com/yangbajing/ultimate-common
+cd ultimate-common/examples
+```
+
 ## 服务依赖
 
 使用 docker compose 启动并初始化 PG 数据库
@@ -8,15 +13,17 @@
 # 当前目录下有容器，先删除容器及数据卷（一般在 sql 有变更时需要）
 #docker compose down --volumes --remove-orphans
 
-docker compose up -d --build
+docker compose up -d --build && docker compose logs -f
 ```
 
 ## api-example
 
 ### 启动服务
 
+重新打开一个终端窗口并进入 `examples/` 目录，执行以下命令运行程序
+
 ```sh
-cargo run --bin api-example
+cargo run --release --bin api-example
 ```
 
 ### 测试服务
@@ -43,9 +50,26 @@ curl -v --location 'http://localhost:8888/auth/login/pwd' \
 
 #### 用户-分页查询
 
+_你需要使用上面 [使用密码登录](#使用密码登录) 来获取 token，并替换到下面 `Bearer <token>` 位置。_
+
 ```sh
 curl -v --location 'http://localhost:8888/v1/user/page' \
 --header 'Content-Type: application/json' \
 --header 'Authorization: Bearer eyJ0eXAiOiJKV1QiLCJlbmMiOiJBMTI4Q0JDLUhTMjU2IiwiYWxnIjoiZGlyIn0..EZwETCBq1CNs8yO5Zec09Q.g3JoMryHoq01ZO3TQ2Ja_ppJZb9SYdon-LfB6OGyH7s.sBCGn14NuoxujmAgRpkYPg' \
---data '{}' | python -m json.tool --no-ensure-ascii
+--data '{
+    "filter": {
+        "ctime": {
+            "$gte": "2024-08-15T00:00:00+0800",
+            "$lt": "2024-08-16T00:00:00+0800"
+        }
+    }
+}' | python -m json.tool --no-ensure-ascii
+```
+
+#### 用户-根据ID查询
+
+```sh
+curl -v --location 'http://localhost:8888/v1/user/10000' \
+--header 'Content-Type: application/json' \
+--header 'Authorization: Bearer eyJ0eXAiOiJKV1QiLCJlbmMiOiJBMTI4Q0JDLUhTMjU2IiwiYWxnIjoiZGlyIn0..EZwETCBq1CNs8yO5Zec09Q.g3JoMryHoq01ZO3TQ2Ja_ppJZb9SYdon-LfB6OGyH7s.sBCGn14NuoxujmAgRpkYPg' | python -m json.tool --no-ensure-ascii
 ```
diff --git a/examples/api-example/Cargo.toml b/examples/api-example/Cargo.toml
@@ -7,6 +7,10 @@ description.workspace = true
 license-file.workspace = true
 repository.workspace = true
 
+[[bin]]
+name = "api-example"
+path = "bin/api-example.rs"
+
 [lints]
 workspace = true
 
@@ -30,3 +34,6 @@ sea-query.workspace = true
 sea-query-binder.workspace = true
 modql.workspace = true
 enum-iterator.workspace = true
+
+[target.'cfg(not(target_env = "msvc"))'.dependencies]
+tikv-jemallocator.workspace = true
diff --git a/examples/api-example/src/main.rs → examples/api-example/bin/api-example.rs b/examples/api-example/src/main.rs → examples/api-example/bin/api-example.rs
@@ -1,6 +1,10 @@
 use api_example::{router::new_api_router, state::new_app_state};
 use ultimate_web::server::init_server;
 
+#[cfg(not(target_env = "msvc"))]
+#[global_allocator]
+static GLOBAL: tikv_jemallocator::Jemalloc = tikv_jemallocator::Jemalloc;
+
 #[tokio::main]
 async fn main() -> ultimate::Result<()> {
   let state = new_app_state().await?;

diff --git a/examples/api-example/src/user/user_serv.rs b/examples/api-example/src/user/user_serv.rs
@@ -16,7 +16,6 @@ use super::{
 
 #[derive(Constructor)]
 pub struct UserServ {
-  _app: AppState,
   ctx: CtxW,
 }
 
@@ -59,6 +58,6 @@ impl FromRequestParts<AppState> for UserServ {
 
   async fn from_request_parts(parts: &mut Parts, state: &AppState) -> core::result::Result<Self, Self::Rejection> {
     let ctx = CtxW::from_request_parts(parts, state).await?;
-    Ok(UserServ::new(state.clone(), ctx))
+    Ok(UserServ::new(ctx))
   }
 }
diff --git a/examples/db-example/Cargo.toml b/examples/db-example/Cargo.toml
diff --git a/examples/db-example/src/lib.rs b/examples/db-example/src/lib.rs
diff --git a/examples/db-example/src/main.rs b/examples/db-example/src/main.rs
diff --git a/examples/db-example/src/role/mod.rs b/examples/db-example/src/role/mod.rs
diff --git a/examples/db-example/src/role/model.rs b/examples/db-example/src/role/model.rs
diff --git a/examples/db-example/src/role/role_bmc.rs b/examples/db-example/src/role/role_bmc.rs
diff --git a/examples/db-example/src/role/role_service.rs b/examples/db-example/src/role/role_service.rs
diff --git a/examples/postgresql.conf b/examples/postgresql.conf
@@ -0,0 +1 @@
+log_statement = "all"
diff --git a/examples/software/postgres/Dockerfile b/examples/software/postgres/Dockerfile
@@ -6,5 +6,8 @@ ENV PGPORT 15432
 
 RUN localedef -i zh_CN -c -f UTF-8 -A /usr/share/locale/locale.alias zh_CN.UTF-8
 
+EXPOSE 15432
+
 COPY scripts/*.sql /docker-entrypoint-initdb.d/
 COPY --chmod=0600 .pgpass /root/.pgpass
+
diff --git a/examples/software/postgres/scripts/00.sh b/examples/software/postgres/scripts/00.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+pg_setup_postgresql_conf() {
+	{
+		printf '\n'
+		printf "log_statement = 'all'"
+		printf '\n'
+	} >> "$PGDATA/postgresql.conf"
+}
+
+pg_setup_postgresql_conf
+
diff --git a/ultimates/ultimate-db/src/id.rs b/ultimates/ultimate-db/src/id.rs
@@ -5,7 +5,6 @@ use serde::{Deserialize, Serialize};
 use sqlx::{postgres::PgRow, FromRow};
 use uuid::Uuid;
 
-#[allow(unused)]
 pub trait DbRowType: HasSeaFields + for<'r> FromRow<'r, PgRow> + Unpin + Send {}
 
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize, Display)]