Merge branch 'main' of https://github.com/ideal-world/bios

ideal-world · May 27, 2024 · f944133 · f944133
2 parents 9af69d3 + e5c62eb
commit f944133
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/backend/spi/spi-search/src/serv/pg/search_pg_item_serv.rs b/backend/spi/spi-search/src/serv/pg/search_pg_item_serv.rs
@@ -44,7 +44,7 @@ pub async fn add(add_req: &mut SearchItemAddReq, funs: &TardisFunsInst, ctx: &Ta
             "{} {} {} {}",
             add_req.title.as_str(),
             pinyin_vec.clone().into_iter().map(|pinyin| pinyin.chars().next().unwrap_or_default()).join(""),
-            generate_word_combinations_with_symbol(content, vec!["-", "_"]).join(" "),
+            generate_word_combinations_with_symbol(add_req.title.as_str(), vec!["-", "_"]).join(" "),
             generate_word_combinations(pinyin_vec).join(" ")
         )));
     } else {
@@ -55,7 +55,7 @@ pub async fn add(add_req: &mut SearchItemAddReq, funs: &TardisFunsInst, ctx: &Ta
             generate_word_combinations_with_length(content, 1).join(" "),
             generate_word_combinations_with_length(content, 2).join(" "),
             generate_word_combinations_with_length(content, 3).join(" "),
-            generate_word_combinations_with_symbol(content, vec!["-", "_"]).join(" "),
+            generate_word_combinations_with_symbol(add_req.title.as_str(), vec!["-", "_"]).join(" "),
             generate_word_combinations(pinyin_vec).join(" ")
         )));
     }
@@ -133,7 +133,7 @@ pub async fn modify(tag: &str, key: &str, modify_req: &mut SearchItemModifyReq,
                 "{} {} {} {}",
                 title,
                 pinyin_vec.clone().into_iter().map(|pinyin| pinyin.chars().next().unwrap_or_default()).join(""),
-                generate_word_combinations_with_symbol(content, vec!["-", "_"]).join(" "),
+                generate_word_combinations_with_symbol(title.as_str(), vec!["-", "_"]).join(" "),
                 generate_word_combinations(pinyin_vec).join(" ")
             )));
         } else {
@@ -144,7 +144,7 @@ pub async fn modify(tag: &str, key: &str, modify_req: &mut SearchItemModifyReq,
                 generate_word_combinations_with_length(content, 1).join(" "),
                 generate_word_combinations_with_length(content, 2).join(" "),
                 generate_word_combinations_with_length(content, 3).join(" "),
-                generate_word_combinations_with_symbol(content, vec!["-", "_"]).join(" "),
+                generate_word_combinations_with_symbol(title.as_str(), vec!["-", "_"]).join(" "),
                 generate_word_combinations(pinyin_vec).join(" ")
             )));
         }

diff --git a/backend/supports/reach/src/api/reach_api_ci/reach_api_ci_message.rs b/backend/supports/reach/src/api/reach_api_ci/reach_api_ci_message.rs
@@ -1,7 +1,9 @@
+use bios_basic::rbum::helper::rbum_scope_helper::check_without_owner_and_unsafe_fill_ctx;
 use tardis::log as tracing;
 
 use tardis::web::context_extractor::TardisContextExtractor;
 
+use tardis::web::poem::Request;
 use tardis::web::poem_openapi;
 use tardis::web::poem_openapi::payload::Json;
 use tardis::web::web_resp::{TardisApiResult, TardisResp, Void};
@@ -24,10 +26,11 @@ impl ReachMessageCiApi {
     /// 根据模板id发送信息
     #[oai(method = "put", path = "/send")]
     #[tardis::log::instrument(skip_all, fields(module = "reach"))]
-    pub async fn message_send(&self, body: Json<ReachMsgSendReq>, ctx: TardisContextExtractor) -> TardisApiResult<Void> {
-        let ctx = ctx.0;
+    pub async fn message_send(&self, body: Json<ReachMsgSendReq>, request: &Request, ctx: TardisContextExtractor) -> TardisApiResult<Void> {
+        let mut ctx = ctx.0;
         let funs = get_tardis_inst();
         let body = body.0;
+        check_without_owner_and_unsafe_fill_ctx(request, &funs, &mut ctx)?;
         message_send(body, &funs, &ctx).await?;
         TardisResp::ok(VOID)
     }