From b66a8443352bf721997395ad052f872d20dbfde4 Mon Sep 17 00:00:00 2001
From: ForzenString <964413011@qq.com>
Date: Fri, 1 Sep 2023 20:26:18 +0800
Subject: [PATCH 01/34] =?UTF-8?q?:sparkles:=20=E5=90=8E=E5=8F=B0=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src-tauri/Cargo.toml                   |  4 +--
 src-tauri/src/commands/front_logger.rs | 35 ++++++++++++++++++++++++++
 src-tauri/src/commands/mod.rs          |  2 ++
 src-tauri/src/main.rs                  |  5 ++--
 src/App.vue                            |  2 ++
 src/api/operations/logger.ts           | 32 +++++++++++++++++++++++
 src/utils/backgroundUtil.ts            |  9 +++++++
 src/view/home/InfoAndTool.vue          |  4 +--
 src/view/home/TimeLine.vue             | 10 +++++---
 9 files changed, 93 insertions(+), 10 deletions(-)
 create mode 100644 src-tauri/src/commands/front_logger.rs
 create mode 100644 src/api/operations/logger.ts

diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index 19d0dde1..63b1261d 100644
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -3,7 +3,7 @@ name = "ceobe-canteen-desktop"
 version = "0.1.8"
 description = "小刻食堂的桌面端，恭喜你电脑有多了个和小刻一样喜欢吃东西的浏览器内核 "
 authors = ["FrozenString<frozenstringstable@gmail.com>"]
-license = "AGPL-3"
+license="AGPL-3"
 repository = "https://github.com/Enraged-Dun-Cookie-Development-Team/Ceobe-Canteen-Electron"
 default-run = "ceobe-canteen-desktop"
 edition = "2021"
@@ -16,7 +16,7 @@ tauri-build = { version = "1.4.0", features = [] }
 [dependencies]
 serde_json = "1.0"
 serde = { version = "1.0", features = ["derive"] }
-tauri = { version = "1.4.0", features = ["notification-all", "dialog-message", "path-all", "protocol-all", "http-all", "window-all", "clipboard-all", "shell-open", "fs-read-file", "system-tray", "devtools"] }
+tauri = { version = "1.4.0", features = ["notification-all", "dialog-message", "path-all", "protocol-all", "http-all", "window-all", "clipboard-all", "shell-open", "fs-read-file", "system-tray"] }
 reqwest = "0.11"
 base64 = "0.21.2"
 regex = "1"
diff --git a/src-tauri/src/commands/front_logger.rs b/src-tauri/src/commands/front_logger.rs
new file mode 100644
index 00000000..5c2fade0
--- /dev/null
+++ b/src-tauri/src/commands/front_logger.rs
@@ -0,0 +1,35 @@
+use serde::{Deserialize, Serialize};
+use serde_json::Value;
+use tauri::command;
+use tracing::{debug, error, info, instrument, trace, warn};
+
+#[derive(Serialize, Deserialize)]
+pub enum Level {
+    Trace,
+    Debug,
+    Info,
+    Warn,
+    Error,
+}
+
+#[command]
+#[instrument(skip_all, name = "FontEndLog")]
+pub fn front_logger(level: Level, local: String, payload: Value) {
+    match level {
+        Level::Trace => {
+            trace!(logSource = "FontEnd", frontFile = local, payload = %payload);
+        }
+        Level::Debug => {
+            debug!(logSource = "FontEnd", frontFile = local, payload = %payload);
+        }
+        Level::Info => {
+            info!(logSource = "FontEnd", frontFile = local, payload = %payload);
+        }
+        Level::Warn => {
+            warn!(logSource = "FontEnd", frontFile = local, payload = %payload);
+        }
+        Level::Error => {
+            error!(logSource = "FontEnd", frontFile = local, payload = %payload);
+        }
+    }
+}
diff --git a/src-tauri/src/commands/mod.rs b/src-tauri/src/commands/mod.rs
index 164af7d4..92b33556 100644
--- a/src-tauri/src/commands/mod.rs
+++ b/src-tauri/src/commands/mod.rs
@@ -6,6 +6,7 @@ mod quit;
 mod request_client;
 mod request_refer_image;
 mod update_available;
+mod front_logger;
 
 pub use self::auto_launch::{auto_launch_setting, set_auto_launch};
 pub use clipboard::copy_image;
@@ -14,3 +15,4 @@ pub use preview_page::{back_preview, read_detail};
 pub use quit::quit;
 pub use request_client::send_request;
 pub use request_refer_image::request_refer_image;
+pub use front_logger::front_logger;
diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
index dcb6bde5..f7dbfae7 100644
--- a/src-tauri/src/main.rs
+++ b/src-tauri/src/main.rs
@@ -14,7 +14,7 @@ use tauri::{generate_context, Builder, Context, Manager, WindowEvent};
 
 use crate::commands::{
     auto_launch_setting, back_preview, copy_image, get_item, quit, read_detail,
-    request_refer_image, send_request, set_auto_launch, set_item,
+    request_refer_image, send_request, set_auto_launch, set_item, front_logger
 };
 use crate::setup::logger::init_logger;
 use crate::setup::system_tray::new_system_tray;
@@ -60,7 +60,8 @@ fn main() {
                 set_item,
                 send_request,
                 quit,
-                back_preview
+                back_preview,
+                front_logger,
             ]);
 
         let app = builder
