Skip to content

Commit

Permalink
Use contrib
Browse files Browse the repository at this point in the history
  • Loading branch information
@SM3901
SM3901 committed Feb 12, 2025
1 parent 8d7a807 commit dbdf406
Show file tree
Hide file tree
Showing 86 changed files with 162 additions and 1,956 deletions.
5 changes: 4 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,8 @@
# VSCode
.vscode/

# Generated by MacOS
# Added by MacOS
.DS_Store

# Added by cargo
/target
2 changes: 1 addition & 1 deletion Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 3 additions & 4 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
[package]
name = "yiirs"
version = "1.0.1"
authors = ["ShengHui <[email protected]>"]
version = "1.0.2"
edition = "2021"
description = "Rust API development scaffolding, support salvo and axum."
description = "Rust web development scaffolding, support salvo and axum."
license = "Apache-2.0"
repository = "https://github.com/shenghui0779/yiirs"
repository = "https://github.com/yiirs/yiirs"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

Expand Down
7 changes: 3 additions & 4 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Rust Web开发脚手架，支持 `salvo` 和 `axum` 框架，并同时支持创
## 安装

```shell
Cargo install yiirs
cargo install yiirs
```

## 特点
Expand All @@ -20,9 +20,6 @@ Cargo install yiirs
- 命令行使用 [clap](https://github.com/clap-rs/clap)
- 异步运行时使用 [tokio](https://github.com/tokio-rs/tokio)
- 参数验证器使用 [validator](https://github.com/Keats/validator)
- 包含基础的登录授权功能
- 包含基于 Redis 的分布式锁
- 包含 AES、Hash、时间格式化 等实用封装
- 包含 Trace、认证、请求日志、Panic捕获 中间价
- 简单好用的 API Result 统一输出方式

Expand Down Expand Up @@ -97,3 +94,5 @@ yiirs app --name=foo --name=bar --axum # 创建axum应用
│   │   └── main.rs
└── internal
```

**Enjoy 😊**
106 changes: 45 additions & 61 deletions src/internal/axum.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,19 @@ pub fn global() -> Tera {
let mut tera = Tera::default();
// 使用 include_str! 宏将模板文件嵌入到二进制文件中
tera.add_raw_templates(vec![
("Cargo.toml", include_str!("../../template/axum/Cargo.tera")),
(
"Cargo.toml",
include_str!("../../template/axum/Cargo.yiirs"),
),
(
".dockerignore",
include_str!("../../template/dockerignore.tera"),
include_str!("../../template/dockerignore.yiirs"),
),
(".gitignore", include_str!("../../template/gitignore.yiirs")),
(
"README.md",
include_str!("../../template/axum/README.yiirs"),
),
(".gitignore", include_str!("../../template/gitignore.tera")),
("README.md", include_str!("../../template/axum/README.tera")),
])
.unwrap();
tera
Expand All @@ -23,7 +29,7 @@ pub fn docker() -> Tera {
// 使用 include_str! 宏将模板文件嵌入到二进制文件中
tera.add_raw_templates(vec![(
"Dockerfile",
include_str!("../../template/Dockerfile.tera"),
include_str!("../../template/Dockerfile.yiirs"),
)])
.unwrap();
tera
Expand All @@ -33,8 +39,8 @@ pub fn other() -> Tera {
let mut tera = Tera::default();
// 使用 include_str! 宏将模板文件嵌入到二进制文件中
tera.add_raw_templates(vec![
("dockerun.sh", include_str!("../../template/dockerun.tera")),
("config.toml", include_str!("../../template/config.tera")),
("dockerun.sh", include_str!("../../template/dockerun.yiirs")),
("config.toml", include_str!("../../template/config.yiirs")),
])
.unwrap();
tera
Expand All @@ -47,100 +53,75 @@ pub fn internal() -> Tera {
// lib.rs
(
"lib.rs",
include_str!("../../template/axum/internal/lib.tera"),
include_str!("../../template/axum/internal/lib.yiirs"),
),
// core
(
"core/mod.rs",
include_str!("../../template/axum/internal/core/mod.tera"),
include_str!("../../template/axum/internal/core/mod.yiirs"),
),
(
"core/cache.rs",
include_str!("../../template/axum/internal/core/cache.tera"),
include_str!("../../template/axum/internal/core/cache.yiirs"),
),
(
"core/config.rs",
include_str!("../../template/axum/internal/core/config.tera"),
include_str!("../../template/axum/internal/core/config.yiirs"),
),
(
"core/db.rs",
include_str!("../../template/axum/internal/core/db.tera"),
include_str!("../../template/axum/internal/core/db.yiirs"),
),
(
"core/logger.rs",
include_str!("../../template/axum/internal/core/logger.tera"),
),
(
"core/manager.rs",
include_str!("../../template/axum/internal/core/manager.tera"),
),
// crypto
(
"crypto/mod.rs",
include_str!("../../template/axum/internal/crypto/mod.tera"),
),
(
"crypto/aes.rs",
include_str!("../../template/axum/internal/crypto/aes.tera"),
),
(
"crypto/hash.rs",
include_str!("../../template/axum/internal/crypto/hash.tera"),
include_str!("../../template/axum/internal/core/logger.yiirs"),
),
// middleware
(
"middleware/mod.rs",
include_str!("../../template/axum/internal/middleware/mod.tera"),
include_str!("../../template/axum/internal/middleware/mod.yiirs"),
),
(
"middleware/catch_panic.rs",
include_str!("../../template/axum/internal/middleware/catch_panic.tera"),
include_str!("../../template/axum/internal/middleware/catch_panic.yiirs"),
),
(
"middleware/log.rs",
include_str!("../../template/axum/internal/middleware/log.tera"),
include_str!("../../template/axum/internal/middleware/log.yiirs"),
),
(
"middleware/trace.rs",
include_str!("../../template/axum/internal/middleware/trace.tera"),
include_str!("../../template/axum/internal/middleware/trace.yiirs"),
),
// result
(
"result/mod.rs",
include_str!("../../template/axum/internal/result/mod.tera"),
include_str!("../../template/axum/internal/result/mod.yiirs"),
),
(
"result/code.rs",
include_str!("../../template/axum/internal/result/code.tera"),
include_str!("../../template/axum/internal/result/code.yiirs"),
),
(
"result/rejection.rs",
include_str!("../../template/axum/internal/result/rejection.tera"),
include_str!("../../template/axum/internal/result/rejection.yiirs"),
),
(
"result/reply.rs",
include_str!("../../template/axum/internal/result/reply.tera"),
include_str!("../../template/axum/internal/result/reply.yiirs"),
),
// util
(
"util/mod.rs",
include_str!("../../template/axum/internal/util/mod.tera"),
include_str!("../../template/axum/internal/util/mod.yiirs"),
),
(
"util/helper.rs",
include_str!("../../template/axum/internal/util/helper.tera"),
include_str!("../../template/axum/internal/util/helper.yiirs"),
),
(
"util/identity.rs",
include_str!("../../template/axum/internal/util/identity.tera"),
),
(
"util/mutex.rs",
include_str!("../../template/axum/internal/util/mutex.tera"),
),
(
"util/xtime.rs",
include_str!("../../template/axum/internal/util/xtime.tera"),
include_str!("../../template/axum/internal/util/identity.yiirs"),
),
])
.unwrap();
Expand All @@ -152,55 +133,58 @@ pub fn app() -> Tera {
// 使用 include_str! 宏将模板文件嵌入到二进制文件中
tera.add_raw_templates(vec![
// main.rs
("main.rs", include_str!("../../template/axum/app/main.tera")),
(
"main.rs",
include_str!("../../template/axum/app/main.yiirs"),
),
// api
(
"api/mod.rs",
include_str!("../../template/axum/app/api/mod.tera"),
include_str!("../../template/axum/app/api/mod.yiirs"),
),
(
"api/greeter.rs",
include_str!("../../template/axum/app/api/greeter.tera"),
include_str!("../../template/axum/app/api/greeter.yiirs"),
),
// cmd
(
"cmd/mod.rs",
include_str!("../../template/axum/app/cmd/mod.tera"),
include_str!("../../template/axum/app/cmd/mod.yiirs"),
),
(
"cmd/hello.rs",
include_str!("../../template/axum/app/cmd/hello.tera"),
include_str!("../../template/axum/app/cmd/hello.yiirs"),
),
(
"cmd/serve.rs",
include_str!("../../template/axum/app/cmd/serve.tera"),
include_str!("../../template/axum/app/cmd/serve.yiirs"),
),
// middleware
(
"middleware/mod.rs",
include_str!("../../template/axum/app/middleware/mod.tera"),
include_str!("../../template/axum/app/middleware/mod.yiirs"),
),
(
"middleware/auth.rs",
include_str!("../../template/axum/app/middleware/auth.tera"),
include_str!("../../template/axum/app/middleware/auth.yiirs"),
),
// router
(
"router/mod.rs",
include_str!("../../template/axum/app/router/mod.tera"),
include_str!("../../template/axum/app/router/mod.yiirs"),
),
(
"router/route.rs",
include_str!("../../template/axum/app/router/route.tera"),
include_str!("../../template/axum/app/router/route.yiirs"),
),
// service
(
"service/mod.rs",
include_str!("../../template/axum/app/service/mod.tera"),
include_str!("../../template/axum/app/service/mod.yiirs"),
),
(
"service/greeter.rs",
include_str!("../../template/axum/app/service/greeter.tera"),
include_str!("../../template/axum/app/service/greeter.yiirs"),
),
])
.unwrap();
Expand Down
Loading

0 comments on commit dbdf406

Please sign in to comment.