Merge pull request #36 from salvo-rs/rbatis

fix rbatis compile error

Author: chrislearn

templates/classic/_base/Cargo.toml.liquid

@@ -2,15 +2,15 @@
 name = "{{ project_name }}"
 version = "0.1.1"
 edition = "2024"
-rust-version = "1.88"
+rust-version = "1.89"
 readme = "./README.md"
 
 [dependencies]
 anyhow = "1"
 figment = { version = "0.10", features = ["env", "toml"] }
 jsonwebtoken = {version = "10", features = ["rust_crypto"]}
 rust-embed = "8"
-salvo = {version = "0.84", features = ["cookie", "cors", "jwt-auth", "oapi", "serve-static", "rustls", "logging"]}
+salvo = {version = "0.84", features = ["anyhow", "cookie", "cors", "jwt-auth", "oapi", "serve-static", "rustls", "logging"]}
 serde = "1"
 thiserror = "2"
 time = "0.3"

templates/classic/_base/src/config/mod.rs

@@ -1,7 +1,7 @@
 use std::sync::OnceLock;
 
-use figment::providers::{Env, Format, Toml};
 use figment::Figment;
+use figment::providers::{Env, Format, Toml};
 use serde::Deserialize;
 
 mod log_config;

templates/classic/_base/src/main.rs.liquid

@@ -8,15 +8,15 @@ use tracing::info;
 
 mod config;
 mod db;
+mod hoops;
 mod models;
-mod utils;
 {%- if db_lib == "diesel" %}
 mod schema;
 {%- elsif db_lib == "seaorm" %}
 mod entities;
 {%- endif %}
-mod hoops;
 mod routers;
+mod utils;
 
 mod error;
 pub use error::AppError;

templates/classic/rbatis/src/models/mod.rs

@@ -8,7 +8,7 @@ pub struct User {
     pub username: String,
     pub password: String,
 }
-crud!(User {},"users");
+crud!(User {}, "users");
 
 #[derive(Serialize, Deserialize, ToSchema, Clone, Debug)]
 pub struct SafeUser {

templates/classic/rbatis/src/routers/auth.rs

@@ -1,30 +1,15 @@
 use anyhow::Result;
 use cookie::Cookie;
+use rbs::value;
 use rinja::Template;
 use salvo::oapi::extract::*;
 use salvo::prelude::*;
 use serde::{Deserialize, Serialize};
-use validator::Validate;
 
 use crate::hoops::jwt;
-use crate::models::{SafeUser, User};
+use crate::models::User;
 use crate::{db, json_ok, utils, JsonResult};
 
-#[derive(Deserialize, Debug, Validate, ToSchema)]
-pub struct LoginRequest {
-    #[validate(length(min = 1, message = "username cannot be empty"))]
-    pub username: String,
-    #[validate(length(min = 1, message = "password cannot be empty"))]
-    pub password: String,
-}
-
-#[derive(Serialize, Debug, ToSchema)]
-pub struct LoginResponse {
-    pub user: SafeUser,
-    pub token: String,
-    pub exp: i64,
-}
-
 #[derive(Template)]
 #[template(path = "login.html")]
 struct LoginTemplate {}
@@ -64,7 +49,7 @@ pub async fn post_login(
     let rb = db::engine();
 
     // Find user by username
-    let users = User::select_by_column(rb, "username", &login_data.username)
+    let users = User::select_by_map(rb, value!("username": &login_data.username))
         .await
         .map_err(anyhow::Error::from)?;