diff --git a/system/src/controller/account.rs b/system/src/controller/account_controller.rs similarity index 80% rename from system/src/controller/account.rs rename to system/src/controller/account_controller.rs index ab7c17e..c1f5201 100644 --- a/system/src/controller/account.rs +++ b/system/src/controller/account_controller.rs @@ -10,7 +10,7 @@ pub async fn authenticate_google( Json(req): Json ) -> ResResult> { validator::validate_params(&req, context.get_lang_tag())?; - service::account::authenticate_google(context, req).await + service::account_service::authenticate_google(context, req).await } /// 账号密码登录 @@ -19,7 +19,7 @@ pub async fn authenticate_with_password( Json(req): Json ) -> ResResult> { validator::validate_params(&req, context.get_lang_tag())?; - service::sys_account::authenticate_with_password(context, req).await + service::sys_account_service::authenticate_with_password(context, req).await } /// 刷新token @@ -29,10 +29,10 @@ pub async fn refresh_token( ) -> ResResult> { tracing::debug!("刷新token, {:?}", context); validator::validate_params(&refresh_token, "")?; - service::account::refresh_token(context, refresh_token.token).await + service::account_service::refresh_token(context, refresh_token.token).await } /// 添加管理员账号 pub async fn add_account() -> ResResult> { - service::sys_account::add_account().await + service::sys_account_service::add_account().await } \ No newline at end of file diff --git a/system/src/controller/feedback.rs b/system/src/controller/feedback_controller.rs similarity index 79% rename from system/src/controller/feedback.rs rename to system/src/controller/feedback_controller.rs index a89efb8..feddb01 100644 --- a/system/src/controller/feedback.rs +++ b/system/src/controller/feedback_controller.rs @@ -16,7 +16,7 @@ pub async fn add_feedback( Json(req): Json ) -> ResResult> { validator::validate_params(&req, context.get_lang_tag())?; - service::feedback::add_feedback(context, req).await + service::feedback_service::add_feedback(context, req).await } /// 获取反馈信息列表 @@ -24,5 +24,5 @@ pub async fn get_feedback_list_by_page( Extension(context): Extension, Query(page_params): Query ) -> ResResult>> { - service::feedback::get_feedback_list_by_page(context, page_params.page.unwrap(), page_params.page_size.unwrap()).await + service::feedback_service::get_feedback_list_by_page(context, page_params.page.unwrap(), page_params.page_size.unwrap()).await } \ No newline at end of file diff --git a/system/src/controller/mod.rs b/system/src/controller/mod.rs index 7864cd1..8ef3856 100644 --- a/system/src/controller/mod.rs +++ b/system/src/controller/mod.rs @@ -1,2 +1,2 @@ -pub mod account; -pub mod feedback; \ No newline at end of file +pub mod account_controller; +pub mod feedback_controller; \ No newline at end of file diff --git a/system/src/router.rs b/system/src/router.rs index 2af7486..3748c3d 100644 --- a/system/src/router.rs +++ b/system/src/router.rs @@ -11,20 +11,20 @@ pub(crate) fn init() -> Router { let auth: Router = Router::new() .route( "/account/google", - post(controller::account::authenticate_google), + post(controller::account_controller::authenticate_google), ) .route( "/account/sys", - post(controller::account::authenticate_with_password), + post(controller::account_controller::authenticate_with_password), ) .route( "/account/refresh-token", - post(controller::account::refresh_token) + post(controller::account_controller::refresh_token) ) .route( "/feedback", - post(controller::feedback::add_feedback) - .get(controller::feedback::get_feedback_list_by_page), + post(controller::feedback_controller::add_feedback) + .get(controller::feedback_controller::get_feedback_list_by_page), ) .layer(axum::middleware::from_fn( library::middleware::req_ctx::authenticate_ctx, diff --git a/system/src/service/account.rs b/system/src/service/account_service.rs similarity index 100% rename from system/src/service/account.rs rename to system/src/service/account_service.rs diff --git a/system/src/service/feedback.rs b/system/src/service/feedback_service.rs similarity index 100% rename from system/src/service/feedback.rs rename to system/src/service/feedback_service.rs diff --git a/system/src/service/mod.rs b/system/src/service/mod.rs index c42d539..1301dbe 100644 --- a/system/src/service/mod.rs +++ b/system/src/service/mod.rs @@ -1,3 +1,3 @@ -pub mod account; -pub mod feedback; -pub mod sys_account; +pub mod account_service; +pub mod feedback_service; +pub mod sys_account_service; diff --git a/system/src/service/social.rs b/system/src/service/social_service.rs similarity index 100% rename from system/src/service/social.rs rename to system/src/service/social_service.rs diff --git a/system/src/service/sys_account.rs b/system/src/service/sys_account_service.rs similarity index 100% rename from system/src/service/sys_account.rs rename to system/src/service/sys_account_service.rs