fix cards service

src/main.rs

@@ -5,8 +5,7 @@ mod infra;
 mod service;
 
 // TODO: Configurable
-const DECK_ADDR: &str = "127.0.0.1:3030";
-const CARDS_ADDR: &str = "127.0.0.1:3033";
+const SERVE_ADDR: &str = "127.0.0.1:3030";
 
 #[tokio::main]
 async fn main() -> anyhow::Result<()> {
@@ -22,16 +21,14 @@ async fn main() -> anyhow::Result<()> {
     let deck = warp::path!("deck" / String)
         .map(service::deck_service)
         .with(cors.clone());
-    warp::serve(deck)
-        .run(SocketAddr::from_str(DECK_ADDR)?)
-        .await;
 
     // TODO: cards服务暂时仅支持单卡查询
     let cards = warp::path!("cards" / String)
         .map(service::cards_service)
         .with(cors);
-    warp::serve(cards)
-        .run(SocketAddr::from_str(CARDS_ADDR)?)
+
+    warp::serve(deck.or(cards))
+        .run(SocketAddr::from_str(SERVE_ADDR)?)
         .await;
 
     Ok(())

src/service/cards/mod.rs

@@ -24,7 +24,7 @@ pub fn service(param: String) -> String {
         Ok::<(db::CardDatas, db::CardTexts), anyhow::Error>((datas, texts))
     })() {
         Ok((data, text)) => {
-            let meta = CardMeta { data, text };
+            let meta = CardMeta { id, data, text };
 
             serde_json::to_string(&meta).unwrap_or_default()
         }
@@ -38,6 +38,7 @@ pub fn service(param: String) -> String {
 
 #[derive(serde::Serialize, Default, Debug)]
 pub struct CardMeta {
+    pub id: i64,
     pub data: db::CardDatas,
     pub text: db::CardTexts,
 }