diff --git a/src/App.vue b/src/App.vue
index 30ec3483..ab4dca8d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -10,6 +10,8 @@ import updater from "./api/operations/updater";
 import {notification} from "@tauri-apps/api";
 
 onMounted(()=>{
+
+
   if (getCurrent().label == "main"){
     console.log("checking update")
     updater.checkUpdate()
diff --git a/src/api/operations/logger.ts b/src/api/operations/logger.ts
new file mode 100644
index 00000000..917c820c
--- /dev/null
+++ b/src/api/operations/logger.ts
@@ -0,0 +1,32 @@
+import {invoke} from "@tauri-apps/api";
+
+
+class Logger {
+    async call(level: "Debug" | "Info" | "Trace" | "Warn" | "Error", local: string, payload: Record<string, any>) {
+        await invoke("front_logger", {level: level, local: local, payload: payload});
+    }
+
+    async info(local: string, payload: Record<string, any>) {
+        await this.call("Info", local, payload);
+    }
+
+    async debug(local: string, payload: Record<string, any>) {
+        await this.call("Debug", local, payload);
+    }
+
+    async trace(local: string, payload: Record<string, any>) {
+        await this.call("Trace", local, payload);
+    }
+
+    async warn(local: string, payload: Record<string, any>) {
+        await this.call("Warn", local, payload);
+    }
+
+    async error(local: string, payload: Record<string, any>) {
+        await this.call("Error", local, payload);
+    }
+}
+
+const logger = new Logger();
+
+export default logger;
\ No newline at end of file
diff --git a/src/utils/backgroundUtil.ts b/src/utils/backgroundUtil.ts
index 4457f7e0..bfe3f65d 100644
--- a/src/utils/backgroundUtil.ts
+++ b/src/utils/backgroundUtil.ts
@@ -10,6 +10,7 @@ import {
 } from "../api/resourceFetcher/datasourceList";
 import { getCookieList } from "../api/resourceFetcher/cookieList";
 import { UnlistenFn } from "@tauri-apps/api/event";
+import logger from "../api/operations/logger";
 
 const CombineIdKey = "datasource-comb";
 
@@ -84,6 +85,13 @@ export class BackgroundRunner {
         update_cookie_id !== this.old_update_cookie_id)
     ) {
       console.log(this.datasource_comb_id, cookie_id, update_cookie_id);
+      await logger.info(
+          "backgroundUtil",
+          {
+            "combineId": this.datasource_comb_id,
+            "cookieId": cookie_id,
+            "updateCookieId": update_cookie_id
+          });
       let cookies_data = await getCookieList(
         this.datasource_comb_id,
         cookie_id,
@@ -107,6 +115,7 @@ export class BackgroundRunner {
             true,
           );
           if (this.init_fetched) {
+             logger.info("backgroundUtil",{"module":"backgroundRunner","state":"SendNewCookie"})
             operate.openNotificationWindow(cookie);
           }
         }
diff --git a/src/view/home/InfoAndTool.vue b/src/view/home/InfoAndTool.vue
index 38ce377d..6f084ea2 100644
--- a/src/view/home/InfoAndTool.vue
+++ b/src/view/home/InfoAndTool.vue
@@ -29,13 +29,13 @@
 
 <script setup name="infoAndTool" lang="ts">
 import { onMounted, reactive } from "vue";
-import { sourceInfo, toolInfo } from "../../constant";
+import { sourceInfo, toolInfo } from "@/constant";
 import ToolOrSource from "../../components/InfoAndTool/ToolOrSource.vue";
 import VideoList from "../../components/InfoAndTool/VideoList.vue";
 import Announcement from "../../components/InfoAndTool/Announcement.vue";
 import WeeklyQuest from "../../components/InfoAndTool/WeeklyQuest.vue";
 import operate from "../../api/operations/operate";
-import { DatasourceItem, getResourceList } from "../../api/resourceFetcher/datasourceList";
+import { DatasourceItem, getResourceList } from "@/api/resourceFetcher/datasourceList";
 
 const source = reactive({
   list: [],
diff --git a/src/view/home/TimeLine.vue b/src/view/home/TimeLine.vue
index e03dd14c..8a78c3a8 100644
--- a/src/view/home/TimeLine.vue
+++ b/src/view/home/TimeLine.vue
@@ -142,12 +142,13 @@ import { useRouter } from "vue-router";
 import * as htmlToImage from "html-to-image";
 import newestTimeline, { Timeline } from "../../api/operations/newestTimeline";
 import searchWordEvent from "../../api/operations/searchWordEvent";
-import { getCookieSearchList } from "../../api/resourceFetcher/searchCookie";
+import { getCookieSearchList } from "@/api/resourceFetcher/searchCookie";
 import operate from "../../api/operations/operate";
-import { getImage } from "../../utils/imageUtil";
-import { getCookieList } from "../../api/resourceFetcher/cookieList";
+import { getImage } from "@/utils/imageUtil";
+import { getCookieList } from "@/api/resourceFetcher/cookieList";
 import Common from "../../components/Card/Common.vue";
-import { previewUrl } from "../../utils/previewUtil";
+import { previewUrl } from "@/utils/previewUtil";
+import logger from "@/api/operations/logger";
 
 const router = useRouter();
 
@@ -169,6 +170,7 @@ const timeline = reactive<Timeline>({
 
 async function getData() {
   await newestTimeline.getTimeline((_, arg) => {
+    logger.debug("TimeLine.vue",{cookie:arg})
     console.log(arg);
     if (arg == null) {
       return;

From 4c58b2b30124e40251fd70c7ece8352bab3083b5 Mon Sep 17 00:00:00 2001
From: ForzenString <964413011@qq.com>
Date: Fri, 1 Sep 2023 21:22:15 +0800
Subject: [PATCH 02/34] =?UTF-8?q?:sparkles:=20=E7=A7=BB=E9=99=A4=E9=87=8D?=
 =?UTF-8?q?=E5=A4=8D=E9=80=9A=E7=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue | 37 -------------------------------------
 1 file changed, 37 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index ab4dca8d..4f4d8389 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -4,41 +4,4 @@
 </template>
 
 <script lang="ts" setup>
-import {onMounted} from "vue";
-import {getCurrent} from "@tauri-apps/api/window";
-import updater from "./api/operations/updater";
-import {notification} from "@tauri-apps/api";
-
-onMounted(()=>{
-
-
-  if (getCurrent().label == "main"){
-    console.log("checking update")
-    updater.checkUpdate()
-        .then(async (hasNewer)=>{
-          if (hasNewer){
-            if (!await notification.isPermissionGranted()){
-              await notification.requestPermission()
-            }
-
-            notification.sendNotification({
-              title:"新版小刻食堂可用",
-              icon:"/assert/icon.png",
-            })
-          }
-        }).catch(async (err)=>{
-        if (!await notification.isPermissionGranted()){
-          await notification.requestPermission()
-        }
-
-        notification.sendNotification({
-          title:"获取更新失败",
-          icon:"/assert/icon.png",
-          body:err.toString()
-        })
-    })
-
-  }
-})
-
 </script>

From 646efafcc1daf7211635f0f5ac7e7e15139eb350 Mon Sep 17 00:00:00 2001
From: ForzenString <964413011@qq.com>
Date: Fri, 1 Sep 2023 22:37:40 +0800
Subject: [PATCH 03/34] =?UTF-8?q?:bug:=20=E4=BF=AE=E5=A4=8D=E6=97=A0?=
 =?UTF-8?q?=E5=9B=BE=E5=BC=B9=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/view/Notification.vue | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/view/Notification.vue b/src/view/Notification.vue
index 0c756ff2..e0b24cf0 100644
--- a/src/view/Notification.vue
+++ b/src/view/Notification.vue
@@ -4,7 +4,7 @@
       <v-img
         height="190"
         :src="info.imgUrl"
-        cover
+        :cover="info.setImg"
         class="text-white"
         @click="closeThis"
       >
@@ -38,6 +38,7 @@ import {Cookie} from "../api/resourceFetcher/cookieList";
 import {UnlistenFn} from "@tauri-apps/api/event";
 
 const info = ref({
+  setImg:false,
   imgUrl: getImage("/assets/image/logo/icon.png"),
   dataSource: "",
   cookieTime: "",
@@ -45,6 +46,7 @@ const info = ref({
 });
 
 const updatePageData = (newData: Cookie) => {
+
   info.value.dataSource = newData.datasource;
   if (newData.timestamp.platform_precision !== "none") {
     info.value.cookieTime = new Date(newData.timestamp.platform!).toLocaleString();
@@ -53,6 +55,7 @@ const updatePageData = (newData: Cookie) => {
 
   let images = newData.default_cookie.images;
   if (images) {
+    info.value.setImg=true;
     if (newData.datasource.includes("微博")) {
       ceobeRequest
           .getHasRefererImageBase64(images[0].origin_url)
@@ -61,9 +64,13 @@ const updatePageData = (newData: Cookie) => {
           });
     } else {
       info.value.imgUrl = images[0].origin_url;
+
     }
   } else {
     console.log("no image");
+    info.value.imgUrl=getImage("/assets/image/logo/icon.png")
+    info.value.setImg=false;
+
   }
 };
 let unliten: UnlistenFn;

From fc0c25f84fff6ab7222b62cf12d876b3bfa751d9 Mon Sep 17 00:00:00 2001
From: ForzenString <964413011@qq.com>
Date: Thu, 7 Sep 2023 22:41:19 +0800
Subject: [PATCH 04/34] =?UTF-8?q?:sparkles:=20=E9=80=9A=E7=9F=A5=E5=B8=A6?=
 =?UTF-8?q?=E5=A3=B0=E9=9F=B3=EF=BC=8C=E4=B8=94=E4=B8=8D=E8=A6=86=E7=9B=96?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=A0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src-tauri/src/commands/mod.rs          |  2 +
 src-tauri/src/commands/monitor_info.rs | 77 ++++++++++++++++++++++++++
 src-tauri/src/commands/preview_page.rs |  3 +-
 src-tauri/src/main.rs                  |  4 +-
 src/api/operations/operate.ts          | 21 +++++--
 src/view/Notification.vue              | 19 +++----
 6 files changed, 106 insertions(+), 20 deletions(-)
 create mode 100644 src-tauri/src/commands/monitor_info.rs

diff --git a/src-tauri/src/commands/mod.rs b/src-tauri/src/commands/mod.rs
index 92b33556..7f236a95 100644
--- a/src-tauri/src/commands/mod.rs
+++ b/src-tauri/src/commands/mod.rs
@@ -7,6 +7,7 @@ mod request_client;
 mod request_refer_image;
 mod update_available;
 mod front_logger;
+mod monitor_info;
 
 pub use self::auto_launch::{auto_launch_setting, set_auto_launch};
 pub use clipboard::copy_image;
@@ -16,3 +17,4 @@ pub use quit::quit;
 pub use request_client::send_request;
 pub use request_refer_image::request_refer_image;
 pub use front_logger::front_logger;
+pub use monitor_info::{get_monitor_info,message_beep};
\ No newline at end of file
diff --git a/src-tauri/src/commands/monitor_info.rs b/src-tauri/src/commands/monitor_info.rs
new file mode 100644
index 00000000..5c7d7899
--- /dev/null
+++ b/src-tauri/src/commands/monitor_info.rs
@@ -0,0 +1,77 @@
+use serde::Serialize;
+
+use tauri::{command, PhysicalPosition, PhysicalSize, Window};
+
+#[derive(Debug, Clone, Serialize)]
+pub struct MonitorInfo {
+    work_space: PhysicalSize<u32>,
+    left_top: PhysicalPosition<i32>,
+}
+
+#[command]
+pub fn get_monitor_info(window: Window) -> tauri::Result<MonitorInfo> {
+    #[cfg(not(windows))]
+    {
+        let window = _window;
+        let monitor = window
+            .primary_monitor()?
+            .expect("Cannot found Primary Monitor");
+
+        Ok(MonitorInfo {
+            work_space: *monitor.size(),
+            left_top: *monitor.position(),
+        })
+    }
+    #[cfg(windows)]
+    {
+        use std::mem::size_of;
+        use windows::{
+            Win32::{
+                Graphics::{
+                    Gdi::{
+                        GetMonitorInfoW,
+                        MonitorFromWindow,
+                        MONITORINFO,
+                        MONITOR_DEFAULTTOPRIMARY
+                    }
+                }
+            }
+        };
+
+        let hwnd = window.hwnd()?;
+        let mut monitor_info = MONITORINFO {
+            cbSize: size_of::<MONITORINFO>() as u32,
+            ..Default::default()
+        };
+
+        unsafe {
+            let monitor = MonitorFromWindow(hwnd, MONITOR_DEFAULTTOPRIMARY);
+            GetMonitorInfoW(monitor, &mut monitor_info);
+        };
+        let rect = monitor_info.rcWork;
+
+        Ok(MonitorInfo {
+            work_space: PhysicalSize::new(
+                (rect.right - rect.left) as u32,
+                (rect.bottom - rect.top) as u32,
+            ),
+            left_top: PhysicalPosition::new(rect.left, rect.top),
+        })
+    }
+}
+
+#[command]
+pub fn message_beep() {
+    #[cfg(windows)]
+    {
+        use windows::{
+            Win32::{
+                System::Diagnostics::Debug::MessageBeep,
+                UI::WindowsAndMessaging::MB_ICONSTOP
+            }
+        };
+        unsafe {
+            MessageBeep(MB_ICONSTOP.0);
+        }
+    }
+}
diff --git a/src-tauri/src/commands/preview_page.rs b/src-tauri/src/commands/preview_page.rs
index a396333f..60c6a711 100644
--- a/src-tauri/src/commands/preview_page.rs
+++ b/src-tauri/src/commands/preview_page.rs
@@ -3,7 +3,7 @@ use std::thread::sleep;
 use std::time::Duration;
 use tauri::http::{Request, Response};
 use tauri::{
-    command, AppHandle, LogicalPosition, Manager, Window, WindowBuilder, WindowEvent, WindowUrl,
+    command, AppHandle, Manager, Window, WindowBuilder, WindowEvent, WindowUrl,
 };
 use tracing::{info, instrument};
 
@@ -36,6 +36,7 @@ const INSERT: &str = r#"<style type="text/css">
 #[instrument(skip_all, err, name = "LeavePreview")]
 pub fn back_preview(app: AppHandle) -> tauri::Result<()> {
     if let Some(win) = app.get_window(WINDOWS_NAME) {
+        win.eval("window.location.replace('about:black')")?;
         win.hide()?;
     }
     Ok(())
diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
index f7dbfae7..2a2a770c 100644
--- a/src-tauri/src/main.rs
+++ b/src-tauri/src/main.rs
@@ -14,7 +14,7 @@ use tauri::{generate_context, Builder, Context, Manager, WindowEvent};
 
 use crate::commands::{
     auto_launch_setting, back_preview, copy_image, get_item, quit, read_detail,
-    request_refer_image, send_request, set_auto_launch, set_item, front_logger
+    request_refer_image, send_request, set_auto_launch, set_item, front_logger,get_monitor_info,message_beep
 };
 use crate::setup::logger::init_logger;
 use crate::setup::system_tray::new_system_tray;
@@ -62,6 +62,8 @@ fn main() {
                 quit,
                 back_preview,
                 front_logger,
+                get_monitor_info,
+                message_beep
             ]);
 
         let app = builder
diff --git a/src/api/operations/operate.ts b/src/api/operations/operate.ts
index 1a21365a..9ece34f4 100644
--- a/src/api/operations/operate.ts
+++ b/src/api/operations/operate.ts
@@ -6,20 +6,23 @@ import {
 } from "../function";
 import {
   appWindow,
-  currentMonitor,
   getAll,
-  LogicalPosition, PhysicalPosition,
+  PhysicalPosition, PhysicalSize,
   WebviewWindow,
 } from "@tauri-apps/api/window";
 import { Cookie } from "../resourceFetcher/cookieList";
-import {invoke, shell} from "@tauri-apps/api";
+import {invoke} from "@tauri-apps/api";
 
 class Operate {
   async openNotificationWindow(cookie: Cookie) {
     console.log(`send Notification`);
 
-    let monitor = await currentMonitor();
-    let size = monitor?.size;
+    let monitorInfo = await invoke<{
+      work_space:PhysicalSize,
+      left_top :PhysicalPosition
+    }>("get_monitor_info");
+
+    let size = monitorInfo.work_space;
     let window: WebviewWindow = getAll().find(
       (window: WebviewWindow) => window.label == "notification",
     );
@@ -29,7 +32,9 @@ class Operate {
     let h = size?.height ?? 1080;
     console.log(w, h);
     await window.setPosition(
-      new PhysicalPosition(w - winSize.width, h - winSize.height),
+      new PhysicalPosition(
+          w - winSize.width + monitorInfo.left_top.x,
+          h - winSize.height + monitorInfo.left_top.y),
     );
     console.log(await window.outerPosition());
     console.log("send cookie " , cookie)
@@ -68,6 +73,10 @@ class Operate {
   async getBootSetting() {
     return await getBootStartSetting();
   }
+
+  async messageBeep(){
+    await invoke("message_beep")
+  }
 }
 
 const operate = new Operate();
diff --git a/src/view/Notification.vue b/src/view/Notification.vue
index e0b24cf0..9f1c25bb 100644
--- a/src/view/Notification.vue
+++ b/src/view/Notification.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="notification">
+  <div class="notification ">
     <v-card>
       <v-img
         height="190"
@@ -19,23 +19,18 @@
       </v-card-title>
       <v-card-subtitle>{{ info.cookieTime }}</v-card-subtitle>
       <v-card-text class="pt-1 pb-0 text">{{ info.cookieText }}</v-card-text>
-      <v-card-actions class="pt-0">
-        <v-spacer></v-spacer>
-        <v-btn size="x-small" icon="fas fa-copy"></v-btn>
-        <v-btn size="x-small" icon="fas fa-share-nodes"></v-btn>
-        <v-btn size="x-small" icon="fas fa-link"></v-btn>
-      </v-card-actions>
     </v-card>
   </div>
 </template>
 
-<script lang="ts" name="index" setup>
-import {onMounted, onUnmounted, reactive, ref} from "vue";
-import {getImage} from "../utils/imageUtil";
+<script lang="ts" setup>
+import {onMounted, onUnmounted, ref} from "vue";
+import {getImage} from "@/utils/imageUtil";
 import ceobeRequest from "../api/operations/ceobeRequest";
 import notification from "../api/operations/notification";
-import {Cookie} from "../api/resourceFetcher/cookieList";
+import {Cookie} from "@/api/resourceFetcher/cookieList";
 import {UnlistenFn} from "@tauri-apps/api/event";
+import operate from "@/api/operations/operate";
 
 const info = ref({
   setImg:false,
@@ -70,8 +65,8 @@ const updatePageData = (newData: Cookie) => {
     console.log("no image");
     info.value.imgUrl=getImage("/assets/image/logo/icon.png")
     info.value.setImg=false;
-
   }
+  operate.messageBeep()
 };
 let unliten: UnlistenFn;
 onMounted(() => {

From 5ce1824147de91aee0f42ad44982a68ec1ea17c9 Mon Sep 17 00:00:00 2001
From: ForzenString <964413011@qq.com>
Date: Thu, 7 Sep 2023 22:49:04 +0800
Subject: [PATCH 05/34] =?UTF-8?q?:sparkles:=20=E6=8E=A7=E5=88=B6=E4=B8=8D?=
 =?UTF-8?q?=E6=89=93=E5=8C=85msi?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src-tauri/tauri.conf.json | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
index d582799a..0eedab71 100644
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -8,7 +8,7 @@
     "withGlobalTauri": true
   },
   "package": {
-    "productName": "CeobeCanteen",
+    "productName": "小刻食堂",
     "version": "0.1.8"
   },
   "tauri": {
@@ -75,7 +75,9 @@
         "signingIdentity": null
       },
       "shortDescription": "",
-      "targets": "all",
+      "targets": [
+        "deb","dmg","app","appimage","nsis"
+      ],
       "windows": {
         "certificateThumbprint": null,
         "digestAlgorithm": "sha256",
@@ -107,7 +109,7 @@
         "label": "main",
         "height": 600,
         "resizable": true,
-        "title": "ceobe-canteen-electron",
+        "title": "小刻食堂",
         "width": 1200
       },
       {

From e34799456da4eaa7f745d0bb551f15a6adbdd764 Mon Sep 17 00:00:00 2001
From: ForzenString <964413011@qq.com>
Date: Thu, 7 Sep 2023 22:49:45 +0800
Subject: [PATCH 06/34] =?UTF-8?q?:sparkles:=20=E6=8E=A7=E5=88=B6=E4=B8=8D?=
 =?UTF-8?q?=E6=89=93=E5=8C=85msi?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src-tauri/tauri.conf.json | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
index 0eedab71..f345eaf7 100644
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -12,7 +12,6 @@
     "version": "0.1.8"
   },
   "tauri": {
-
     "systemTray": {
       "iconPath": "icons/32x32.png"
     },
@@ -24,7 +23,11 @@
       "http": {
         "all": true,
         "request": true,
-        "scope": ["http://*.ceobecanteen.top/*", "http://*", "https://*"]
+        "scope": [
+          "http://*.ceobecanteen.top/*",
+          "http://*",
+          "https://*"
+        ]
       },
       "fs": {
         "readFile": true
@@ -76,7 +79,11 @@
       },
       "shortDescription": "",
       "targets": [
-        "deb","dmg","app","appimage","nsis"
+        "deb",
+        "dmg",
+        "app",
+        "appimage",
+        "nsis"
       ],
       "windows": {
         "certificateThumbprint": null,
@@ -87,11 +94,13 @@
           "sidebarImage": "assets/installer-side.bmp",
           "installerIcon": "assets/installer-icon.ico",
           "installMode": "both",
-          "languages": ["SimpChinese"]
+          "languages": [
+            "SimpChinese"
+          ]
         },
         "wix": {
           "language": "zh-CN",
-          "bannerPath":"assets/installer-banner.bmp",
+          "bannerPath": "assets/installer-banner.bmp",
           "dialogImagePath": "assets/installer-dialog.bmp"
         }
       }

From 2da5457d2885c9bccf7271e51699498d79829f9c Mon Sep 17 00:00:00 2001
From: ForzenString <964413011@qq.com>
Date: Thu, 7 Sep 2023 22:51:02 +0800
Subject: [PATCH 07/34] =?UTF-8?q?:sparkles:=20Readme=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=AE=98=E7=BD=91=E8=BF=9E=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index e839f5d5..11a42455 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 <div align="center">
 
-![LOGO](src-tauri/icons/128x128.png)
+[![LOGO](src-tauri/icons/128x128.png)](https://www.ceobecanteen.top/#/)
 
 帮小刻找好多好吃的饼
 

From b8d2a24cf1b29fc1f37ef3a6a225a7b59856124e Mon Sep 17 00:00:00 2001
From: ForzenString <964413011@qq.com>
Date: Thu, 7 Sep 2023 23:38:04 +0800
Subject: [PATCH 08/34] =?UTF-8?q?:sparkles:=20notification=20=E5=BC=B9?=
 =?UTF-8?q?=E7=AA=97=E5=9B=BE=E6=A0=87=E4=B8=8D=E5=9C=A8=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E6=A0=8F=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src-tauri/src/commands/hide_notification.rs | 22 +++++++++++++++++++++
 src-tauri/src/commands/mod.rs               |  4 +++-
 src-tauri/src/main.rs                       |  4 +++-
 src/api/operations/operate.ts               |  4 ++++
 src/view/Notification.vue                   |  4 +++-
 5 files changed, 35 insertions(+), 3 deletions(-)
 create mode 100644 src-tauri/src/commands/hide_notification.rs

diff --git a/src-tauri/src/commands/hide_notification.rs b/src-tauri/src/commands/hide_notification.rs
new file mode 100644
index 00000000..e217d78a
--- /dev/null
+++ b/src-tauri/src/commands/hide_notification.rs
@@ -0,0 +1,22 @@
+use tauri::{command, Window};
+use windows::Win32::Graphics::Gdi::UpdateWindow;
+use windows::Win32::UI::WindowsAndMessaging::{
+    GetWindowLongPtrW, SetWindowLongPtrW, GWL_EXSTYLE, WS_EX_APPWINDOW, WS_EX_TOOLWINDOW,
+};
+
+#[command]
+pub fn hide_notification(window: Window) -> tauri::Result<()> {
+    #[cfg(windows)]
+    {
+        let hwnd = window.hwnd()?;
+        let mut style = unsafe { GetWindowLongPtrW(hwnd, GWL_EXSTYLE) };
+        style |= !WS_EX_APPWINDOW.0 as isize;
+        style &= WS_EX_TOOLWINDOW.0 as isize;
+        unsafe { SetWindowLongPtrW(hwnd, GWL_EXSTYLE, style) };
+        unsafe {
+            UpdateWindow(hwnd);
+        }
+    }
+
+    Ok(())
+}
diff --git a/src-tauri/src/commands/mod.rs b/src-tauri/src/commands/mod.rs
index 7f236a95..d50381be 100644
--- a/src-tauri/src/commands/mod.rs
+++ b/src-tauri/src/commands/mod.rs
@@ -8,6 +8,7 @@ mod request_refer_image;
 mod update_available;
 mod front_logger;
 mod monitor_info;
+mod hide_notification;
 
 pub use self::auto_launch::{auto_launch_setting, set_auto_launch};
 pub use clipboard::copy_image;
@@ -17,4 +18,5 @@ pub use quit::quit;
 pub use request_client::send_request;
 pub use request_refer_image::request_refer_image;
 pub use front_logger::front_logger;
-pub use monitor_info::{get_monitor_info,message_beep};
\ No newline at end of file
+pub use monitor_info::{get_monitor_info, message_beep};
+pub use hide_notification::hide_notification;
\ No newline at end of file
diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
index 2a2a770c..436978fd 100644
--- a/src-tauri/src/main.rs
+++ b/src-tauri/src/main.rs
@@ -15,6 +15,7 @@ use tauri::{generate_context, Builder, Context, Manager, WindowEvent};
 use crate::commands::{
     auto_launch_setting, back_preview, copy_image, get_item, quit, read_detail,
     request_refer_image, send_request, set_auto_launch, set_item, front_logger,get_monitor_info,message_beep
+    ,hide_notification
 };
 use crate::setup::logger::init_logger;
 use crate::setup::system_tray::new_system_tray;
@@ -63,7 +64,8 @@ fn main() {
                 back_preview,
                 front_logger,
                 get_monitor_info,
-                message_beep
+                message_beep,
+                hide_notification
             ]);
 
         let app = builder
diff --git a/src/api/operations/operate.ts b/src/api/operations/operate.ts
index 9ece34f4..16efd000 100644
--- a/src/api/operations/operate.ts
+++ b/src/api/operations/operate.ts
@@ -77,6 +77,10 @@ class Operate {
   async messageBeep(){
     await invoke("message_beep")
   }
+
+  async hideNotifyIcon(){
+    await invoke("hide_notification")
+  }
 }
 
 const operate = new Operate();
diff --git a/src/view/Notification.vue b/src/view/Notification.vue
index 9f1c25bb..c9ead1cf 100644
--- a/src/view/Notification.vue
+++ b/src/view/Notification.vue
@@ -66,12 +66,14 @@ const updatePageData = (newData: Cookie) => {
     info.value.imgUrl=getImage("/assets/image/logo/icon.png")
     info.value.setImg=false;
   }
+
   operate.messageBeep()
+
 };
 let unliten: UnlistenFn;
 onMounted(() => {
-
   notification.getInfo((_, data) => {
+    operate.hideNotifyIcon()
     console.log("get Info: " ,data)
     updatePageData(data);
   }).then((closer) => {

From 3091aea0f7aef67b650af5689a81cc757bfb0d5f Mon Sep 17 00:00:00 2001
From: ForzenString <964413011@qq.com>
Date: Thu, 7 Sep 2023 23:38:55 +0800
Subject: [PATCH 09/34] =?UTF-8?q?:sparkles:=20=E5=B0=86=E5=B9=B3=E5=8F=B0?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E5=AF=BC=E5=85=A5=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src-tauri/src/commands/hide_notification.rs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src-tauri/src/commands/hide_notification.rs b/src-tauri/src/commands/hide_notification.rs
index e217d78a..0eacbe1e 100644
--- a/src-tauri/src/commands/hide_notification.rs
+++ b/src-tauri/src/commands/hide_notification.rs
@@ -1,13 +1,14 @@
 use tauri::{command, Window};
-use windows::Win32::Graphics::Gdi::UpdateWindow;
-use windows::Win32::UI::WindowsAndMessaging::{
-    GetWindowLongPtrW, SetWindowLongPtrW, GWL_EXSTYLE, WS_EX_APPWINDOW, WS_EX_TOOLWINDOW,
-};
+
 
 #[command]
 pub fn hide_notification(window: Window) -> tauri::Result<()> {
     #[cfg(windows)]
     {
+        use windows::Win32::Graphics::Gdi::UpdateWindow;
+        use windows::Win32::UI::WindowsAndMessaging::{
+            GetWindowLongPtrW, SetWindowLongPtrW, GWL_EXSTYLE, WS_EX_APPWINDOW, WS_EX_TOOLWINDOW,
+        };
         let hwnd = window.hwnd()?;
         let mut style = unsafe { GetWindowLongPtrW(hwnd, GWL_EXSTYLE) };
         style |= !WS_EX_APPWINDOW.0 as isize;

From 7845d1e938fdee050081691b6d70f669cdac9e21 Mon Sep 17 00:00:00 2001
From: ForzenString <964413011@qq.com>
Date: Sat, 9 Sep 2023 16:00:09 +0800
Subject: [PATCH 10/34] :art: cargo fmt

---
 src-tauri/src/commands/hide_notification.rs |  1 -
 src-tauri/src/commands/mod.rs               | 12 ++++++------
 src-tauri/src/commands/monitor_info.rs      | 20 ++++----------------
 src-tauri/src/commands/preview_page.rs      |  4 +---
 src-tauri/src/main.rs                       |  6 +++---
 src-tauri/src/request_client/mod.rs         |  6 +++---
 6 files changed, 17 insertions(+), 32 deletions(-)

diff --git a/src-tauri/src/commands/hide_notification.rs b/src-tauri/src/commands/hide_notification.rs
index 0eacbe1e..88c63af1 100644
--- a/src-tauri/src/commands/hide_notification.rs
+++ b/src-tauri/src/commands/hide_notification.rs
@@ -1,6 +1,5 @@
 use tauri::{command, Window};
 
-
 #[command]
 pub fn hide_notification(window: Window) -> tauri::Result<()> {
     #[cfg(windows)]
diff --git a/src-tauri/src/commands/mod.rs b/src-tauri/src/commands/mod.rs
index d50381be..5284d188 100644
--- a/src-tauri/src/commands/mod.rs
+++ b/src-tauri/src/commands/mod.rs
@@ -1,22 +1,22 @@
 mod auto_launch;
 mod clipboard;
+mod front_logger;
+mod hide_notification;
 mod local_storage;
+mod monitor_info;
 mod preview_page;
 mod quit;
 mod request_client;
 mod request_refer_image;
 mod update_available;
-mod front_logger;
-mod monitor_info;
-mod hide_notification;
 
 pub use self::auto_launch::{auto_launch_setting, set_auto_launch};
 pub use clipboard::copy_image;
+pub use front_logger::front_logger;
+pub use hide_notification::hide_notification;
 pub use local_storage::{get_item, set_item};
+pub use monitor_info::{get_monitor_info, message_beep};
 pub use preview_page::{back_preview, read_detail};
 pub use quit::quit;
 pub use request_client::send_request;
 pub use request_refer_image::request_refer_image;
-pub use front_logger::front_logger;
-pub use monitor_info::{get_monitor_info, message_beep};
-pub use hide_notification::hide_notification;
\ No newline at end of file
diff --git a/src-tauri/src/commands/monitor_info.rs b/src-tauri/src/commands/monitor_info.rs
index 5c7d7899..3b115eb7 100644
--- a/src-tauri/src/commands/monitor_info.rs
+++ b/src-tauri/src/commands/monitor_info.rs
@@ -25,17 +25,8 @@ pub fn get_monitor_info(window: Window) -> tauri::Result<MonitorInfo> {
     #[cfg(windows)]
     {
         use std::mem::size_of;
-        use windows::{
-            Win32::{
-                Graphics::{
-                    Gdi::{
-                        GetMonitorInfoW,
-                        MonitorFromWindow,
-                        MONITORINFO,
-                        MONITOR_DEFAULTTOPRIMARY
-                    }
-                }
-            }
+        use windows::Win32::Graphics::Gdi::{
+            GetMonitorInfoW, MonitorFromWindow, MONITORINFO, MONITOR_DEFAULTTOPRIMARY,
         };
 
         let hwnd = window.hwnd()?;
@@ -64,11 +55,8 @@ pub fn get_monitor_info(window: Window) -> tauri::Result<MonitorInfo> {
 pub fn message_beep() {
     #[cfg(windows)]
     {
-        use windows::{
-            Win32::{
-                System::Diagnostics::Debug::MessageBeep,
-                UI::WindowsAndMessaging::MB_ICONSTOP
-            }
+        use windows::Win32::{
+            System::Diagnostics::Debug::MessageBeep, UI::WindowsAndMessaging::MB_ICONSTOP,
         };
         unsafe {
             MessageBeep(MB_ICONSTOP.0);
diff --git a/src-tauri/src/commands/preview_page.rs b/src-tauri/src/commands/preview_page.rs
index 60c6a711..4e9f4f60 100644
--- a/src-tauri/src/commands/preview_page.rs
+++ b/src-tauri/src/commands/preview_page.rs
@@ -2,9 +2,7 @@ use reqwest::Url;
 use std::thread::sleep;
 use std::time::Duration;
 use tauri::http::{Request, Response};
-use tauri::{
-    command, AppHandle, Manager, Window, WindowBuilder, WindowEvent, WindowUrl,
-};
+use tauri::{command, AppHandle, Manager, Window, WindowBuilder, WindowEvent, WindowUrl};
 use tracing::{info, instrument};
 
 const WINDOWS_NAME: &str = "Preview";
diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
index 436978fd..5b5ded40 100644
--- a/src-tauri/src/main.rs
+++ b/src-tauri/src/main.rs
@@ -13,9 +13,9 @@ use tauri::api::path::app_log_dir;
 use tauri::{generate_context, Builder, Context, Manager, WindowEvent};
 
 use crate::commands::{
-    auto_launch_setting, back_preview, copy_image, get_item, quit, read_detail,
-    request_refer_image, send_request, set_auto_launch, set_item, front_logger,get_monitor_info,message_beep
-    ,hide_notification
+    auto_launch_setting, back_preview, copy_image, front_logger, get_item, get_monitor_info,
+    hide_notification, message_beep, quit, read_detail, request_refer_image, send_request,
+    set_auto_launch, set_item,
 };
 use crate::setup::logger::init_logger;
 use crate::setup::system_tray::new_system_tray;
diff --git a/src-tauri/src/request_client/mod.rs b/src-tauri/src/request_client/mod.rs
index 68913981..a1d63a65 100644
--- a/src-tauri/src/request_client/mod.rs
+++ b/src-tauri/src/request_client/mod.rs
@@ -8,10 +8,10 @@ use http::Method;
 use http_cache_reqwest::{Cache, CacheMode, HttpCache, HttpCacheOptions};
 use reqwest::{Client, IntoUrl, Request, Response};
 use reqwest_middleware::{ClientBuilder, ClientWithMiddleware, RequestBuilder};
+use reqwest_retry::policies::ExponentialBackoff;
+use reqwest_retry::RetryTransientMiddleware;
 use std::sync::OnceLock;
 use std::time::Duration;
-use reqwest_retry::policies::{ExponentialBackoff};
-use reqwest_retry::RetryTransientMiddleware;
 use tauri::AppHandle;
 use tracing::{info, instrument, Level};
 
@@ -30,7 +30,7 @@ impl RequestClient {
             let cache_location = get_cache_dir(app).join(HTTP_CACHE);
             let retry_policy = ExponentialBackoff::builder()
                 .backoff_exponent(2)
-                .retry_bounds(Duration::from_millis(500),Duration::from_secs(16))
+                .retry_bounds(Duration::from_millis(500), Duration::from_secs(16))
                 .build_with_total_retry_duration(Duration::from_secs(120));
             info!(firstInit="RequestClient",cacheLocal = ?cache_location);
             let client = ClientBuilder::new(Client::new())

From fc3bcda2c4e5ca222e2b7354f10f9226b20fb01d Mon Sep 17 00:00:00 2001
From: ForzenString <964413011@qq.com>
Date: Sat, 9 Sep 2023 18:10:21 +0800
Subject: [PATCH 11/34] =?UTF-8?q?:recycle:=20=E9=80=9A=E7=9F=A5=E5=BC=B9?=
 =?UTF-8?q?=E7=AA=97=E5=9C=A8=E5=87=86=E5=A4=87=E5=AE=8C=E6=AF=95=E5=90=8E?=
 =?UTF-8?q?=E6=89=8D=E5=87=BA=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/operations/operate.ts | 1 -
 src/view/Notification.vue     | 4 +++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/api/operations/operate.ts b/src/api/operations/operate.ts
index 16efd000..7f1a6452 100644
--- a/src/api/operations/operate.ts
+++ b/src/api/operations/operate.ts
@@ -39,7 +39,6 @@ class Operate {
     console.log(await window.outerPosition());
     console.log("send cookie " , cookie)
     await window.emit("new_cookie_info", cookie);
-    await window.show();
   }
 
   async copy(param: { data: string; type: string }) {
diff --git a/src/view/Notification.vue b/src/view/Notification.vue
index c9ead1cf..a38290ca 100644
--- a/src/view/Notification.vue
+++ b/src/view/Notification.vue
@@ -31,6 +31,7 @@ import notification from "../api/operations/notification";
 import {Cookie} from "@/api/resourceFetcher/cookieList";
 import {UnlistenFn} from "@tauri-apps/api/event";
 import operate from "@/api/operations/operate";
+import {appWindow} from "@tauri-apps/api/window";
 
 const info = ref({
   setImg:false,
@@ -67,7 +68,6 @@ const updatePageData = (newData: Cookie) => {
     info.value.setImg=false;
   }
 
-  operate.messageBeep()
 
 };
 let unliten: UnlistenFn;
@@ -76,6 +76,8 @@ onMounted(() => {
     operate.hideNotifyIcon()
     console.log("get Info: " ,data)
     updatePageData(data);
+    appWindow.show()
+    operate.messageBeep()
   }).then((closer) => {
     unliten = closer
   });

From b12bb283193aae94e1008d1413cec9b0615ee8bb Mon Sep 17 00:00:00 2001
From: ForzenString <964413011@qq.com>
Date: Sat, 9 Sep 2023 21:08:35 +0800
Subject: [PATCH 12/34] =?UTF-8?q?:wrench:=20=E6=B7=BB=E5=8A=A0=E9=80=9A?=
 =?UTF-8?q?=E7=9F=A5=E6=96=B9=E5=BC=8F=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/operations/notification.ts         |  40 ++++++-
 src/api/operations/operate.ts              | 121 ++++++++++-----------
 src/components/SettingItem/SettingItem.vue |  43 ++++++++
 src/components/SettingPage.vue             | 107 +++++++++++-------
 src/view/Notification.vue                  |  39 ++++---
 5 files changed, 224 insertions(+), 126 deletions(-)
 create mode 100644 src/components/SettingItem/SettingItem.vue

diff --git a/src/api/operations/notification.ts b/src/api/operations/notification.ts
index d5d9b6d0..443187b4 100644
--- a/src/api/operations/notification.ts
+++ b/src/api/operations/notification.ts
@@ -1,6 +1,7 @@
 import {appWindow, getAll, WebviewWindow} from "@tauri-apps/api/window";
 import {listen, UnlistenFn, Event} from "@tauri-apps/api/event";
 import {Cookie} from "../resourceFetcher/cookieList";
+import storage from "./localStorage";
 
 class NotificationOperate {
     async getInfo(callback: (event: string, payload: Cookie) => void,): Promise<UnlistenFn> {
@@ -8,12 +9,12 @@ class NotificationOperate {
     }
 
     async closeWindow() {
-        let window:WebviewWindow|null = getAll().find((window:WebviewWindow)=>window.label =="main")
-        if (window){
-            if (await window.isMinimized()){
+        let window: WebviewWindow | null = getAll().find((window: WebviewWindow) => window.label == "main")
+        if (window) {
+            if (await window.isMinimized()) {
                 await window.unminimize()
             }
-            if (!await window.isVisible()){
+            if (!await window.isVisible()) {
                 await window.show()
             }
             await window.setFocus()
@@ -21,8 +22,39 @@ class NotificationOperate {
 
         await appWindow.hide();
     }
+
+    async setNotificationMode(modeIdx: number) {
+        console.log("setting Notify mod",modeIdx)
+        await storage.setItem("setting.notify", modeIdx);
+    }
+
+    async getNotificationMode(): Promise<{ idx: number, value: string }> {
+        const idx = await storage.getItem<number>("setting.notify") ?? NotifyMode.PopUpAndBeep.idx
+        return allNotifyMode.find((mode)=>mode.idx==idx)!!
+    }
+
+    async needNotifyPop():Promise<boolean>{
+        const mode =await this.getNotificationMode()
+        return mode.idx == NotifyMode.PopUpOnly.idx || mode.idx == NotifyMode.PopUpAndBeep.idx;
+    }
+    async needBeep():Promise<boolean>{
+        const mode = await  this.getNotificationMode()
+        return mode.idx == NotifyMode.PopUpAndBeep.idx || mode.idx == NotifyMode.BeepOnly.idx;
+    }
 }
 
+export const NotifyMode = Object.freeze({
+    PopUpOnly: {
+        idx: 0, value: "仅弹窗"
+    }, BeepOnly: {
+        idx: 1, value: "仅提示音"
+    }, PopUpAndBeep: {
+        idx: 2, value: "弹窗且提示音"
+    }, None: {
+        idx: 3, value: "无"
+    },
+})
+export const allNotifyMode = [NotifyMode.PopUpAndBeep, NotifyMode.BeepOnly, NotifyMode.PopUpOnly, NotifyMode.None]
 const notification = new NotificationOperate();
 
 export default notification;
diff --git a/src/api/operations/operate.ts b/src/api/operations/operate.ts
index 7f1a6452..c8b2095b 100644
--- a/src/api/operations/operate.ts
+++ b/src/api/operations/operate.ts
@@ -1,85 +1,78 @@
 import {
-  bootStartSetting,
-  copyInfo,
-  getBootStartSetting,
-  openUrlInUserBrowser,
+    bootStartSetting, copyInfo, getBootStartSetting, openUrlInUserBrowser,
 } from "../function";
 import {
-  appWindow,
-  getAll,
-  PhysicalPosition, PhysicalSize,
-  WebviewWindow,
+    appWindow, getAll, PhysicalPosition, PhysicalSize, WebviewWindow,
 } from "@tauri-apps/api/window";
-import { Cookie } from "../resourceFetcher/cookieList";
+import {Cookie} from "../resourceFetcher/cookieList";
 import {invoke} from "@tauri-apps/api";
+import notification from "./notification";
 
 class Operate {
-  async openNotificationWindow(cookie: Cookie) {
-    console.log(`send Notification`);
+    async openNotificationWindow(cookie: Cookie) {
+        console.log(`send Notification`);
+        if (await notification.needNotifyPop()) {
 
-    let monitorInfo = await invoke<{
-      work_space:PhysicalSize,
-      left_top :PhysicalPosition
-    }>("get_monitor_info");
+            let monitorInfo = await invoke<{
+                work_space: PhysicalSize, left_top: PhysicalPosition
+            }>("get_monitor_info");
 
-    let size = monitorInfo.work_space;
-    let window: WebviewWindow = getAll().find(
-      (window: WebviewWindow) => window.label == "notification",
-    );
-    let winSize = await window.outerSize();
-    console.log(winSize, size);
-    let w = size?.width ?? 1920;
-    let h = size?.height ?? 1080;
-    console.log(w, h);
-    await window.setPosition(
-      new PhysicalPosition(
-          w - winSize.width + monitorInfo.left_top.x,
-          h - winSize.height + monitorInfo.left_top.y),
-    );
-    console.log(await window.outerPosition());
-    console.log("send cookie " , cookie)
-    await window.emit("new_cookie_info", cookie);
-  }
+            let size = monitorInfo.work_space;
+            let window: WebviewWindow = getAll().find((window: WebviewWindow) => window.label == "notification",);
+            let winSize = await window.outerSize();
+            console.log(winSize, size);
+            let w = size?.width ?? 1920;
+            let h = size?.height ?? 1080;
+            console.log(w, h);
+            await window.setPosition(new PhysicalPosition(w - winSize.width + monitorInfo.left_top.x, h - winSize.height + monitorInfo.left_top.y),);
+            console.log(await window.outerPosition());
+            console.log("send cookie ", cookie)
+            await window.emit("new_cookie_info", cookie);
+        }else if (await notification.needBeep()){
+          await this.messageBeep()
+        }
+    }
 
-  async copy(param: { data: string; type: string }) {
-    await copyInfo(param);
-  }
+    async copy(param: { data: string; type: string }) {
+        await copyInfo(param);
+    }
 
-  async openUrlInBrowser(url: string) {
-    await openUrlInUserBrowser(url);
-  }
+    async openUrlInBrowser(url: string) {
+        await openUrlInUserBrowser(url);
+    }
 
-  async minus() {
-    let window = appWindow;
-    await window.minimize();
-  }
+    async minus() {
+        let window = appWindow;
+        await window.minimize();
+    }
 
-  async maximize() {
-    await appWindow.toggleMaximize();
-  }
+    async maximize() {
+        await appWindow.toggleMaximize();
+    }
 
-  async close() {
-    await appWindow.hide();
-  }
-  async exit() {
-    await invoke("quit")
-  }
+    async close() {
+        await appWindow.hide();
+    }
 
-  async bootSetting(isBoot: boolean) {
-    return await bootStartSetting(isBoot);
-  }
+    async exit() {
+        await invoke("quit")
+    }
 
-  async getBootSetting() {
-    return await getBootStartSetting();
-  }
+    async bootSetting(isBoot: boolean) {
+        return await bootStartSetting(isBoot);
+    }
 
-  async messageBeep(){
-    await invoke("message_beep")
-  }
+    async getBootSetting() {
+        return await getBootStartSetting();
+    }
 
-  async hideNotifyIcon(){
-    await invoke("hide_notification")
-  }
+    async messageBeep() {
+        await invoke("message_beep")
+    }
+
+    async hideNotifyIcon() {
+        await invoke("hide_notification")
+    }
 }
 
 const operate = new Operate();
diff --git a/src/components/SettingItem/SettingItem.vue b/src/components/SettingItem/SettingItem.vue
new file mode 100644
index 00000000..acc359fd
--- /dev/null
+++ b/src/components/SettingItem/SettingItem.vue
@@ -0,0 +1,43 @@
+<script lang="ts" setup>
+
+import {ref} from "vue";
+
+const property = defineProps<{
+  title?: string,
+  subTitle?: string,
+}>()
+
+const color = ref("#ffba4b")
+</script>
+
+<template>
+  <v-card-item>
+    <div class="d-flex justify-space-between align-center w-100 pa-3">
+      <slot name="fill-action" :color=color>
+        <div>
+          <v-card-title>
+            <slot name="title">
+
+              {{ property.title }}
+            </slot>
+          </v-card-title>
+          <v-card-subtitle>
+            <slot class="" name="sub-title">
+
+              {{ property.subTitle }}
+            </slot>
+          </v-card-subtitle>
+        </div>
+        <div>
+          <slot id="action-slot" name="action" :color=color>
+            <v-checkbox></v-checkbox>
+          </slot>
+        </div>
+      </slot>
+    </div>
+  </v-card-item>
+</template>
+
+<style lang="scss" scoped>
+
+</style>
\ No newline at end of file
diff --git a/src/components/SettingPage.vue b/src/components/SettingPage.vue
index 09811b9d..cf9ac517 100644
--- a/src/components/SettingPage.vue
+++ b/src/components/SettingPage.vue
@@ -10,40 +10,50 @@
             @click="setting.close"
         ></v-btn>
       </v-toolbar>
-      <v-card-item>
-        <div class="d-flex justify-space-between align-center w-100">
-          <div>
-            <v-card-title>开机自启</v-card-title>
-            <v-card-subtitle>每次开机就能自动蹲饼呢~</v-card-subtitle>
-          </div>
-          <div>
-            <v-switch
-                v-model="setting.autoBoot"
-                color="#ffba4b"
-                @change="setting.setAutoBoot"
-            ></v-switch>
-          </div>
-        </div>
-      </v-card-item>
-      <v-card-item>
-        <div class="d-flex justify-space-between align-center w-100">
-          <div>
-            <v-card-title>版本</v-card-title>
-            <v-card-subtitle>当前版本 {{ setting.currentVersion }}</v-card-subtitle>
-          </div>
-          <div>
-            <v-btn color="#ffba4b" @click="setting.checkUpdate"
-            >检查更新
-            </v-btn
-            >
-<!--test send notification        -->
-            <v-btn
-                @click="sen_d">
-              弹窗
-            </v-btn>
-          </div>
-        </div>
-      </v-card-item>
+      <SettingItem sub-title="每次开机就能自动蹲饼呢~" title="开机自启">
+        <template v-slot:action="{color}">
+          <v-switch
+              v-model="setting.autoBoot"
+              :color=color
+              @change="setting.setAutoBoot"
+          >
+          </v-switch>
+        </template>
+
+      </SettingItem>
+      <SettingItem title="版本">
+        <template v-slot:sub-title>
+          当前版本 {{ setting.currentVersion }}
+        </template>
+        <template v-slot:action="{color}">
+          <v-btn :color="color" @click="setting.checkUpdate"
+          >检查更新
+          </v-btn
+          >
+        </template>
+      </SettingItem>
+      <SettingItem
+          title="测试弹窗"
+      >
+        <template v-slot:action>
+          <v-btn @click="sen_d">
+            弹窗
+          </v-btn>
+        </template>
+      </SettingItem>
+      <SettingItem>
+        <template v-slot:fill-action>
+          <v-select v-model="setting.notify_mode" :items="allNotifyMode"
+                    label="通知设置"
+                    item-title="value"
+                    item-value="idx"
+                    variant="outlined"
+                    @update:model-value="setting.setNotifyMode()"
+          >
+          </v-select>
+        </template>
+
+      </SettingItem>
     </v-card>
     <v-snackbar v-model="showDownload">
       检测到了新版本，即将跳转到下载网页
@@ -55,22 +65,25 @@
 </template>
 
 <script lang="ts" name="setting" setup>
-import {computed, onMounted, reactive, ref} from "vue";
-import updater from "../api/operations/updater";
+import {computed, onMounted, PropType, reactive, ref} from "vue";
 import operate from "../api/operations/operate";
-import {getVersion} from "../api/resourceFetcher/version";
-import {app, notification} from "@tauri-apps/api";
-import {P} from "@tauri-apps/api/event-41a9edf5";
+import SettingItem from "@/components/SettingItem/SettingItem.vue";
+import notification, {allNotifyMode, NotifyMode} from "@/api/operations/notification";
 
 const emits = defineEmits({
   close: null,
   checkUpdate: null,
 });
+const currentVersion = computed(() => {
+  return `当前版本 ${setting.currentVersion}`
+})
+
 enum versionStateType {
   Newest = "Newest",
   UpdateAvailable = "UpdateAvailable",
   Unknown = "Unknown",
 }
+
 const props = defineProps({
   versionState: {
     type: String as PropType<versionStateType>,
@@ -82,7 +95,7 @@ const sen_d = () => {
   operate.openNotificationWindow({
     datasource: 'kkwd',
     default_cookie: {
-      images: [{compress_url:null,origin_url: 'https://i0.hdslb.com/bfs/new_dyn/2956e376fb056cf79cc95bcf585dbbc0161775300.jpg'}],
+      images: [{compress_url: null, origin_url: 'https://i0.hdslb.com/bfs/new_dyn/2956e376fb056cf79cc95bcf585dbbc0161775300.jpg'}],
       text: '欸嘿嘿，桃金娘的脚小小的~香香的~.'
     },
     icon: '/assets/icon/anime.png',
@@ -102,7 +115,20 @@ const setting = reactive<{
   // quit 
   close: () => void,
   checkUpdate: () => void
+  // notification
+  notify_mode: string,
+  initNotifyMode:()=>void
+  setNotifyMode:()=>void
 }>({
+  notify_mode: NotifyMode.PopUpAndBeep.idx,
+  initNotifyMode:()=>{
+    notification.getNotificationMode()
+        .then((v)=> setting.notify_mode=v.idx)
+  } ,
+  setNotifyMode:()=>{
+
+    notification.setNotificationMode(setting.notify_mode)
+  },
   autoBoot: false,
   setAutoBoot() {
     operate.bootSetting(setting.autoBoot).then(() => {
@@ -124,6 +150,7 @@ const setting = reactive<{
 
 onMounted(async () => {
   setting.initAutoBoot();
+  setting.initNotifyMode();
 });
 </script>
 
diff --git a/src/view/Notification.vue b/src/view/Notification.vue
index a38290ca..177d296c 100644
--- a/src/view/Notification.vue
+++ b/src/view/Notification.vue
@@ -2,15 +2,15 @@
   <div class="notification ">
     <v-card>
       <v-img
-        height="190"
-        :src="info.imgUrl"
-        :cover="info.setImg"
-        class="text-white"
-        @click="closeThis"
+          :cover="info.setImg"
+          :src="info.imgUrl"
+          class="text-white"
+          height="190"
+          @click="closeThis"
       >
         <v-toolbar color="rgba(0, 0, 0, 0)" theme="dark">
           <template #append>
-            <v-btn size="small" icon="fas fa-circle-xmark"></v-btn>
+            <v-btn icon="fas fa-circle-xmark" size="small"></v-btn>
           </template>
         </v-toolbar>
       </v-img>
@@ -34,7 +34,7 @@ import operate from "@/api/operations/operate";
 import {appWindow} from "@tauri-apps/api/window";
 
 const info = ref({
-  setImg:false,
+  setImg: false,
   imgUrl: getImage("/assets/image/logo/icon.png"),
   dataSource: "",
   cookieTime: "",
@@ -51,7 +51,7 @@ const updatePageData = (newData: Cookie) => {
 
   let images = newData.default_cookie.images;
   if (images) {
-    info.value.setImg=true;
+    info.value.setImg = true;
     if (newData.datasource.includes("微博")) {
       ceobeRequest
           .getHasRefererImageBase64(images[0].origin_url)
@@ -64,29 +64,32 @@ const updatePageData = (newData: Cookie) => {
     }
   } else {
     console.log("no image");
-    info.value.imgUrl=getImage("/assets/image/logo/icon.png")
-    info.value.setImg=false;
+    info.value.imgUrl = getImage("/assets/image/logo/icon.png")
+    info.value.setImg = false;
   }
 
 
 };
 let unliten: UnlistenFn;
 onMounted(() => {
-  notification.getInfo((_, data) => {
-    operate.hideNotifyIcon()
-    console.log("get Info: " ,data)
+  notification.getInfo(async (_, data) => {
+    await operate.hideNotifyIcon()
+    console.log("get Info: ", data)
     updatePageData(data);
-    appWindow.show()
-    operate.messageBeep()
+    await appWindow.show()
+    if (await notification.needBeep()) {
+
+      await operate.messageBeep()
+    }
   }).then((closer) => {
     unliten = closer
   });
 })
 
 onUnmounted(() => {
-if (unliten){
-  unliten()
-}
+  if (unliten) {
+    unliten()
+  }
 })
 
 function closeThis() {

From 1c8e8dce86ff4b1000811be50189cf31c4190d65 Mon Sep 17 00:00:00 2001
From: ForzenString <964413011@qq.com>
Date: Sat, 9 Sep 2023 21:21:19 +0800
Subject: [PATCH 13/34] =?UTF-8?q?:bug:=20=E4=BF=AE=E5=A4=8D=E6=84=8F?=
 =?UTF-8?q?=E5=A4=96=E5=88=A0=E9=99=A4=E7=9A=84=E7=89=88=E6=9C=AC=E5=8F=B7?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/SettingItem/SettingItem.vue |  3 ++-
 src/components/SettingPage.vue             | 12 +++++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/components/SettingItem/SettingItem.vue b/src/components/SettingItem/SettingItem.vue
index acc359fd..8620e965 100644
--- a/src/components/SettingItem/SettingItem.vue
+++ b/src/components/SettingItem/SettingItem.vue
@@ -12,7 +12,7 @@ const color = ref("#ffba4b")
 
 <template>
   <v-card-item>
-    <div class="d-flex justify-space-between align-center w-100 pa-3">
+    <div class="d-flex justify-space-between align-center w-100 pb-2 pr-3 pt-2">
       <slot name="fill-action" :color=color>
         <div>
           <v-card-title>
@@ -36,6 +36,7 @@ const color = ref("#ffba4b")
       </slot>
     </div>
   </v-card-item>
+  <v-divider/>
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/components/SettingPage.vue b/src/components/SettingPage.vue
index cf9ac517..53bc9d37 100644
--- a/src/components/SettingPage.vue
+++ b/src/components/SettingPage.vue
@@ -2,7 +2,8 @@
   <div class="setting">
     <v-card>
       <v-toolbar color="#e6a23c">
-        <v-toolbar-title>设置</v-toolbar-title>
+
+        <v-toolbar-title >设置</v-toolbar-title>
         <v-spacer></v-spacer>
         <v-btn
             icon="fa-solid fa-xmark"
@@ -69,6 +70,7 @@ import {computed, onMounted, PropType, reactive, ref} from "vue";
 import operate from "../api/operations/operate";
 import SettingItem from "@/components/SettingItem/SettingItem.vue";
 import notification, {allNotifyMode, NotifyMode} from "@/api/operations/notification";
+import {app} from "@tauri-apps/api";
 
 const emits = defineEmits({
   close: null,
@@ -119,7 +121,14 @@ const setting = reactive<{
   notify_mode: string,
   initNotifyMode:()=>void
   setNotifyMode:()=>void
+  //version
+  currentVersion:string,
+  getAppVersion:()=>void
 }>({
+  currentVersion:"",
+  getAppVersion:()=>{
+    app.getVersion().then((version)=>{setting.currentVersion = version})
+  },
   notify_mode: NotifyMode.PopUpAndBeep.idx,
   initNotifyMode:()=>{
     notification.getNotificationMode()
@@ -151,6 +160,7 @@ const setting = reactive<{
 onMounted(async () => {
   setting.initAutoBoot();
   setting.initNotifyMode();
+  setting.getAppVersion();
 });
 </script>
 

From 938124f340893a0a9c5d1d2f0066a868eddbb592 Mon Sep 17 00:00:00 2001
From: ForzenString <964413011@qq.com>
Date: Sat, 9 Sep 2023 21:41:21 +0800
Subject: [PATCH 14/34] =?UTF-8?q?:sparkles:=20=E6=B7=BB=E5=8A=A0tips?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/operations/notification.ts | 10 +++----
 src/components/SettingPage.vue     | 44 +++++++++++++++---------------
 2 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/src/api/operations/notification.ts b/src/api/operations/notification.ts
index 443187b4..5d8365ec 100644
--- a/src/api/operations/notification.ts
+++ b/src/api/operations/notification.ts
@@ -28,7 +28,7 @@ class NotificationOperate {
         await storage.setItem("setting.notify", modeIdx);
     }
 
-    async getNotificationMode(): Promise<{ idx: number, value: string }> {
+    async getNotificationMode(): Promise<{ idx: number, value: string ,tip:string}> {
         const idx = await storage.getItem<number>("setting.notify") ?? NotifyMode.PopUpAndBeep.idx
         return allNotifyMode.find((mode)=>mode.idx==idx)!!
     }
@@ -45,13 +45,13 @@ class NotificationOperate {
 
 export const NotifyMode = Object.freeze({
     PopUpOnly: {
-        idx: 0, value: "仅弹窗"
+        idx: 0, value: "仅弹窗",tip:"当发现新饼后只会出现右下角弹窗"
     }, BeepOnly: {
-        idx: 1, value: "仅提示音"
+        idx: 1, value: "仅提示音",tip:"当发现新饼后只会发出提示音"
     }, PopUpAndBeep: {
-        idx: 2, value: "弹窗且提示音"
+        idx: 2, value: "弹窗且提示音",tip:"当发现新饼后不但出现右下角弹窗，同时发出提示音"
     }, None: {
-        idx: 3, value: "无"
+        idx: 3, value: "无",tip:"当发现新饼后无任何行为"
     },
 })
 export const allNotifyMode = [NotifyMode.PopUpAndBeep, NotifyMode.BeepOnly, NotifyMode.PopUpOnly, NotifyMode.None]
diff --git a/src/components/SettingPage.vue b/src/components/SettingPage.vue
index 53bc9d37..a85a742b 100644
--- a/src/components/SettingPage.vue
+++ b/src/components/SettingPage.vue
@@ -3,7 +3,7 @@
     <v-card>
       <v-toolbar color="#e6a23c">
 
-        <v-toolbar-title >设置</v-toolbar-title>
+        <v-toolbar-title>设置</v-toolbar-title>
         <v-spacer></v-spacer>
         <v-btn
             icon="fa-solid fa-xmark"
@@ -44,11 +44,12 @@
       </SettingItem>
       <SettingItem>
         <template v-slot:fill-action>
-          <v-select v-model="setting.notify_mode" :items="allNotifyMode"
-                    label="通知设置"
+          <v-select v-model="setting.notify_mode" :hint='setting.notify_mode.tip'
+                    :items="allNotifyMode"
                     item-title="value"
-                    item-value="idx"
-                    variant="outlined"
+                    persistent-hint
+                    return-object
+                    label="通知设置"
                     @update:model-value="setting.setNotifyMode()"
           >
           </v-select>
@@ -76,9 +77,6 @@ const emits = defineEmits({
   close: null,
   checkUpdate: null,
 });
-const currentVersion = computed(() => {
-  return `当前版本 ${setting.currentVersion}`
-})
 
 enum versionStateType {
   Newest = "Newest",
@@ -118,25 +116,27 @@ const setting = reactive<{
   close: () => void,
   checkUpdate: () => void
   // notification
-  notify_mode: string,
-  initNotifyMode:()=>void
-  setNotifyMode:()=>void
+  notify_mode: { idx: string, tip: string, value: string },
+  initNotifyMode: () => void
+  setNotifyMode: () => void
   //version
-  currentVersion:string,
-  getAppVersion:()=>void
+  currentVersion: string,
+  getAppVersion: () => void
 }>({
-  currentVersion:"",
-  getAppVersion:()=>{
-    app.getVersion().then((version)=>{setting.currentVersion = version})
+  currentVersion: "",
+  getAppVersion: () => {
+    app.getVersion().then((version) => {
+      setting.currentVersion = version
+    })
   },
-  notify_mode: NotifyMode.PopUpAndBeep.idx,
-  initNotifyMode:()=>{
+  notify_mode: NotifyMode.PopUpAndBeep,
+  initNotifyMode: () => {
     notification.getNotificationMode()
-        .then((v)=> setting.notify_mode=v.idx)
-  } ,
-  setNotifyMode:()=>{
+        .then((v) => setting.notify_mode = v)
+  },
+  setNotifyMode: () => {
 
-    notification.setNotificationMode(setting.notify_mode)
+    notification.setNotificationMode(setting.notify_mode.idx)
   },
   autoBoot: false,
   setAutoBoot() {

From a59023881abc4bf67768d18ca3bf0412e514b497 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=87=8A=E5=BC=A6=E5=87=9D=E7=BB=9D?=
 <42119608+Goodjooy@users.noreply.github.com>
Date: Sat, 9 Sep 2023 22:06:54 +0800
Subject: [PATCH 15/34] Update package.json

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 4dd15566..6e5e6179 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ceobe-canteen-electron",
-  "version": "0.1.8",
+  "version": "0.1.9",
   "private": true,
   "description": "帮小刻找好多好吃的饼",
   "author": "CeobeCanteen",

From d5ab604b28732ec969ceba38f28424415ccd9578 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=87=8A=E5=BC=A6=E5=87=9D=E7=BB=9D?=
 <42119608+Goodjooy@users.noreply.github.com>
Date: Sat, 9 Sep 2023 22:07:27 +0800
Subject: [PATCH 16/34] Update tauri.conf.json

---
 src-tauri/tauri.conf.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
index f345eaf7..dcbf8dbe 100644
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -9,7 +9,7 @@
   },
   "package": {
     "productName": "小刻食堂",
-    "version": "0.1.8"
+    "version": "0.1.9"
   },
   "tauri": {
     "systemTray": {

From d3852a1994b5d0bb879ded0be6b681fba6740a31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=87=8A=E5=BC=A6=E5=87=9D=E7=BB=9D?=
 <42119608+Goodjooy@users.noreply.github.com>
Date: Sat, 9 Sep 2023 22:07:44 +0800
Subject: [PATCH 17/34] Update Cargo.toml

---
 src-tauri/Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index 63b1261d..3088dae2 100644
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ceobe-canteen-desktop"
-version = "0.1.8"
+version = "0.1.9"
 description = "小刻食堂的桌面端，恭喜你电脑有多了个和小刻一样喜欢吃东西的浏览器内核 "
 authors = ["FrozenString<frozenstringstable@gmail.com>"]
 license="AGPL-3"

From df4bbe24004f62f4c9c511ec1c316a4fc78369c3 Mon Sep 17 00:00:00 2001
From: ForzenString <964413011@qq.com>
Date: Sat, 9 Sep 2023 22:25:15 +0800
Subject: [PATCH 18/34] =?UTF-8?q?:lipstick:=20=E4=BF=AE=E5=A4=8D=E9=9D=9Ew?=
 =?UTF-8?q?indows=20=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src-tauri/src/commands/monitor_info.rs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src-tauri/src/commands/monitor_info.rs b/src-tauri/src/commands/monitor_info.rs
index 3b115eb7..7f986880 100644
--- a/src-tauri/src/commands/monitor_info.rs
+++ b/src-tauri/src/commands/monitor_info.rs
@@ -12,7 +12,6 @@ pub struct MonitorInfo {
 pub fn get_monitor_info(window: Window) -> tauri::Result<MonitorInfo> {
     #[cfg(not(windows))]
     {
-        let window = _window;
         let monitor = window
             .primary_monitor()?
             .expect("Cannot found Primary Monitor");

From 84683267237d8cde6ba6e0c0141857a3127ecbb5 Mon Sep 17 00:00:00 2001
From: phidiaLam <2957035701@qq.com>
Date: Sun, 10 Sep 2023 01:35:54 +0800
Subject: [PATCH 19/34] =?UTF-8?q?=F0=9F=90=9B=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=98=BE=E7=A4=BA=E4=B8=8E=E5=88=B7=E6=96=B0?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/operations/newestTimeline.ts |  2 +-
 src/utils/backgroundUtil.ts          |  3 +++
 src/view/home/TimeLine.vue           | 12 ++++++++----
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/api/operations/newestTimeline.ts b/src/api/operations/newestTimeline.ts
index ab383cce..a246196e 100644
--- a/src/api/operations/newestTimeline.ts
+++ b/src/api/operations/newestTimeline.ts
@@ -9,7 +9,7 @@ import { Cookie, CookieList } from "../resourceFetcher/cookieList";
 
 export interface TimelineData extends CookieList {
   comb_id: string;
-  update_cookie_id: string;
+  update_cookie_id: string | null;
 }
 
 class NewestTimeline {
diff --git a/src/utils/backgroundUtil.ts b/src/utils/backgroundUtil.ts
index bfe3f65d..1282094a 100644
--- a/src/utils/backgroundUtil.ts
+++ b/src/utils/backgroundUtil.ts
@@ -125,6 +125,9 @@ export class BackgroundRunner {
       }
       this.timeline = cookies_info;
       await newestTimeline.sendTimeline(cookies_info);
+    } else if (cookie_id == null) {
+      let cookies_info: TimelineData = {cookies:[], next_page_id: null, comb_id:this.datasource_comb_id, update_cookie_id: null};
+      await newestTimeline.sendTimeline(cookies_info);
     }
 
     this.timeoutId = setTimeout(async () => {
diff --git a/src/view/home/TimeLine.vue b/src/view/home/TimeLine.vue
index 8a78c3a8..7169ae23 100644
--- a/src/view/home/TimeLine.vue
+++ b/src/view/home/TimeLine.vue
@@ -4,8 +4,7 @@
       <v-btn
         :class="
           scroll.scrollShow &&
-          timeline.refreshTimelineData &&
-          timeline.refreshTimelineData?.length !== 0
+          timeline.refreshTimelineData
             ? 'refresh-btn-show'
             : ''
         "
@@ -198,8 +197,7 @@ async function getData() {
 
 function refreshTimeline() {
   if (
-    !timeline.refreshTimelineData ||
-    timeline.refreshTimelineData.length == 0
+    !timeline.refreshTimelineData
   ) {
     return;
   }
@@ -297,6 +295,12 @@ const scroll = reactive({
     }
     scroll.scrollShow = e.target.scrollTop > 600;
 
+    // 如果有数据，向上滚动小于600过程自动刷新
+    if (!scroll.scrollShow &&
+        timeline.refreshTimelineData != null) {
+          refreshTimeline();
+    }
+
     // 因为有些情况会导致高度不能正好相等，给个差值小于5来扩大判断范围
     if (
       Math.abs(

From 219f367b821234fde78ef85fc7108227a2e288d9 Mon Sep 17 00:00:00 2001
From: ForzenString <964413011@qq.com>
Date: Thu, 14 Sep 2023 23:30:27 +0800
Subject: [PATCH 20/34] :bookmark: release 1.0

---
 README.md                          | 2 +-
 package.json                       | 2 +-
 src-tauri/Cargo.lock               | 2 +-
 src-tauri/Cargo.toml               | 7 ++++++-
 src-tauri/src/commands/is_debug.rs | 6 ++++++
 src-tauri/src/commands/mod.rs      | 2 ++
 src-tauri/src/main.rs              | 4 ++--
 src-tauri/tauri.conf.json          | 8 +++++---
 src/components/SettingPage.vue     | 9 +++++++--
 9 files changed, 31 insertions(+), 11 deletions(-)
 create mode 100644 src-tauri/src/commands/is_debug.rs

diff --git a/README.md b/README.md
index 11a42455..6a9902d9 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 <div align="center">
 
-[![LOGO](src-tauri/icons/128x128.png)](https://www.ceobecanteen.top/#/)
+[![LOGO](src-tauri/icons/128x128.png)](https://www.ceobecanteen.top/#about-us)
 
 帮小刻找好多好吃的饼
 
diff --git a/package.json b/package.json
index 4dd15566..30d797c2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ceobe-canteen-electron",
-  "version": "0.1.8",
+  "version": "1.0.0",
   "private": true,
   "description": "帮小刻找好多好吃的饼",
   "author": "CeobeCanteen",
diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
index cf0c8adc..ef75eecf 100644
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -465,7 +465,7 @@ dependencies = [
 
 [[package]]
 name = "ceobe-canteen-desktop"
-version = "0.1.8"
+version = "1.0.0"
 dependencies = [
  "arboard",
  "auto-launch",
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index 63b1261d..0b8aafcc 100644
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ceobe-canteen-desktop"
-version = "0.1.8"
+version = "1.0.0"
 description = "小刻食堂的桌面端，恭喜你电脑有多了个和小刻一样喜欢吃东西的浏览器内核 "
 authors = ["FrozenString<frozenstringstable@gmail.com>"]
 license="AGPL-3"
@@ -60,3 +60,8 @@ features = ["Data_Xml_Dom",
 # If you use cargo directly instead of tauri's cli you can use this feature flag to switch between tauri's `dev` and `build` modes.
 # DO NOT REMOVE!!
 custom-protocol = ["tauri/custom-protocol"]
+
+[profile.release]
+opt-level="s"
+strip = true
+lto = true
diff --git a/src-tauri/src/commands/is_debug.rs b/src-tauri/src/commands/is_debug.rs
new file mode 100644
index 00000000..fcad80fd
--- /dev/null
+++ b/src-tauri/src/commands/is_debug.rs
@@ -0,0 +1,6 @@
+use tauri::command;
+
+#[command]
+pub fn is_debug()->bool{
+    cfg!(debug_assertions)
+}
\ No newline at end of file
diff --git a/src-tauri/src/commands/mod.rs b/src-tauri/src/commands/mod.rs
index 5284d188..94e66799 100644
--- a/src-tauri/src/commands/mod.rs
+++ b/src-tauri/src/commands/mod.rs
@@ -9,6 +9,7 @@ mod quit;
 mod request_client;
 mod request_refer_image;
 mod update_available;
+mod is_debug;
 
 pub use self::auto_launch::{auto_launch_setting, set_auto_launch};
 pub use clipboard::copy_image;
@@ -20,3 +21,4 @@ pub use preview_page::{back_preview, read_detail};
 pub use quit::quit;
 pub use request_client::send_request;
 pub use request_refer_image::request_refer_image;
+pub use is_debug::is_debug;
\ No newline at end of file
diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
index 5b5ded40..e53e0d61 100644
--- a/src-tauri/src/main.rs
+++ b/src-tauri/src/main.rs
@@ -15,7 +15,7 @@ use tauri::{generate_context, Builder, Context, Manager, WindowEvent};
 use crate::commands::{
     auto_launch_setting, back_preview, copy_image, front_logger, get_item, get_monitor_info,
     hide_notification, message_beep, quit, read_detail, request_refer_image, send_request,
-    set_auto_launch, set_item,
+    set_auto_launch, set_item,is_debug
 };
 use crate::setup::logger::init_logger;
 use crate::setup::system_tray::new_system_tray;
@@ -65,7 +65,7 @@ fn main() {
                 front_logger,
                 get_monitor_info,
                 message_beep,
-                hide_notification
+                hide_notification,is_debug
             ]);
 
         let app = builder
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
index f345eaf7..da4b3dc8 100644
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -9,7 +9,7 @@
   },
   "package": {
     "productName": "小刻食堂",
-    "version": "0.1.8"
+    "version": "1.0.0"
   },
   "tauri": {
     "systemTray": {
@@ -116,10 +116,12 @@
         "decorations": false,
         "fullscreen": false,
         "label": "main",
-        "height": 600,
+        "height": 640,
         "resizable": true,
         "title": "小刻食堂",
-        "width": 1200
+        "width": 1280,
+        "minWidth": 1280,
+        "minHeight": 640
       },
       {
         "label": "background",
diff --git a/src/components/SettingPage.vue b/src/components/SettingPage.vue
index a85a742b..54b927bb 100644
--- a/src/components/SettingPage.vue
+++ b/src/components/SettingPage.vue
@@ -33,7 +33,7 @@
           >
         </template>
       </SettingItem>
-      <SettingItem
+      <SettingItem v-if="!isDebug"
           title="测试弹窗"
       >
         <template v-slot:action>
@@ -71,7 +71,7 @@ import {computed, onMounted, PropType, reactive, ref} from "vue";
 import operate from "../api/operations/operate";
 import SettingItem from "@/components/SettingItem/SettingItem.vue";
 import notification, {allNotifyMode, NotifyMode} from "@/api/operations/notification";
-import {app} from "@tauri-apps/api";
+import {app, invoke} from "@tauri-apps/api";
 
 const emits = defineEmits({
   close: null,
@@ -90,6 +90,11 @@ const props = defineProps({
     default: () => "Unknown"
   },
 });
+
+const isDebug = computed(()=>{
+  return invoke("is_debug")
+})
+
 // test send notification
 const sen_d = () => {
   operate.openNotificationWindow({

From 483a4b3d57ebbbf366b88f873414e09a3e8eb9ce Mon Sep 17 00:00:00 2001
From: ForzenString <964413011@qq.com>
Date: Thu, 14 Sep 2023 23:42:15 +0800
Subject: [PATCH 21/34] =?UTF-8?q?:recycle:=20=E8=B0=83=E6=95=B4=E5=A4=96?=
 =?UTF-8?q?=E9=93=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                     | 2 +-
 src/view/home/InfoAndTool.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 6a9902d9..43869a70 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 <div align="center">
 
-[![LOGO](src-tauri/icons/128x128.png)](https://www.ceobecanteen.top/#about-us)
+[![LOGO](src-tauri/icons/128x128.png)](https://ceobecanteen.top/)
 
 帮小刻找好多好吃的饼
 
diff --git a/src/view/home/InfoAndTool.vue b/src/view/home/InfoAndTool.vue
index 6f084ea2..cc9531a5 100644
--- a/src/view/home/InfoAndTool.vue
+++ b/src/view/home/InfoAndTool.vue
@@ -20,7 +20,7 @@
         class="pl-0"
         variant="plain"
         density="compact"
-        @click="openUrlInBrowser('https://www.ceobecanteen.top/#/')"
+        @click="openUrlInBrowser('https://www.ceobecanteen.top/#about-us')"
         >CeobeCanteen</v-btn
       >
     </div>

From d1bc7368c94837c1bda7c145dd9bc38540b2b7a6 Mon Sep 17 00:00:00 2001
From: ForzenString <964413011@qq.com>
Date: Wed, 20 Sep 2023 07:54:21 +0800
Subject: [PATCH 22/34] =?UTF-8?q?:recycle:=20=E8=B0=83=E6=95=B4=E9=9D=99?=
 =?UTF-8?q?=E9=BB=98=E5=AE=89=E8=A3=85=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src-tauri/tauri.conf.json | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
index da4b3dc8..c79de750 100644
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -86,9 +86,11 @@
         "nsis"
       ],
       "windows": {
-        "certificateThumbprint": null,
+        "webviewInstallMode": {
+          "type": "embedBootstrapper",
+          "silent": true
+        },
         "digestAlgorithm": "sha256",
-        "timestampUrl": "",
         "nsis": {
           "headerImage": "assets/installer-header.bmp",
           "sidebarImage": "assets/installer-side.bmp",

From 6c081d066cce9c8fc2de1963111b111a13037de9 Mon Sep 17 00:00:00 2001
From: ForzenString <964413011@qq.com>
Date: Wed, 20 Sep 2023 07:58:19 +0800
Subject: [PATCH 23/34] :bookmark: update to 1.0.1

---
 package.json              | 2 +-
 src-tauri/Cargo.toml      | 2 +-
 src-tauri/tauri.conf.json | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 30d797c2..138baf71 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ceobe-canteen-electron",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "private": true,
   "description": "帮小刻找好多好吃的饼",
   "author": "CeobeCanteen",
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index 0b8aafcc..fb113d5a 100644
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ceobe-canteen-desktop"
-version = "1.0.0"
+version = "1.0.1"
 description = "小刻食堂的桌面端，恭喜你电脑有多了个和小刻一样喜欢吃东西的浏览器内核 "
 authors = ["FrozenString<frozenstringstable@gmail.com>"]
 license="AGPL-3"
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
index c79de750..accec916 100644
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -9,7 +9,7 @@
   },
   "package": {
     "productName": "小刻食堂",
-    "version": "1.0.0"
+    "version": "1.0.1"
   },
   "tauri": {
     "systemTray": {
@@ -69,7 +69,7 @@
         "icons/icon.ico"
       ],
       "identifier": "com.ceobe-canteen.desktop",
-      "longDescription": "",
+      "longDescription": "自由的兔兔把烙好的饼到处藏，就由小刻把它们都找出来吧！",
       "macOS": {
         "entitlements": null,
         "exceptionDomain": "",
@@ -77,7 +77,7 @@
         "providerShortName": null,
         "signingIdentity": null
       },
-      "shortDescription": "",
+      "shortDescription": "帮小刻找好多好吃的饼",
       "targets": [
         "deb",
         "dmg",

From ef7484664bb6cf9a915c743a12f65f04deb29b44 Mon Sep 17 00:00:00 2001
From: ForzenString <964413011@qq.com>
Date: Thu, 28 Sep 2023 16:50:44 +0800
Subject: [PATCH 24/34] :wrench: add user license on installation page

---
 src-tauri/assets/user-license.txt | 30 ++++++++++++++++++++++++++++++
 src-tauri/tauri.conf.json         | 14 +++++---------
 2 files changed, 35 insertions(+), 9 deletions(-)
 create mode 100644 src-tauri/assets/user-license.txt

diff --git a/src-tauri/assets/user-license.txt b/src-tauri/assets/user-license.txt
new file mode 100644
index 00000000..e718e34d
--- /dev/null
+++ b/src-tauri/assets/user-license.txt
@@ -0,0 +1,30 @@
+《产品声明》
+本产品为非商业化产品，除捐助用于服务器运行资金外无任何收益。
+
+本产品仅供学习交流使用。
+
+本产品相关内容（文字、图片、音视频等）均来源于/转自第三方，平台转载相关内容不视为对于相关内容、观点的认可，亦不视为对于相关内容的真实性、准确性、完整性、合法性做出任何承诺。相关内容的真实合法性由内容发布者自行承担，本平台不承担相关法律责任。本平台已明确提示内容来源，如相关内容侵犯了您的合法权益，您亦需联系发布源进行处理。
+
+来自于第三方网站的链接，系由平台根据您的搜索需求或为向您提供便利而提供或设置，外部链接指向的不由本平台实际控制的任何网页上的内容，本平台不承担任何责任。您可能从该第三方网站上获得资讯及享用服务，本平台网无法控制第三方提供的内容、服务的质量、安全或合法性、信息的真实性或准确性。您应自行谨慎判断确定，并自行承担因此产生的责任与损失。除非本平台另有明确规定，若您对于第三方网站或链接有任何异议，您应联系第三方网站的内容或链接提供者处理。
+
+如若侵犯第三方权益，请您及时与我们联系，我们将立刻整改。
+
+
+《用户守则》
+欢迎使用由小刻食堂开发团队（以下简称「开发组」）开发的「小刻食堂」系列。在您使用本框架之前，请仔细阅读并完全理解本声明。一旦您开始使用小刻食堂，即表示您同意遵守本声明中的所有条款和条件。
+
+1. 使用目的： 小刻食堂是一个免费开源的软件项目，旨在为用户提供抓取B站、微博、明日方舟通讯组等API数据的功能，并提供多种实用功能，如实时饼消息通知、快速跳转链接、饼内容分享、详细内容查看、饼内容图片生成、理智回复时间计算等。
+
+2. 合法合理使用： 您承诺以合法、合理的方式使用小刻食堂，不得将其用于任何违法、侵权或其他恶意行为，也不得将其应用于违反当地法律法规的Web平台。
+
+3. 免责声明： 开发组对于因使用小刻食堂而引起的任何意外、疏忽、合同损害、诽谤、版权或知识产权侵权以及由此产生的损失（包括但不限于直接、间接、附带或衍生的损失等）不承担任何法律责任。
+
+4. 风险承担： 用户明确同意，使用小刻食堂所存在的风险和后果将完全由用户自行承担，开发组不承担任何法律责任。
+
+5. 合法发布和使用： 用户在遵守本声明的前提下，可在《MIT开源许可证》所允许的范围内合法地发布、传播和使用小刻食堂。对于因违反本声明或法律法规造成的法律责任（包括但不限于民事赔偿和刑事责任），将由违约者自行承担。
+
+6. 知识产权： 小刻食堂及其相关产品享有开发组的知识产权保护，包括但不限于商标权、专利权、著作权、商业秘密等，受相关法律法规保护。
+
+7. 条款变更： 开发组有权随时单方面修改本声明条款及附件内容，并通过消息推送、网页公告等方式进行公布。变更后的条款在公布后立即生效，用户继续使用即表示您已充分阅读、理解并接受修改后的声明内容。
+
+请在使用小刻食堂之前仔细阅读并理解本声明。如果您有任何疑问，请咨询相关法律专业人士。感谢您的合作与支持！
\ No newline at end of file
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
index f345eaf7..86266034 100644
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -69,15 +69,15 @@
         "icons/icon.ico"
       ],
       "identifier": "com.ceobe-canteen.desktop",
-      "longDescription": "",
+      "shortDescription": "小刻要好多好多饼",
+      "longDescription": "自由的兔兔把饼到处发，就由小刻把他们找粗来",
       "macOS": {
+        "license": "assets/user-license.txt",
         "entitlements": null,
-        "exceptionDomain": "",
         "frameworks": [],
         "providerShortName": null,
-        "signingIdentity": null
       },
-      "shortDescription": "",
+
       "targets": [
         "deb",
         "dmg",
@@ -90,6 +90,7 @@
         "digestAlgorithm": "sha256",
         "timestampUrl": "",
         "nsis": {
+          "license": "assets/user-license.txt",
           "headerImage": "assets/installer-header.bmp",
           "sidebarImage": "assets/installer-side.bmp",
           "installerIcon": "assets/installer-icon.ico",
@@ -97,11 +98,6 @@
           "languages": [
             "SimpChinese"
           ]
-        },
-        "wix": {
-          "language": "zh-CN",
-          "bannerPath": "assets/installer-banner.bmp",
-          "dialogImagePath": "assets/installer-dialog.bmp"
         }
       }
     },

From 8ae7c62a834441d19d3acc8c6e8c2acf9e4c055e Mon Sep 17 00:00:00 2001
From: ForzenString <964413011@qq.com>
Date: Thu, 28 Sep 2023 18:07:55 +0800
Subject: [PATCH 25/34] :bug: fix config syn

---
 src-tauri/tauri.conf.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
index 86266034..cb401988 100644
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -75,7 +75,7 @@
         "license": "assets/user-license.txt",
         "entitlements": null,
         "frameworks": [],
-        "providerShortName": null,
+        "providerShortName": null
       },
 
       "targets": [

From d4cd013e4f988b1cd9b60114c0f08a5927b768e4 Mon Sep 17 00:00:00 2001
From: ForzenString <964413011@qq.com>
Date: Thu, 28 Sep 2023 18:09:00 +0800
Subject: [PATCH 26/34] =?UTF-8?q?:sparkles:=20=E6=B7=BB=E5=8A=A0=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E5=AD=98=E5=82=A8=E6=96=87=E4=BB=B6=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src-tauri/src/commands/mod.rs               |  2 ++
 src-tauri/src/commands/resource_location.rs | 12 ++++++++++
 src-tauri/src/main.rs                       |  6 +++--
 src/api/operations/locationFetch.ts         | 25 +++++++++++++++++++++
 4 files changed, 43 insertions(+), 2 deletions(-)
 create mode 100644 src-tauri/src/commands/resource_location.rs
 create mode 100644 src/api/operations/locationFetch.ts

diff --git a/src-tauri/src/commands/mod.rs b/src-tauri/src/commands/mod.rs
index 5284d188..11c21ce0 100644
--- a/src-tauri/src/commands/mod.rs
+++ b/src-tauri/src/commands/mod.rs
@@ -9,6 +9,7 @@ mod quit;
 mod request_client;
 mod request_refer_image;
 mod update_available;
+mod resource_location;
 
 pub use self::auto_launch::{auto_launch_setting, set_auto_launch};
 pub use clipboard::copy_image;
@@ -20,3 +21,4 @@ pub use preview_page::{back_preview, read_detail};
 pub use quit::quit;
 pub use request_client::send_request;
 pub use request_refer_image::request_refer_image;
+pub use resource_location::{get_app_cache_path,get_app_config_path};
diff --git a/src-tauri/src/commands/resource_location.rs b/src-tauri/src/commands/resource_location.rs
new file mode 100644
index 00000000..5d012265
--- /dev/null
+++ b/src-tauri/src/commands/resource_location.rs
@@ -0,0 +1,12 @@
+use std::path::PathBuf;
+use tauri::{AppHandle, command};
+use crate::state::{get_cache_dir, get_config_dir};
+
+#[command]
+pub fn get_app_config_path(app:AppHandle)->PathBuf{
+    get_config_dir(app).to_owned()
+}
+#[command]
+pub fn get_app_cache_path(app:AppHandle)->PathBuf{
+    get_cache_dir(app).to_owned()
+}
\ No newline at end of file
diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
index 5b5ded40..1fe93b2a 100644
--- a/src-tauri/src/main.rs
+++ b/src-tauri/src/main.rs
@@ -15,7 +15,7 @@ use tauri::{generate_context, Builder, Context, Manager, WindowEvent};
 use crate::commands::{
     auto_launch_setting, back_preview, copy_image, front_logger, get_item, get_monitor_info,
     hide_notification, message_beep, quit, read_detail, request_refer_image, send_request,
-    set_auto_launch, set_item,
+    set_auto_launch, set_item,get_app_cache_path,get_app_config_path
 };
 use crate::setup::logger::init_logger;
 use crate::setup::system_tray::new_system_tray;
@@ -65,7 +65,9 @@ fn main() {
                 front_logger,
                 get_monitor_info,
                 message_beep,
-                hide_notification
+                hide_notification,
+                get_app_cache_path,
+                get_app_config_path
             ]);
 
         let app = builder
diff --git a/src/api/operations/locationFetch.ts b/src/api/operations/locationFetch.ts
new file mode 100644
index 00000000..4138f9e4
--- /dev/null
+++ b/src/api/operations/locationFetch.ts
@@ -0,0 +1,25 @@
+import {invoke} from "@tauri-apps/api";
+import {open} from "@tauri-apps/api/shell";
+import {L} from "@tauri-apps/api/event-41a9edf5";
+
+class LocationFetch{
+    async configDir():Promise<string>{
+        return await invoke<string>("get_app_config_path")
+    }
+
+    async cacheDir():Promise<string>{
+        return await invoke<string>("get_app_cache_path")
+    }
+
+    async openConfigDir():Promise<void>{
+        await open(await this.configDir())
+    }
+
+    async openCacheDir(){
+        await open(await this.cacheDir())
+    }
+
+}
+
+const locationFetch = new LocationFetch()
+export default locationFetch
\ No newline at end of file

From 7cf56c8058a35444ae995726571c547d67d9fc39 Mon Sep 17 00:00:00 2001
From: ForzenString <964413011@qq.com>
Date: Thu, 28 Sep 2023 18:15:42 +0800
Subject: [PATCH 27/34] :art: cargo fmt

---
 src-tauri/src/commands/mod.rs               |  4 ++--
 src-tauri/src/commands/resource_location.rs | 10 +++++-----
 src-tauri/src/main.rs                       |  6 +++---
 src-tauri/src/setup/logger.rs               |  4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src-tauri/src/commands/mod.rs b/src-tauri/src/commands/mod.rs
index 11c21ce0..f22b3b40 100644
--- a/src-tauri/src/commands/mod.rs
+++ b/src-tauri/src/commands/mod.rs
@@ -8,8 +8,8 @@ mod preview_page;
 mod quit;
 mod request_client;
 mod request_refer_image;
-mod update_available;
 mod resource_location;
+mod update_available;
 
 pub use self::auto_launch::{auto_launch_setting, set_auto_launch};
 pub use clipboard::copy_image;
@@ -21,4 +21,4 @@ pub use preview_page::{back_preview, read_detail};
 pub use quit::quit;
 pub use request_client::send_request;
 pub use request_refer_image::request_refer_image;
-pub use resource_location::{get_app_cache_path,get_app_config_path};
+pub use resource_location::{get_app_cache_path, get_app_config_path};
diff --git a/src-tauri/src/commands/resource_location.rs b/src-tauri/src/commands/resource_location.rs
index 5d012265..75aa78e9 100644
--- a/src-tauri/src/commands/resource_location.rs
+++ b/src-tauri/src/commands/resource_location.rs
@@ -1,12 +1,12 @@
-use std::path::PathBuf;
-use tauri::{AppHandle, command};
 use crate::state::{get_cache_dir, get_config_dir};
+use std::path::PathBuf;
+use tauri::{command, AppHandle};
 
 #[command]
-pub fn get_app_config_path(app:AppHandle)->PathBuf{
+pub fn get_app_config_path(app: AppHandle) -> PathBuf {
     get_config_dir(app).to_owned()
 }
 #[command]
-pub fn get_app_cache_path(app:AppHandle)->PathBuf{
+pub fn get_app_cache_path(app: AppHandle) -> PathBuf {
     get_cache_dir(app).to_owned()
-}
\ No newline at end of file
+}
diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
index 1fe93b2a..aa8cdf09 100644
--- a/src-tauri/src/main.rs
+++ b/src-tauri/src/main.rs
@@ -13,9 +13,9 @@ use tauri::api::path::app_log_dir;
 use tauri::{generate_context, Builder, Context, Manager, WindowEvent};
 
 use crate::commands::{
-    auto_launch_setting, back_preview, copy_image, front_logger, get_item, get_monitor_info,
-    hide_notification, message_beep, quit, read_detail, request_refer_image, send_request,
-    set_auto_launch, set_item,get_app_cache_path,get_app_config_path
+    auto_launch_setting, back_preview, copy_image, front_logger, get_app_cache_path,
+    get_app_config_path, get_item, get_monitor_info, hide_notification, message_beep, quit,
+    read_detail, request_refer_image, send_request, set_auto_launch, set_item,
 };
 use crate::setup::logger::init_logger;
 use crate::setup::system_tray::new_system_tray;
diff --git a/src-tauri/src/setup/logger.rs b/src-tauri/src/setup/logger.rs
index d216468d..b883157d 100644
--- a/src-tauri/src/setup/logger.rs
+++ b/src-tauri/src/setup/logger.rs
@@ -4,7 +4,7 @@ use std::fs::{File, OpenOptions};
 use std::io;
 use std::io::{stdout, IoSlice, Write};
 use std::ops::Deref;
-use std::path::PathBuf;
+use std::path::{Path, PathBuf};
 use std::sync::atomic::{AtomicUsize, Ordering};
 use tracing::level_filters::LevelFilter;
 use tracing::{info, Subscriber};
@@ -90,7 +90,7 @@ impl<'a> MakeWriter<'a> for LogWriter {
 }
 
 impl LogWriter {
-    fn open_log_file(path: &PathBuf) -> io::Result<File> {
+    fn open_log_file(path: &Path) -> io::Result<File> {
         let now = Local::now();
         let format = now.format("%Y-%m-%dT%H-%M-%S");
         let filename = format!("log-{format}.log");

From a40a2ea3ffb985ce674a8de3914d2493c80af70a Mon Sep 17 00:00:00 2001
From: ForzenString <964413011@qq.com>
Date: Thu, 28 Sep 2023 18:18:22 +0800
Subject: [PATCH 28/34] :bug: fix migrate error

---
 src-tauri/src/commands/mod.rs | 1 -
 src-tauri/src/main.rs         | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src-tauri/src/commands/mod.rs b/src-tauri/src/commands/mod.rs
index ffc67aed..11c3584a 100644
--- a/src-tauri/src/commands/mod.rs
+++ b/src-tauri/src/commands/mod.rs
@@ -22,6 +22,5 @@ pub use preview_page::{back_preview, read_detail};
 pub use quit::quit;
 pub use request_client::send_request;
 pub use request_refer_image::request_refer_image;
-pub use resource_location::{get_app_cache_path, get_app_config_path};
 pub use resource_location::{get_app_cache_path,get_app_config_path};
 pub use is_debug::is_debug;
diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
index 77171e78..25a8cdbf 100644
--- a/src-tauri/src/main.rs
+++ b/src-tauri/src/main.rs
@@ -66,7 +66,7 @@ fn main() {
                 get_monitor_info,
                 message_beep,
                 get_app_cache_path,
-                get_app_config_path
+                get_app_config_path,
                 hide_notification,
                 is_debug
             ]);

From ed08e640181b3cf69ec1ae25689d15d1f6997974 Mon Sep 17 00:00:00 2001
From: ForzenString <964413011@qq.com>
Date: Thu, 28 Sep 2023 18:27:31 +0800
Subject: [PATCH 29/34] :bookmark: release 1.0.2

---
 package.json              | 2 +-
 src-tauri/Cargo.lock      | 2 +-
 src-tauri/Cargo.toml      | 2 +-
 src-tauri/tauri.conf.json | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 138baf71..76850519 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ceobe-canteen-electron",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "private": true,
   "description": "帮小刻找好多好吃的饼",
   "author": "CeobeCanteen",
diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
index ef75eecf..4d5c62d1 100644
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -465,7 +465,7 @@ dependencies = [
 
 [[package]]
 name = "ceobe-canteen-desktop"
-version = "1.0.0"
+version = "1.0.1"
 dependencies = [
  "arboard",
  "auto-launch",
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index fb113d5a..d7220c3c 100644
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ceobe-canteen-desktop"
-version = "1.0.1"
+version = "1.0.2"
 description = "小刻食堂的桌面端，恭喜你电脑有多了个和小刻一样喜欢吃东西的浏览器内核 "
 authors = ["FrozenString<frozenstringstable@gmail.com>"]
 license="AGPL-3"
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
index f16e1302..7b663c8f 100644
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -9,7 +9,7 @@
   },
   "package": {
     "productName": "小刻食堂",
-    "version": "1.0.1"
+    "version": "1.0.2"
   },
   "tauri": {
     "systemTray": {

From 286e18bd2873951beb0d44b11ff3f8704c1baef4 Mon Sep 17 00:00:00 2001
From: ForzenString <964413011@qq.com>
Date: Thu, 28 Sep 2023 18:34:05 +0800
Subject: [PATCH 30/34] :fire: remove starup license

---
 src-tauri/Cargo.lock      |  2 +-
 src/components/Navbar.vue | 99 ++-------------------------------------
 2 files changed, 5 insertions(+), 96 deletions(-)

diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
index 4d5c62d1..4ea933d4 100644
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -465,7 +465,7 @@ dependencies = [
 
 [[package]]
 name = "ceobe-canteen-desktop"
-version = "1.0.1"
+version = "1.0.2"
 dependencies = [
  "arboard",
  "auto-launch",
diff --git a/src/components/Navbar.vue b/src/components/Navbar.vue
index 9689aae8..42cfcd28 100644
--- a/src/components/Navbar.vue
+++ b/src/components/Navbar.vue
@@ -1,112 +1,21 @@
 <template>
   <div class="index">
-    <div v-if="!loadApp" class="read-me">
-      <h1 class="online-yellow">小刻食堂免责声明</h1>
-      <div class="read-me-content">
-        <div>
-          <p>
-            欢迎使用由小刻食堂开发团队（以下简称「开发组」）开发的「小刻食堂」系列。在您使用本框架之前，请仔细阅读并完全理解本声明。一旦您开始使用小刻食堂，即表示您同意遵守本声明中的所有条款和条件。
-          </p>
 
-          <p>
-            1. 使用目的：
-            小刻食堂是一个免费开源的软件项目，旨在为用户提供抓取B站、微博、明日方舟通讯组等API数据的功能，并提供多种实用功能，如实时饼消息通知、快速跳转链接、饼内容分享、详细内容查看、饼内容图片生成、理智回复时间计算等。
-          </p>
-
-          <p>
-            2. 合法合理使用：
-            您承诺以合法、合理的方式使用小刻食堂，不得将其用于任何违法、侵权或其他恶意行为，也不得将其应用于违反当地法律法规的Web平台。
-          </p>
-
-          <p>
-            3. 免责声明：
-            开发组对于因使用小刻食堂而引起的任何意外、疏忽、合同损害、诽谤、版权或知识产权侵权以及由此产生的损失（包括但不限于直接、间接、附带或衍生的损失等）不承担任何法律责任。
-          </p>
-
-          <p>
-            4. 风险承担：
-            用户明确同意，使用小刻食堂所存在的风险和后果将完全由用户自行承担，开发组不承担任何法律责任。
-          </p>
-
-          <p>
-            5. 合法发布和使用：
-            用户在遵守本声明的前提下，可在《MIT开源许可证》所允许的范围内合法地发布、传播和使用小刻食堂。对于因违反本声明或法律法规造成的法律责任（包括但不限于民事赔偿和刑事责任），将由违约者自行承担。
-          </p>
-
-          <p>
-            6. 知识产权：
-            小刻食堂及其相关产品享有开发组的知识产权保护，包括但不限于商标权、专利权、著作权、商业秘密等，受相关法律法规保护。
-          </p>
-
-          <p>
-            7. 条款变更：
-            开发组有权随时单方面修改本声明条款及附件内容，并通过消息推送、网页公告等方式进行公布。变更后的条款在公布后立即生效，用户继续使用即表示您已充分阅读、理解并接受修改后的声明内容。
-          </p>
-
-          <p>
-            请在使用小刻食堂之前仔细阅读并理解本声明。如果您有任何疑问，请咨询相关法律专业人士。感谢您的合作与支持！
-          </p>
-
-          <p>小刻食堂开发团队</p>
-        </div>
-      </div>
-
-      <div class="text-right">
-        <v-btn elevation="0" density="default" @click="dialog = true"
-          >不同意，退出程序</v-btn
-        >
-
-        <v-btn
-          color="#e6a23c"
-          elevation="0"
-          style="color: #fff"
-          class="ml-3"
-          density="default"
-          @click="agreeApp"
-          >我已阅读以上全部条款并同意以上条款。开始蹲饼！
-        </v-btn>
-      </div>
-    </div>
-    <div v-else>
+    <div>
       <app-top></app-top>
       <app-main></app-main>
     </div>
   </div>
-  <v-dialog v-model="dialog" persistent width="auto">
-    <v-card>
-      <v-card-title class="text-h5">裆真?</v-card-title>
-      <v-card-text
-        >你选得对，但小刻食堂是一款优秀的蹲饼器，用于实时获取兔兔发的动态。</v-card-text
-      >
-      <v-card-actions class="justify-end">
-        <v-btn color="#f56c6c" variant="text" @click="exitApp">
-          我不用小刻食堂</v-btn
-        >
-        <v-btn color="#e6a23c" variant="text" @click="dialog = false">
-          刚刚是手滑，我要同意条款</v-btn
-        >
-      </v-card-actions>
-    </v-card>
-  </v-dialog>
+
 </template>
 
-<script setup name="index" lang="ts">
-import { onMounted, ref } from "vue";
+<script lang="ts" setup>
+import {onMounted, ref} from "vue";
 import AppTop from "./AppTop.vue";
 import AppMain from "../view/AppMain.vue";
-import operate from "../api/operations/operate";
 import storage from "../api/operations/localStorage";
 
 const loadApp = ref(false);
-const dialog = ref(false);
-const exitApp = () => {
-  operate.exit();
-};
-const agreeApp = async () => {
-  await storage.setItem("agreeApp", true);
-  operate.bootSetting(true).then(() => {});
-  loadApp.value = true;
-};
 
 onMounted(async () => {
   let result = await storage.getItem<boolean>("agreeApp");

From 4bd7d5ff9bdb5a8d098117dfff606e5a424d6e74 Mon Sep 17 00:00:00 2001
From: ForzenString <964413011@qq.com>
Date: Thu, 28 Sep 2023 18:34:18 +0800
Subject: [PATCH 31/34] :art: cargo fmt

---
 src-tauri/src/commands/is_debug.rs | 4 ++--
 src-tauri/src/commands/mod.rs      | 6 +++---
 src-tauri/src/main.rs              | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src-tauri/src/commands/is_debug.rs b/src-tauri/src/commands/is_debug.rs
index fcad80fd..02bdbd6f 100644
--- a/src-tauri/src/commands/is_debug.rs
+++ b/src-tauri/src/commands/is_debug.rs
@@ -1,6 +1,6 @@
 use tauri::command;
 
 #[command]
-pub fn is_debug()->bool{
+pub fn is_debug() -> bool {
     cfg!(debug_assertions)
-}
\ No newline at end of file
+}
diff --git a/src-tauri/src/commands/mod.rs b/src-tauri/src/commands/mod.rs
index 11c3584a..b2699fdd 100644
--- a/src-tauri/src/commands/mod.rs
+++ b/src-tauri/src/commands/mod.rs
@@ -2,6 +2,7 @@ mod auto_launch;
 mod clipboard;
 mod front_logger;
 mod hide_notification;
+mod is_debug;
 mod local_storage;
 mod monitor_info;
 mod preview_page;
@@ -9,18 +10,17 @@ mod quit;
 mod request_client;
 mod request_refer_image;
 mod resource_location;
-mod is_debug;
 mod update_available;
 
 pub use self::auto_launch::{auto_launch_setting, set_auto_launch};
 pub use clipboard::copy_image;
 pub use front_logger::front_logger;
 pub use hide_notification::hide_notification;
+pub use is_debug::is_debug;
 pub use local_storage::{get_item, set_item};
 pub use monitor_info::{get_monitor_info, message_beep};
 pub use preview_page::{back_preview, read_detail};
 pub use quit::quit;
 pub use request_client::send_request;
 pub use request_refer_image::request_refer_image;
-pub use resource_location::{get_app_cache_path,get_app_config_path};
-pub use is_debug::is_debug;
+pub use resource_location::{get_app_cache_path, get_app_config_path};
diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
index 25a8cdbf..985afd67 100644
--- a/src-tauri/src/main.rs
+++ b/src-tauri/src/main.rs
@@ -14,8 +14,8 @@ use tauri::{generate_context, Builder, Context, Manager, WindowEvent};
 
 use crate::commands::{
     auto_launch_setting, back_preview, copy_image, front_logger, get_app_cache_path,
-    get_app_config_path, get_item, get_monitor_info, hide_notification, message_beep, quit,
-    read_detail, request_refer_image, send_request, set_auto_launch, set_item, is_debug
+    get_app_config_path, get_item, get_monitor_info, hide_notification, is_debug, message_beep,
+    quit, read_detail, request_refer_image, send_request, set_auto_launch, set_item,
 };
 use crate::setup::logger::init_logger;
 use crate::setup::system_tray::new_system_tray;

From 6dbc87420474f686f987d3c942094799fce253b9 Mon Sep 17 00:00:00 2001
From: ForzenString <964413011@qq.com>
Date: Thu, 28 Sep 2023 18:54:52 +0800
Subject: [PATCH 32/34] :bookmark: release 1.0

---
 package.json              | 2 +-
 src-tauri/Cargo.toml      | 2 +-
 src-tauri/tauri.conf.json | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 76850519..30d797c2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ceobe-canteen-electron",
-  "version": "1.0.2",
+  "version": "1.0.0",
   "private": true,
   "description": "帮小刻找好多好吃的饼",
   "author": "CeobeCanteen",
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index d7220c3c..0b8aafcc 100644
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ceobe-canteen-desktop"
-version = "1.0.2"
+version = "1.0.0"
 description = "小刻食堂的桌面端，恭喜你电脑有多了个和小刻一样喜欢吃东西的浏览器内核 "
 authors = ["FrozenString<frozenstringstable@gmail.com>"]
 license="AGPL-3"
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
index 7b663c8f..fcc9a276 100644
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -9,7 +9,7 @@
   },
   "package": {
     "productName": "小刻食堂",
-    "version": "1.0.2"
+    "version": "1.0.0"
   },
   "tauri": {
     "systemTray": {

From ad5147dacb59edfd262794fcdce99369539d6d8d Mon Sep 17 00:00:00 2001
From: ForzenString <964413011@qq.com>
Date: Thu, 28 Sep 2023 19:13:01 +0800
Subject: [PATCH 33/34] :bookmark: release 1.0.0-rc1

---
 package.json              | 2 +-
 src-tauri/Cargo.lock      | 2 +-
 src-tauri/Cargo.toml      | 2 +-
 src-tauri/tauri.conf.json | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 30d797c2..4fd49c33 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ceobe-canteen-electron",
-  "version": "1.0.0",
+  "version": "1.0.0rc-1",
   "private": true,
   "description": "帮小刻找好多好吃的饼",
   "author": "CeobeCanteen",
diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
index 4ea933d4..ef75eecf 100644
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -465,7 +465,7 @@ dependencies = [
 
 [[package]]
 name = "ceobe-canteen-desktop"
-version = "1.0.2"
+version = "1.0.0"
 dependencies = [
  "arboard",
  "auto-launch",
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index 0b8aafcc..33ffc447 100644
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ceobe-canteen-desktop"
-version = "1.0.0"
+version = "1.0.0-rc1"
 description = "小刻食堂的桌面端，恭喜你电脑有多了个和小刻一样喜欢吃东西的浏览器内核 "
 authors = ["FrozenString<frozenstringstable@gmail.com>"]
 license="AGPL-3"
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
index fcc9a276..73bcd38e 100644
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -9,7 +9,7 @@
   },
   "package": {
     "productName": "小刻食堂",
-    "version": "1.0.0"
+    "version": "1.0.0-rc1"
   },
   "tauri": {
     "systemTray": {
@@ -87,7 +87,7 @@
       "windows": {
         "webviewInstallMode": {
           "type": "embedBootstrapper",
-          "silent": true
+          "silent": false
         },
         "digestAlgorithm": "sha256",
         "nsis": {

From 4a89151ed362782e2015777760dd30311deb44c5 Mon Sep 17 00:00:00 2001
From: ForzenString <964413011@qq.com>
Date: Thu, 28 Sep 2023 20:17:48 +0800
Subject: [PATCH 34/34] :bookmark: release 1.0.0-rc1

---
 package.json         | 2 +-
 src-tauri/Cargo.lock | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 4fd49c33..ae1a813e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ceobe-canteen-electron",
-  "version": "1.0.0rc-1",
+  "version": "1.0.0-rc1",
   "private": true,
   "description": "帮小刻找好多好吃的饼",
   "author": "CeobeCanteen",
diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
index ef75eecf..292b11eb 100644
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -465,7 +465,7 @@ dependencies = [
 
 [[package]]
 name = "ceobe-canteen-desktop"
-version = "1.0.0"
+version = "1.0.0-rc1"
 dependencies = [
  "arboard",
  "auto-launch",