liyunjia/chuanyue-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

返回信息改为i18n方式

Browse Source
This commit is contained in:
李运家 2024-06-19 17:26:46 +08:00
parent 9260049da0
commit 991d1e478b
11 changed files with 92 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
api/src/controller/account.rs
View File

@ -3,17 +3,19 @@ use domain::{dto::account::{AuthenticateGooleAccountReq, AuthenticateWithPasswor
use library::{context::Context, res::{response::{ ResData, ResResult}, validator}};
pub async fn authenticate_google(
Extension(context): Extension<Context>,
Json(req): Json<AuthenticateGooleAccountReq>
) -> ResResult<ResData<LoginAccount>> {
validator::validate_params(&req, "")?;
service::account::authenticate_google(req).await
service::account::authenticate_google(context, req).await
}
pub async fn authenticate_with_password(
Extension(context): Extension<Context>,
Json(req): Json<AuthenticateWithPassword>
) -> ResResult<ResData<LoginAccount>> {
validator::validate_params(&req, "")?;
service::sys_account::authenticate_with_password(req).await
service::sys_account::authenticate_with_password(context, req).await
}
pub async fn refresh_token(

11
i18n/src/en_us.rs
View File

@ -2,7 +2,9 @@ use std::collections::HashMap;
use lazy_static::lazy_static;
use crate::message_ids::HELLO;
use crate::message_ids::{
ACCOUNT_DISABLED, ACCOUNT_NO_PERMISSION, HELLO, INCORRECT_USERNAME_OR_PASSWORD, INVALID_TOKEN,
};
pub const LANGUAGE_ID: &str = "en-US";
@ -10,6 +12,13 @@ lazy_static! {
pub static ref MESSAGE: HashMap<&'static str, &'static str> = {
let mut map = HashMap::new();
map.insert(HELLO, "hello {}");
map.insert(ACCOUNT_DISABLED, "account is disabled");
map.insert(ACCOUNT_NO_PERMISSION, "account has no permission");
map.insert(
INCORRECT_USERNAME_OR_PASSWORD,
"incorrect username or password",
);
map.insert(INVALID_TOKEN, "invalid token");
map
};
}

2
i18n/src/lib.rs
View File

@ -19,7 +19,7 @@ fn get_i18n() -> &'static HashMap<&'static str, HashMap<&'static str, &'static s
I18N.get_or_init(init_i18n)
}
pub fn lang(lang_id: &'static str, message_id: &'static str) -> &'static str {
pub fn lang(lang_id: &str, message_id: &'static str) -> &'static str {
get_i18n()
.get(lang_id)
.and_then(|map| map.get(message_id))

4
i18n/src/message_ids.rs
View File

@ -1 +1,5 @@
pub const HELLO: &str = "hello";
pub const ACCOUNT_DISABLED: &str = "accout is disabled";
pub const ACCOUNT_NO_PERMISSION: &str = "account has no permission";
pub const INCORRECT_USERNAME_OR_PASSWORD: &str = "Incorrect username or password";
pub const INVALID_TOKEN: &str = "invalid token";

8
i18n/src/zh_cn.rs
View File

@ -2,7 +2,9 @@ use std::collections::HashMap;
use lazy_static::lazy_static;
use crate::message_ids::HELLO;
use crate::message_ids::{
ACCOUNT_DISABLED, ACCOUNT_NO_PERMISSION, HELLO, INCORRECT_USERNAME_OR_PASSWORD, INVALID_TOKEN,
};
pub const LANGUAGE_ID: &str = "zh_CN";
@ -10,6 +12,10 @@ lazy_static! {
pub static ref MESSAGE: HashMap<&'static str, &'static str> = {
let mut map = HashMap::new();
map.insert(HELLO, "你好 {}");
map.insert(ACCOUNT_DISABLED, "账户已禁用");
map.insert(ACCOUNT_NO_PERMISSION, "账户无权限");
map.insert(INCORRECT_USERNAME_OR_PASSWORD, "用户名或密码错误");
map.insert(INVALID_TOKEN, "无效令牌");
map
};
}

6
library/src/cache/account_cache.rs vendored
View File

@ -1,4 +1,4 @@
use std::time::Duration;
use std::{sync::Arc, time::Duration};
use domain::entities::account::Account;
use lazy_static::lazy_static;
@ -10,8 +10,8 @@ use moka::{
#[derive(Debug, Clone)]
pub struct CacheAccount {
pub account: Account,
pub token: String,
pub account: Arc<Account>,
pub token: Arc<String>,
}
lazy_static! {

11
library/src/context.rs
View File

@ -1,11 +1,12 @@
use std::sync::Arc;
use domain::entities::account::Account;
#[derive(Debug, Clone)]
pub struct Context {
pub account: Account,
pub local: String,
pub token: String,
pub account: Arc<Account>,
pub token: Arc<String>,
}
impl Context {
@ -17,7 +18,7 @@ impl Context {
&self.token
}
pub fn get_local(&self) -> &String {
&self.local
pub fn get_lang_id(&self) -> &String {
&self.account.lang_tag
}
}

20
library/src/middleware/req_ctx.rs
View File

@ -34,20 +34,6 @@ pub async fn authenticate_ctx(mut req: Request, next: Next) -> Response {
None => return (StatusCode::UNAUTHORIZED, "Missing authorization header".to_string()).into_response(),
};
// 解析语言
let language_header = req.headers().get(header::ACCEPT_LANGUAGE);
let language = match language_header {
Some(value) => {
let value_str: Vec<&str> = value.to_str().unwrap_or("zh-CN").split(',').collect();
if value_str.is_empty() {
String::from("zh-CN")
} else {
String::from(value_str[0])
}
},
None => String::from("zh-CN"),
};
let validation = Validation::default();
match decode::<Claims>(token, &DecodingKey::from_secret(config!().jwt.token_secret.as_bytes()), &validation) {
Ok(decoded) => {
@ -63,7 +49,11 @@ pub async fn authenticate_ctx(mut req: Request, next: Next) -> Response {
// return (StatusCode::UNAUTHORIZED, "Invalid token".to_string()).into_response();
// }
// 将Claims附加到请求扩展中，以便后续处理使用
req.extensions_mut().insert(Context { account: account.account, local: language, token: account.token });
req.extensions_mut().insert(
Context {
account: account.account.clone(),
token: account.token
});
next.run(req).await
},
Err(_) => (StatusCode::UNAUTHORIZED, "Invalid token".to_string()).into_response(),

19
service/src/account.rs
View File

@ -1,7 +1,11 @@
use std::sync::Arc;
use chrono::Utc;
use domain::dto::account::AuthenticateGooleAccountReq;
use domain::entities::account::Account;
use domain::vo::account::{LoginAccount, RefreshTokenResult};
use i18n::message;
use i18n::message_ids::{ACCOUNT_DISABLED, INVALID_TOKEN};
use library::cache::account_cache::{CacheAccount, LOGIN_CACHE};
use library::context::Context;
use library::res::response::ResErr::ErrPerm;
@ -11,6 +15,7 @@ use library::token::{generate_refresh_token, generate_token};
use library::{db, token};
pub async fn authenticate_google(
context: Context,
req: AuthenticateGooleAccountReq,
) -> ResResult<ResData<LoginAccount>> {
let verify_result = GOOGLE_SOCIAL
@ -42,7 +47,7 @@ pub async fn authenticate_google(
tracing::info!("账户已存在, {:?}", account);
if account.disable_time > Utc::now() {
tracing::error!("账户已禁用");
return Err(ResErr::system("账户已禁用"));
return Err(ResErr::system(message!(context.get_lang_id(), ACCOUNT_DISABLED)));
}
account
}
@ -55,8 +60,8 @@ pub async fn authenticate_google(
.insert(
account.id.to_owned(),
CacheAccount {
account: account.clone(),
token: token.to_owned(),
account: Arc::new(account.to_owned()),
token: Arc::new(token.to_owned()),
},
)
.await;
@ -78,10 +83,10 @@ pub async fn refresh_token(
context: Context,
refresh_token: String,
) -> ResResult<ResData<RefreshTokenResult>> {
let account = context.account;
let account = context.account.clone();
if token::verify_refresh_token(&refresh_token).is_err() {
return Err(ResErr::params("refresh_token无效"));
return Err(ResErr::params(message!(context.get_lang_id(), INVALID_TOKEN)));
}
let refresh_token = RefreshTokenResult {
@ -94,8 +99,8 @@ pub async fn refresh_token(
.insert(
account.id.to_owned(),
CacheAccount {
account: account.clone(),
token: refresh_token.token.to_owned(),
account,
token: Arc::new(refresh_token.token.to_owned()),
},
)
.await;

2
service/src/feedback.rs
View File

@ -1,6 +1,5 @@
use domain::dto::feedback::FeedbackAdd;
use domain::entities::feedback::Feedback;
use i18n::message;
use library::db;
use library::res::pageable::Pageable;
use library::res::response::{ResData, ResResult};
@ -13,7 +12,6 @@ pub async fn get_feedback_list_by_page(page: i64, page_size: i64) -> ResResult<R
return Ok(ResData::some(Pageable::<Feedback>::empty()));
}
let total = get_feedback_count().await;
tracing::info!("你好： {}", message!("zh_CN", "hello", "明天", "结束"));
Ok(ResData::some(Pageable::new(feedback_list.unwrap(), total)))
}

42
service/src/sys_account.rs
View File

@ -1,31 +1,50 @@
use std::sync::Arc;
use chrono::Utc;
use domain::{
dto::account::AuthenticateWithPassword,
entities::account::{Account, Role}, vo::account::LoginAccount,
entities::account::{Account, Role},
vo::account::LoginAccount,
};
use i18n::{
message,
message_ids::{ACCOUNT_DISABLED, ACCOUNT_NO_PERMISSION, INCORRECT_USERNAME_OR_PASSWORD},
};
use library::{
cache::account_cache::{CacheAccount, LOGIN_CACHE}, db, res::response::{ResErr, ResData, ResResult}, token::{generate_refresh_token, generate_token}
cache::account_cache::{CacheAccount, LOGIN_CACHE},
context::Context,
db,
res::response::{ResData, ResErr, ResResult},
token::{generate_refresh_token, generate_token},
};
pub async fn authenticate_with_password(
context: Context,
req: AuthenticateWithPassword,
) -> ResResult<ResData<LoginAccount>> {
let account =
Account::find_with_password(req.username.unwrap(), req.password.unwrap(), db!()).await?;
if account.is_none() {
tracing::info!("登录用户失败，用户查询为空");
return Err(ResErr::params("用户名或密码错误"));
return Err(ResErr::params(message!(
context.get_lang_id(),
INCORRECT_USERNAME_OR_PASSWORD
)));
}
let account = account.unwrap();
if account.disable_time > Utc::now() {
tracing::error!("账户已禁用");
return Err(ResErr::auth("账户已禁用"));
return Err(ResErr::auth(message!(
context.get_lang_id(),
ACCOUNT_DISABLED
)));
}
if account.role != Role::Admin {
tracing::error!("账户不是管理员，无权限");
return Err(ResErr::perm("账户无权限"));
return Err(ResErr::perm(message!(
context.get_lang_id(),
ACCOUNT_NO_PERMISSION
)));
}
let token = generate_token(&account.id);
@ -35,13 +54,13 @@ pub async fn authenticate_with_password(
.insert(
account.id.to_owned(),
CacheAccount {
account: account.clone(),
token: token.to_owned(),
account: Arc::new(account.to_owned()),
token: Arc::new(token.to_owned()),
},
)
.await;
let login_account = LoginAccount{
let login_account = LoginAccount {
username: account.username,
display_name: account.display_name,
avatar_url: account.avatar_url,
@ -49,11 +68,12 @@ pub async fn authenticate_with_password(
wallet: account.wallet,
email: account.email,
token,
refresh_token
refresh_token,
};
Ok(ResData::some(login_account))
}
/// 仅仅用于管理员维护，不对外暴露接口
pub async fn add_account() -> ResResult<ResData<()>> {
let account = Account::add_account(
&Account {