diff --git a/src-tauri/src/app/cmd.rs b/src-tauri/src/app/cmd.rs index 8feddd7..104a93e 100644 --- a/src-tauri/src/app/cmd.rs +++ b/src-tauri/src/app/cmd.rs @@ -43,6 +43,11 @@ pub fn reset_chat_conf() -> ChatConfJson { ChatConfJson::reset_chat_conf() } +#[command] +pub fn run_check_update(app: AppHandle) -> () { + utils::run_check_update(app).unwrap(); +} + #[command] pub fn form_confirm(_app: AppHandle, data: serde_json::Value) { ChatConfJson::amend(&serde_json::json!(data), None).unwrap(); diff --git a/src-tauri/src/app/setup.rs b/src-tauri/src/app/setup.rs index 3f73284..b926a9f 100644 --- a/src-tauri/src/app/setup.rs +++ b/src-tauri/src/app/setup.rs @@ -1,7 +1,6 @@ -use std::borrow::Borrow; use crate::{app::window, conf::ChatConfJson, utils}; use log::info; -use tauri::{utils::config::WindowUrl, window::WindowBuilder, App, GlobalShortcutManager, Manager, AppHandle, Wry}; +use tauri::{utils::config::WindowUrl, window::WindowBuilder, App, GlobalShortcutManager, Manager}; use wry::application::accelerator::Accelerator; pub fn init(app: &mut App) -> std::result::Result<(), Box> { diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs index a6f6f67..05e9161 100644 --- a/src-tauri/src/main.rs +++ b/src-tauri/src/main.rs @@ -57,6 +57,7 @@ async fn main() { cmd::open_link, cmd::get_chat_conf, cmd::reset_chat_conf, + cmd::run_check_update, cmd::form_cancel, cmd::form_confirm, cmd::form_msg, diff --git a/src/layout/index.tsx b/src/layout/index.tsx index 9ca866a..667792a 100644 --- a/src/layout/index.tsx +++ b/src/layout/index.tsx @@ -3,8 +3,7 @@ import {Layout, Menu, Button, Tooltip, message} from 'antd'; import { SyncOutlined } from '@ant-design/icons'; import { useNavigate, useLocation } from 'react-router-dom'; import { getName, getVersion } from '@tauri-apps/api/app'; -import { checkUpdate, installUpdate } from '@tauri-apps/api/updater'; -import { relaunch } from '@tauri-apps/api/process'; +import { invoke } from '@tauri-apps/api'; import Routes, { menuItems } from '@/routes'; import './index.scss'; @@ -24,11 +23,7 @@ const ChatLayout: FC = ({ children }) => { const go = useNavigate(); const checkAppUpdate = async () => { - try { - await checkUpdate(); - }catch (e) { - console.log(e) - } + await invoke('run_check_update'); } return (