Merge branch 'master' into feature/pake-cli

Signed-off-by: Tlntin <TlntinDeng01@Gmail.com>

src-tauri/src/main.rs

@@ -118,9 +118,7 @@ fn main() -> wry::Result<()> {
         })
         .with_inner_size(wry::application::dpi::LogicalSize::new(width, height));
     #[cfg(target_os = "windows")]
-    let icon_path = concat!(env!("CARGO_MANIFEST_DIR"), "/png/weread_32.ico");
-    #[cfg(target_os = "windows")]
-    let icon = load_icon(std::path::Path::new(icon_path));
+    let icon = load_icon(std::path::Path::new("png/weread_32.ico"));
 
     #[cfg(target_os = "windows")]
     let window = common_window

src-tauri/tauri.conf.json

@@ -52,7 +52,7 @@
         "providerShortName": null,
         "signingIdentity": null
       },
-      "resources": [],
+      "resources": ["png/weread_32.ico"],
       "shortDescription": "",
       "targets": ["deb", "msi", "dmg"],
       "windows": {