Merge pull request #194 from Enraged-Dun-Cookie-Development-Team/fix-…

…修复路由拼接 🐛 修复腾讯云路由拼接
Enraged-Dun-Cookie-Development-Team · Jun 10, 2024 · 28017ee · 28017ee
2 parents e3ee6bd + 269e05c
commit 28017ee
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/logic/bakery_logic/src/view.rs b/logic/bakery_logic/src/view.rs
@@ -170,7 +170,7 @@ impl BakeryTcCdnPath {
         }
 
         PurgeCachePath::new_with_query(
-            "/canteen/bakery/mansionInfo",
+            "/cdn/bakery/mansionInfo",
             &MansionId { mansion_id: mid },
         )
     }

diff --git a/middle-server/tencent-cloud-server/src/cdn/purge_urls_cache.rs b/middle-server/tencent-cloud-server/src/cdn/purge_urls_cache.rs
@@ -1,5 +1,6 @@
 use general_request_client::Url;
 use serde::Serialize;
+use url::Position;
 
 use super::{SERVICE, VERSION};
 use crate::{
@@ -45,7 +46,8 @@ impl TcCloudManager {
             .into_iter()
             .map(|PurgeCachePath { path, query }| {
                 let mut url = Url::clone(&*self.cdn_base_url);
-                url.set_path(path);
+                let prefix = &url[Position::BeforePath..];
+                url.set_path(&(prefix.to_string() + path));
                 url.set_query(query.as_deref());
                 url
             })
@@ -72,6 +74,7 @@ mod test {
     use mime::Mime;
     use serde::Serialize;
     use typed_builder::TypedBuilder;
+    use url::{Position, Url};
 
     #[derive(Debug, Clone, TypedBuilder)]
     pub struct RequestContent<P: Serialize, Q: Serialize + Clone> {
@@ -94,4 +97,13 @@ mod test {
 
         println!("{}", canonical_query);
     }
+
+    #[test]
+    fn test_url() {
+        let mut url = Url::parse("http://server-cdn-dev.ceobecanteen.top/api/v1").unwrap();
+
+        let prefix = &url[Position::BeforePath..];
+        url.set_path(&(prefix.to_string() + "/test/test"));
+        println!("{}", url)
+    }
 }