From dc511fabc48509157af4269ebcf462a19f896b22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=98=89=E4=BC=9F?= <8473136@qq.com>
Date: Sun, 1 Dec 2024 10:10:59 +0800
Subject: [PATCH 1/8] =?UTF-8?q?:sparkles:=20=E4=BF=AE=E5=A4=8Dgithub=20api?=
 =?UTF-8?q?=20=E9=99=90=E6=B5=81=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 electron/api/github.ts     |  3 ++-
 src/views/logger/index.vue | 37 +++++++++++++++++++------------------
 2 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/electron/api/github.ts b/electron/api/github.ts
index ed80d20..f3c2ce8 100644
--- a/electron/api/github.ts
+++ b/electron/api/github.ts
@@ -119,7 +119,8 @@ export const initGitHubApi = () => {
   ipcMain.on("github.getFrpVersions", async event => {
     const request = net.request({
       method: "get",
-      url: "https://api.github.com/repos/fatedier/frp/releases?page=1&per_page=1000"
+      // url: "https://api.github.com/repos/fatedier/frp/releases?page=1&per_page=1000"
+      url: "https://api.jwinks.com/github/releases"
     });
     request.on("response", response => {
       let responseData: Buffer = Buffer.alloc(0);
diff --git a/src/views/logger/index.vue b/src/views/logger/index.vue
index b57e498..00fb768 100644
--- a/src/views/logger/index.vue
+++ b/src/views/logger/index.vue
@@ -11,21 +11,21 @@ const loggerContent = ref('<div class="text-white">暂无日志</div>');
 
 const handleLog2Html = (logContent: string) => {
   const logs = logContent
-      .split("\n")
-      .filter(f => f)
-      .map(m => {
-        if (m.indexOf("[E]") !== -1) {
-          return `<div class="text-[#FF0006]">${m}</div> `;
-        } else if (m.indexOf("[I]") !== -1) {
-          return `<div class="text-[#48BB31]">${m}</div> `;
-        } else if (m.indexOf("[D]") !== -1) {
-          return `<div class="text-[#0070BB]">${m}</div> `;
-        } else if (m.indexOf("[W]") !== -1) {
-          return `<div class="text-[#BBBB23]">${m}</div> `;
-        } else {
-          return `<div class="text-[#BBBBBB]">${m}</div> `;
-        }
-      });
+    .split("\n")
+    .filter(f => f)
+    .map(m => {
+      if (m.indexOf("[E]") !== -1) {
+        return `<div class="text-[#FF0006]">${m}</div> `;
+      } else if (m.indexOf("[I]") !== -1) {
+        return `<div class="text-[#48BB31]">${m}</div> `;
+      } else if (m.indexOf("[D]") !== -1) {
+        return `<div class="text-[#0070BB]">${m}</div> `;
+      } else if (m.indexOf("[W]") !== -1) {
+        return `<div class="text-[#BBBB23]">${m}</div> `;
+      } else {
+        return `<div class="text-[#BBBBBB]">${m}</div> `;
+      }
+    });
   return logs.reverse().join("");
 };
 
@@ -41,6 +41,7 @@ onMounted(() => {
     ipcRenderer.send("logger.update");
   });
   ipcRenderer.on("Logger.update.hook", (event, args) => {
+    console.log("logger update hook", 1);
     if (args) {
       loggerContent.value = handleLog2Html(args);
     }
@@ -53,11 +54,11 @@ onUnmounted(() => {
 </script>
 <template>
   <div class="main">
-    <breadcrumb/>
+    <breadcrumb />
     <div class="app-container-breadcrumb">
       <div
-          class="w-full h-full p-2 bg-[#2B2B2B] rounded drop-shadow-lg overflow-y-auto"
-          v-html="loggerContent"
+        class="w-full h-full p-2 bg-[#2B2B2B] rounded drop-shadow-lg overflow-y-auto"
+        v-html="loggerContent"
       ></div>
     </div>
   </div>

From 90233f006a2fabc4843e968e93936c660040c9e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=98=89=E4=BC=9F?= <8473136@qq.com>
Date: Mon, 2 Dec 2024 14:53:21 +0800
Subject: [PATCH 2/8] =?UTF-8?q?:sparkles:=20=E5=A2=9E=E5=8A=A0=E9=80=82?=
 =?UTF-8?q?=E9=85=8Dsudp?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 electron/api/frpc.ts      |  5 ++++-
 src/views/proxy/index.vue | 36 ++++++++++++++++++++++++++++--------
 2 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/electron/api/frpc.ts b/electron/api/frpc.ts
index c32a5d9..e549bba 100644
--- a/electron/api/frpc.ts
+++ b/electron/api/frpc.ts
@@ -56,7 +56,8 @@ ${
     : ""
 }
 [[${
-      (m.type === "stcp" || m.type === "xtcp") && m.stcpModel === "visitors"
+      (m.type === "stcp" || m.type === "xtcp" || m.type === "sudp") &&
+      m.stcpModel === "visitors"
         ? "visitors"
         : "proxies"
     }]]
@@ -98,6 +99,7 @@ httpPassword = "${m.httpPassword}"
         break;
       case "stcp":
       case "xtcp":
+      case "sudp":
         if (m.stcpModel === "visitors") {
           // 访问者
           toml += `
@@ -252,6 +254,7 @@ httpPassword = "${m.httpPassword}"
         break;
       case "stcp":
       case "xtcp":
+      case "sudp":
         if (m.stcpModel === "visitors") {
           // 访问者
           ini += `
diff --git a/src/views/proxy/index.vue b/src/views/proxy/index.vue
index e348163..18edb49 100644
--- a/src/views/proxy/index.vue
+++ b/src/views/proxy/index.vue
@@ -74,7 +74,7 @@ const editForm = ref<Proxy>(defaultForm.value);
 /**
  * 代理类型
  */
-const proxyTypes = ref(["http", "https", "tcp", "udp", "stcp", "xtcp"]);
+const proxyTypes = ref(["http", "https", "tcp", "udp", "stcp", "xtcp", "sudp"]);
 
 const stcpModels = ref([
   {
@@ -172,20 +172,28 @@ const isStcp = computed(() => {
   return editForm.value.type === "stcp";
 });
 
+const isSudp = computed(() => {
+  return editForm.value.type === "sudp";
+});
+
 const isXtcp = computed(() => {
   return editForm.value.type === "xtcp";
 });
 
 const isStcpVisited = computed(() => {
   return (
-    (editForm.value.type === "stcp" || editForm.value.type === "xtcp") &&
+    (editForm.value.type === "stcp" ||
+      editForm.value.type === "sudp" ||
+      editForm.value.type === "xtcp") &&
     editForm.value.stcpModel === "visited"
   );
 });
 
 const isStcpVisitors = computed(() => {
   return (
-    (editForm.value.type === "stcp" || editForm.value.type === "xtcp") &&
+    (editForm.value.type === "stcp" ||
+      editForm.value.type === "sudp" ||
+      editForm.value.type === "xtcp") &&
     editForm.value.stcpModel === "visitors"
   );
 });
@@ -463,7 +471,11 @@ const handleCopyAccessAddress = (proxy: Proxy) => {
     accessAddressStr = `${proxy.type}://${proxy.customDomains[0]}`;
   } else if (proxy.type === "tcp" || proxy.type === "udp") {
     accessAddressStr = `${frpcConfig.value.serverAddr}:${proxy.remotePort}`;
-  } else if (proxy.type === "stcp" || proxy.type === "xtcp") {
+  } else if (
+    proxy.type === "stcp" ||
+    proxy.type === "xtcp" ||
+    proxy.type === "sudp"
+  ) {
     accessAddressStr = `${proxy.bindAddr}:${proxy.bindPort}`;
   }
   const { copy, copied } = useClipboard();
@@ -612,7 +624,9 @@ onUnmounted(() => {
                     </el-tag>
                     <el-tag
                       v-if="
-                        (proxy.type === 'stcp' || proxy.type === 'xtcp') &&
+                        (proxy.type === 'stcp' ||
+                          proxy.type === 'xtcp' ||
+                          proxy.type === 'sudp') &&
                         proxy.stcpModel === 'visitors'
                       "
                       size="small"
@@ -622,7 +636,9 @@ onUnmounted(() => {
                     <el-tag
                       size="small"
                       v-if="
-                        (proxy.type === 'stcp' || proxy.type === 'xtcp') &&
+                        (proxy.type === 'stcp' ||
+                          proxy.type === 'xtcp' ||
+                          proxy.type === 'sudp') &&
                         proxy.stcpModel === 'visited'
                       "
                       >被访问者
@@ -796,7 +812,7 @@ onUnmounted(() => {
               </el-radio-group>
             </el-form-item>
           </el-col>
-          <template v-if="isStcp || isXtcp">
+          <template v-if="isStcp || isSudp || isXtcp">
             <el-col :span="12">
               <el-form-item :label="`${editForm.type}模式：`" prop="stcpModel">
                 <el-radio-group v-model="editForm.stcpModel">
@@ -866,7 +882,7 @@ onUnmounted(() => {
               </el-button>
             </el-form-item>
           </el-col>
-          <template v-if="!(isStcp || isXtcp) || isStcpVisited">
+          <template v-if="!(isStcp || isXtcp || isSudp) || isStcpVisited">
             <el-col :span="12">
               <el-form-item label="内网地址：" prop="localIp">
                 <el-autocomplete
@@ -1325,6 +1341,10 @@ onUnmounted(() => {
   background: #f8bf4b;
 }
 
+.sudp {
+  background: #3d4bb9;
+}
+
 .domain-input {
   width: calc(100% - 115px);
 }

From 5ac69de59a009a1a119806c23a609924322feb92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=98=89=E4=BC=9F?= <8473136@qq.com>
Date: Mon, 2 Dec 2024 17:49:04 +0800
Subject: [PATCH 3/8] =?UTF-8?q?:sparkles:=20=E5=A2=9E=E5=8A=A0webPort?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 electron/api/config.ts     |  4 +-
 electron/api/frpc.ts       |  4 +-
 src/views/config/index.vue | 89 +++++++++++++++++++++++++++++++++++---
 types/global.d.ts          |  2 +
 4 files changed, 91 insertions(+), 8 deletions(-)

diff --git a/electron/api/config.ts b/electron/api/config.ts
index ff978cf..22a1db9 100644
--- a/electron/api/config.ts
+++ b/electron/api/config.ts
@@ -144,7 +144,9 @@ export const initConfigApi = win => {
       metaToken: sourceConfig?.metadatas?.token || "",
       systemSelfStart: false,
       systemStartupConnect: false,
-      systemSilentStartup: false
+      systemSilentStartup: false,
+      webEnable: true,
+      webPort: sourceConfig?.webServer?.port || 57400
     };
     let frpcProxys = [];
     // 解析proxy
diff --git a/electron/api/frpc.ts b/electron/api/frpc.ts
index e549bba..e06d1cd 100644
--- a/electron/api/frpc.ts
+++ b/electron/api/frpc.ts
@@ -171,7 +171,7 @@ log.to = "frpc.log"
 log.level = "${config.logLevel}"
 log.maxDays = ${config.logMaxDays}
 webServer.addr = "127.0.0.1"
-webServer.port = 57400
+webServer.port = ${config.webPort}
 transport.tls.enable = ${config.tlsConfigEnable}
 ${
   config.tlsConfigEnable && config.tlsConfigCertFile
@@ -325,7 +325,7 @@ log_file = "frpc.log"
 log_level = ${config.logLevel}
 log_max_days = ${config.logMaxDays}
 admin_addr = 127.0.0.1
-admin_port = 57400
+admin_port = ${config.webPort}
 tls_enable = ${config.tlsConfigEnable}
 
 ${
diff --git a/src/views/config/index.vue b/src/views/config/index.vue
index c3aad0d..b91bf97 100644
--- a/src/views/config/index.vue
+++ b/src/views/config/index.vue
@@ -45,7 +45,9 @@ const defaultFormData = ref<FrpConfig>({
   user: "",
   metaToken: "",
   transportHeartbeatInterval: 30,
-  transportHeartbeatTimeout: 90
+  transportHeartbeatTimeout: 90,
+  webEnable: true,
+  webPort: 57400
 });
 
 const formData = ref<FrpConfig>(defaultFormData.value);
@@ -113,6 +115,12 @@ const rules = reactive<FormRules>({
   ],
   transportHeartbeatTimeout: [
     { required: true, message: "心跳超时时间不能为空", trigger: "change" }
+  ],
+  webEnable: [
+    { required: true, message: "web界面开关不能为空", trigger: "change" }
+  ],
+  webPort: [
+    { required: true, message: "web界面端口不能为空", trigger: "change" }
   ]
 });
 
@@ -187,6 +195,10 @@ onMounted(() => {
           data.transportHeartbeatTimeout =
             defaultFormData.value.transportHeartbeatTimeout;
         }
+        if (data.webEnable == null || data.webEnable == undefined) {
+          data.webEnable = true;
+          data.webPort = 57400;
+        }
         formData.value = data;
       }
     }
@@ -687,7 +699,7 @@ onUnmounted(() => {
               <div class="h2">TLS Config</div>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="是否启用TLS：" prop="tlsConfigEnable">
+              <el-form-item label="启用TLS：" prop="tlsConfigEnable">
                 <el-switch
                   active-text="开"
                   inline-prompt
@@ -876,7 +888,7 @@ onUnmounted(() => {
               <div class="h2">代理</div>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="是否启动代理：" prop="proxyConfigEnable">
+              <el-form-item label="启用代理：" prop="proxyConfigEnable">
                 <el-switch
                   active-text="开"
                   inline-prompt
@@ -915,6 +927,73 @@ onUnmounted(() => {
               </el-col>
             </template>
 
+            <el-col :span="24">
+              <div class="h2">Web 界面</div>
+            </el-col>
+
+            <el-col :span="12">
+              <el-form-item label="启用Web界面：" prop="webEnable">
+                <template #label>
+                  <div class="h-full flex items-center mr-1">
+                    <el-popover width="300" placement="top" trigger="hover">
+                      <template #reference>
+                        <IconifyIconOffline
+                          class="text-base"
+                          color="#5A3DAA"
+                          icon="info"
+                        />
+                      </template>
+                      热更新等功能依赖于web界面，<span class="font-black text-[#5A3DAA]"
+                    >不可停用Web</span
+                    >
+                    </el-popover>
+                  </div>
+                  启用Web：
+                </template>
+                <el-switch
+                  active-text="开"
+                  inline-prompt
+                  disabled
+                  inactive-text="关"
+                  v-model="formData.webEnable"
+                />
+              </el-form-item>
+            </el-col>
+
+            <template v-if="formData.webEnable">
+              <el-col :span="12">
+                <el-form-item label="Web 端口：" prop="webPort">
+                  <template #label>
+                    <div class="h-full flex items-center mr-1">
+                      <el-popover width="300" placement="top" trigger="hover">
+                        <template #default>
+                          对应参数：<span class="font-black text-[#5A3DAA]"
+                            >webServer.port</span
+                          ><br/>
+                          自行保证端口没有被占用，否则会导致启动失败
+                        </template>
+                        <template #reference>
+                          <IconifyIconOffline
+                            class="text-base"
+                            color="#5A3DAA"
+                            icon="info"
+                          />
+                        </template>
+                      </el-popover>
+                    </div>
+                    Web 端口：
+                  </template>
+                  <el-input-number
+                    placeholder="57400"
+                    v-model="formData.webPort"
+                    :min="0"
+                    :max="65535"
+                    controls-position="right"
+                  ></el-input-number>
+                </el-form-item>
+              </el-col>
+            </template>
+
             <el-col :span="24">
               <div class="h2">日志配置</div>
             </el-col>
@@ -977,8 +1056,8 @@ onUnmounted(() => {
                     <el-popover placement="top" trigger="hover">
                       <template #default>
                         开启后启动时<span class="font-black text-[#5A3DAA]"
-                      >不打开界面</span
-                      >
+                          >不打开界面</span
+                        >
                       </template>
                       <template #reference>
                         <IconifyIconOffline
diff --git a/types/global.d.ts b/types/global.d.ts
index b645db2..074e9c6 100644
--- a/types/global.d.ts
+++ b/types/global.d.ts
@@ -83,6 +83,8 @@ declare global {
         metaToken: string;
         transportHeartbeatInterval: number;
         transportHeartbeatTimeout: number;
+        webEnable: boolean;
+        webPort: number;
     };
 
     type GitHubMirror = {

From 6c4a052bf688ea5a51d8778bc925567d5627013c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=98=89=E4=BC=9F?= <8473136@qq.com>
Date: Wed, 4 Dec 2024 16:19:17 +0800
Subject: [PATCH 4/8] =?UTF-8?q?:sparkles:=20=E6=89=93=E5=BC=80=E5=A4=96?=
 =?UTF-8?q?=E9=83=A8=E6=97=A5=E5=BF=97=E7=9A=84=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 electron/api/logger.ts                        | 15 ++++++++++-
 src/components/IconifyIcon/src/offlineIcon.ts |  7 ++---
 src/views/logger/index.vue                    | 27 ++++++++++++++++---
 3 files changed, 40 insertions(+), 9 deletions(-)

diff --git a/electron/api/logger.ts b/electron/api/logger.ts
index e75c58b..33be0b4 100644
--- a/electron/api/logger.ts
+++ b/electron/api/logger.ts
@@ -1,4 +1,4 @@
-import { app, ipcMain } from "electron";
+import { app, ipcMain, shell } from "electron";
 
 const fs = require("fs");
 const path = require("path");
@@ -28,4 +28,17 @@ export const initLoggerApi = () => {
       }
     });
   });
+
+  ipcMain.on("logger.openLog", (event, args) => {
+    console.log('正在打开日志');
+    shell.openPath(logPath).then((errorMessage) => {
+      if (errorMessage) {
+        console.error('Failed to open Logger:', errorMessage);
+        event.reply("Logger.openLog.hook", false);
+      } else {
+        console.log('Logger opened successfully');
+        event.reply("Logger.openLog.hook", true);
+      }
+    });
+  });
 };
diff --git a/src/components/IconifyIcon/src/offlineIcon.ts b/src/components/IconifyIcon/src/offlineIcon.ts
index 249f4e3..687d94f 100644
--- a/src/components/IconifyIcon/src/offlineIcon.ts
+++ b/src/components/IconifyIcon/src/offlineIcon.ts
@@ -1,10 +1,5 @@
 import {addIcon} from "@iconify/vue/dist/offline";
 
-/**
- * 这里存放本地图标，在 src/layout/index.vue 文件中加载，避免在首启动加载
- */
-
-// 本地菜单图标，后端在路由的icon中返回对应的图标字符串并且前端在此处使用addIcon添加即可渲染菜单图标
 import Cloud from "@iconify-icons/material-symbols/cloud";
 import RocketLaunchRounded from "@iconify-icons/material-symbols/rocket-launch-rounded";
 import Download from "@iconify-icons/material-symbols/download-2";
@@ -36,6 +31,7 @@ import deviceReset from "@iconify-icons/material-symbols/device-reset";
 import switchAccessOutlineRounded from "@iconify-icons/material-symbols/switch-access-outline-rounded";
 import switchAccessRounded from "@iconify-icons/material-symbols/switch-access-rounded";
 import chargerRounded from "@iconify-icons/material-symbols/charger-rounded";
+import fileOpenRounded from "@iconify-icons/material-symbols/file-open-rounded";
 
 addIcon("cloud", Cloud);
 addIcon("rocket-launch-rounded", RocketLaunchRounded);
@@ -67,5 +63,6 @@ addIcon("downloadRounded", downloadRounded);
 addIcon("deviceReset", deviceReset);
 addIcon("switchAccessOutlineRounded", switchAccessOutlineRounded);
 addIcon("switchAccessRounded", switchAccessRounded);
+addIcon("file-open-rounded", fileOpenRounded);
 
 
diff --git a/src/views/logger/index.vue b/src/views/logger/index.vue
index 00fb768..85efdb3 100644
--- a/src/views/logger/index.vue
+++ b/src/views/logger/index.vue
@@ -1,7 +1,10 @@
 <script lang="ts" setup>
-import {defineComponent, onMounted, onUnmounted, ref} from "vue";
+import { defineComponent, onMounted, onUnmounted, ref } from "vue";
 import Breadcrumb from "@/layout/compoenets/Breadcrumb.vue";
-import {ipcRenderer} from "electron";
+import { ipcRenderer } from "electron";
+import IconifyIconOffline from "@/components/IconifyIcon/src/iconifyIconOffline";
+import { useDebounce, useDebounceFn } from "@vueuse/core";
+import { ElMessage } from "element-plus";
 
 defineComponent({
   name: "Logger"
@@ -46,15 +49,33 @@ onMounted(() => {
       loggerContent.value = handleLog2Html(args);
     }
   });
+
+  ipcRenderer.on("Logger.openLog.hook", (event, args) => {
+    if (args) {
+      ElMessage({
+        type: "success",
+        message: "打开日志成功"
+      });
+    }
+  });
 });
 
+const openLocalLog = useDebounceFn(() => {
+  console.log('打开啊日志');
+  ipcRenderer.send("logger.openLog");
+}, 300);
+
 onUnmounted(() => {
   ipcRenderer.removeAllListeners("Logger.getLog.hook");
 });
 </script>
 <template>
   <div class="main">
-    <breadcrumb />
+    <breadcrumb>
+      <el-button plain type="primary" @click="openLocalLog">
+        <IconifyIconOffline icon="file-open-rounded"  />
+      </el-button>
+    </breadcrumb>
     <div class="app-container-breadcrumb">
       <div
         class="w-full h-full p-2 bg-[#2B2B2B] rounded drop-shadow-lg overflow-y-auto"

From d70a7488fc4bb1cea45de2c4d3f62c92618f5d0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=98=89=E4=BC=9F?= <8473136@qq.com>
Date: Wed, 4 Dec 2024 16:19:27 +0800
Subject: [PATCH 5/8] =?UTF-8?q?:arrow=5Fup:=20=E5=8D=87=E7=BA=A7=E4=BE=9D?=
 =?UTF-8?q?=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 62356f8..573a7fc 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,10 @@
     "frp",
     "frpc",
     "proxy",
-    "electron-app"
+    "electron-app",
+    "vue",
+    "vue3",
+    "vite"
   ],
   "engines": {
     "node": ">= 18"

From 139191065b2bc13478ac7fe0b1eaf603914fca19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=98=89=E4=BC=9F?= <8473136@qq.com>
Date: Wed, 4 Dec 2024 16:35:00 +0800
Subject: [PATCH 6/8] =?UTF-8?q?:sparkles:=20=E6=89=8B=E5=8A=A8=E5=88=B7?=
 =?UTF-8?q?=E6=96=B0=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/IconifyIcon/src/offlineIcon.ts |  2 --
 src/views/logger/index.vue                    | 36 ++++++++++++++++---
 2 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/src/components/IconifyIcon/src/offlineIcon.ts b/src/components/IconifyIcon/src/offlineIcon.ts
index 687d94f..323aeea 100644
--- a/src/components/IconifyIcon/src/offlineIcon.ts
+++ b/src/components/IconifyIcon/src/offlineIcon.ts
@@ -12,7 +12,6 @@ import MoreVert from "@iconify-icons/material-symbols/more-vert";
 import Add from "@iconify-icons/material-symbols/add";
 import BringYourOwnIpRounded from "@iconify-icons/material-symbols/bring-your-own-ip-rounded";
 import DeleteRounded from "@iconify-icons/material-symbols/delete-rounded";
-import RefreshRounded from "@iconify-icons/material-symbols/refresh-rounded";
 import CancelPresentation from "@iconify-icons/material-symbols/cancel-presentation";
 import GestureSelect from "@iconify-icons/material-symbols/gesture-select";
 import SaveRounded from "@iconify-icons/material-symbols/save-rounded";
@@ -48,7 +47,6 @@ addIcon("delete-rounded", DeleteRounded);
 addIcon("cancel-presentation", CancelPresentation);
 addIcon("gesture-select", GestureSelect);
 addIcon("save-rounded", SaveRounded);
-addIcon("refresh-rounded", RefreshRounded);
 addIcon("info", Info);
 addIcon("question-mark", QuestionMark);
 addIcon("check-circle-rounded", CheckCircleRounded);
diff --git a/src/views/logger/index.vue b/src/views/logger/index.vue
index 85efdb3..72e796a 100644
--- a/src/views/logger/index.vue
+++ b/src/views/logger/index.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { defineComponent, onMounted, onUnmounted, ref } from "vue";
+import { createVNode, defineComponent, onMounted, onUnmounted, ref } from "vue";
 import Breadcrumb from "@/layout/compoenets/Breadcrumb.vue";
 import { ipcRenderer } from "electron";
 import IconifyIconOffline from "@/components/IconifyIcon/src/iconifyIconOffline";
@@ -32,6 +32,10 @@ const handleLog2Html = (logContent: string) => {
   return logs.reverse().join("");
 };
 
+const refreshStatus = ref(false);
+
+const logLoading = ref(true);
+
 onMounted(() => {
   ipcRenderer.send("logger.getLog");
   ipcRenderer.on("Logger.getLog.hook", (event, args) => {
@@ -41,7 +45,16 @@ onMounted(() => {
     if (args) {
       loggerContent.value = handleLog2Html(args);
     }
-    ipcRenderer.send("logger.update");
+    logLoading.value = false;
+    if (refreshStatus.value) {
+      // 刷新逻辑
+      ElMessage({
+        type: "success",
+        message: "刷新成功"
+      });
+    } else {
+      ipcRenderer.send("logger.update");
+    }
   });
   ipcRenderer.on("Logger.update.hook", (event, args) => {
     console.log("logger update hook", 1);
@@ -61,8 +74,18 @@ onMounted(() => {
 });
 
 const openLocalLog = useDebounceFn(() => {
-  console.log('打开啊日志');
   ipcRenderer.send("logger.openLog");
+}, 1000);
+
+const refreshLog = useDebounceFn(() => {
+  // ElMessage({
+  //   type: "warning",
+  //   icon: "<IconifyIconOffline icon=\"file-open-rounded\" />",
+  //   message: "正在刷新日志..."
+  // });
+  refreshStatus.value = true;
+  logLoading.value = true;
+  ipcRenderer.send("logger.getLog");
 }, 300);
 
 onUnmounted(() => {
@@ -72,11 +95,14 @@ onUnmounted(() => {
 <template>
   <div class="main">
     <breadcrumb>
+      <el-button plain type="primary" @click="refreshLog">
+        <IconifyIconOffline icon="refresh-rounded" />
+      </el-button>
       <el-button plain type="primary" @click="openLocalLog">
-        <IconifyIconOffline icon="file-open-rounded"  />
+        <IconifyIconOffline icon="file-open-rounded" />
       </el-button>
     </breadcrumb>
-    <div class="app-container-breadcrumb">
+    <div class="app-container-breadcrumb" v-loading="logLoading">
       <div
         class="w-full h-full p-2 bg-[#2B2B2B] rounded drop-shadow-lg overflow-y-auto"
         v-html="loggerContent"

From ab2323f421981a746e2f788ce91b5b10c2dad60c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=98=89=E4=BC=9F?= <8473136@qq.com>
Date: Wed, 4 Dec 2024 17:01:43 +0800
Subject: [PATCH 7/8] =?UTF-8?q?:sparkles:=20=E5=A2=9E=E5=8A=A0=E6=8D=90?=
 =?UTF-8?q?=E8=B5=A0=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/IconifyIcon/src/offlineIcon.ts |  7 ++++-
 src/layout/compoenets/LeftMenu.vue            | 30 ++++++++++++++-----
 src/styles/layout.scss                        | 13 ++++++--
 src/views/about/index.vue                     | 24 +++++++++++++++
 4 files changed, 62 insertions(+), 12 deletions(-)

diff --git a/src/components/IconifyIcon/src/offlineIcon.ts b/src/components/IconifyIcon/src/offlineIcon.ts
index 323aeea..d656bc5 100644
--- a/src/components/IconifyIcon/src/offlineIcon.ts
+++ b/src/components/IconifyIcon/src/offlineIcon.ts
@@ -31,6 +31,9 @@ import switchAccessOutlineRounded from "@iconify-icons/material-symbols/switch-a
 import switchAccessRounded from "@iconify-icons/material-symbols/switch-access-rounded";
 import chargerRounded from "@iconify-icons/material-symbols/charger-rounded";
 import fileOpenRounded from "@iconify-icons/material-symbols/file-open-rounded";
+import attachMoneyRounded from "@iconify-icons/material-symbols/attach-money-rounded";
+import volunteerActivismSharp from "@iconify-icons/material-symbols/volunteer-activism-sharp";
+import description from "@iconify-icons/material-symbols/description";
 
 addIcon("cloud", Cloud);
 addIcon("rocket-launch-rounded", RocketLaunchRounded);
@@ -62,5 +65,7 @@ addIcon("deviceReset", deviceReset);
 addIcon("switchAccessOutlineRounded", switchAccessOutlineRounded);
 addIcon("switchAccessRounded", switchAccessRounded);
 addIcon("file-open-rounded", fileOpenRounded);
-
+addIcon("attach-money-rounded", attachMoneyRounded);
+addIcon("volunteer-activism-sharp", volunteerActivismSharp);
+addIcon("description", description);
 
diff --git a/src/layout/compoenets/LeftMenu.vue b/src/layout/compoenets/LeftMenu.vue
index 448e096..3b3a5c8 100644
--- a/src/layout/compoenets/LeftMenu.vue
+++ b/src/layout/compoenets/LeftMenu.vue
@@ -118,14 +118,28 @@ onMounted(() => {
         ></IconifyIconOffline>
       </li>
     </ul>
-    <div
-      class="version mb-2 animate__animated"
-      @click="handleOpenGitHubReleases"
-      :data-step="guideSteps.Version?.step"
-      :data-intro="guideSteps.Version?.intro"
-      data-position="top"
-    >
-      {{ pkg.version }}
+    <div class="menu-footer mb-2">
+<!--      <div-->
+<!--        class="menu animate__animated"-->
+<!--        @click="handleOpenGitHubReleases"-->
+<!--        :data-step="guideSteps.Version?.step"-->
+<!--        :data-intro="guideSteps.Version?.intro"-->
+<!--        data-position="top"-->
+<!--      >-->
+<!--        <IconifyIconOffline-->
+<!--          class="animate__animated"-->
+<!--          icon="attach-money-rounded"-->
+<!--        ></IconifyIconOffline>-->
+<!--      </div>-->
+      <div
+        class="version animate__animated"
+        @click="handleOpenGitHubReleases"
+        :data-step="guideSteps.Version?.step"
+        :data-intro="guideSteps.Version?.intro"
+        data-position="top"
+      >
+        {{ pkg.version }}
+      </div>
     </div>
   </div>
 </template>
diff --git a/src/styles/layout.scss b/src/styles/layout.scss
index 1d11793..0d50b68 100644
--- a/src/styles/layout.scss
+++ b/src/styles/layout.scss
@@ -54,11 +54,18 @@ $danger-color: #F56C6C;
   display: flex; /* 设置为 flexbox */
   flex-direction: column; /* 纵向排列子元素 */
 
+  .menu-footer {
+    margin-top: auto;
+
+  }
+
   .version {
     height: 40px;
+    width: 60px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
     color: $primary-color;
-    text-align: center;
-    margin-top: auto;
     font-weight: bold;
     font-size: 14px;
     cursor: pointer;
@@ -68,7 +75,7 @@ $danger-color: #F56C6C;
     animation: heartBeat 1s;
   }
 
-  .menu-container {
+  .menu-container, .menu-footer {
 
     .menu {
       display: flex;
diff --git a/src/views/about/index.vue b/src/views/about/index.vue
index 5944e06..6a244ab 100644
--- a/src/views/about/index.vue
+++ b/src/views/about/index.vue
@@ -44,6 +44,22 @@ const handleOpenGitHub = () => {
   ipcRenderer.send("common.openUrl", "https://github.com/luckjiawei/frpc-desktop")
 }
 
+/**
+ * 打开捐赠界面
+ */
+const handleOpenDonate = () => {
+  ipcRenderer.send("common.openUrl", "https://jwinks.com/donate")
+}
+
+
+/**
+ * 打开文档
+ */
+const handleOpenDoc = () => {
+  ipcRenderer.send("common.openUrl", "https://jwinks.com/p/frp")
+}
+
+
 /**
  * 获取最后一个版本
  */
@@ -124,6 +140,14 @@ defineComponent({
           </p>
         </div>
         <div class="mt-[12px]">
+          <el-button plain type="success" @click="handleOpenDoc">
+            <IconifyIconOffline class="cursor-pointer mr-2" icon="description"/>
+            使用教程
+          </el-button>
+          <el-button plain type="success" @click="handleOpenDonate">
+            <IconifyIconOffline class="cursor-pointer mr-2" icon="volunteer-activism-sharp"/>
+            捐赠名单
+          </el-button>
           <el-button plain type="primary" @click="handleOpenGitHub">
             <Icon class="cursor-pointer mr-2" icon="logos:github-icon"/>
             仓库地址

From 32555d45b11ba763234502c0886f97ad63c6350b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=98=89=E4=BC=9F?= <8473136@qq.com>
Date: Wed, 4 Dec 2024 17:06:05 +0800
Subject: [PATCH 8/8] =?UTF-8?q?:memo:=20=E6=9B=B4=E6=96=B0=E6=8D=90?=
 =?UTF-8?q?=E8=B5=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 35 +++++++++++++++++++----------------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/README.md b/README.md
index 67009f3..7927e9d 100644
--- a/README.md
+++ b/README.md
@@ -96,22 +96,25 @@
 
 **捐赠名单**
 
-| 🕰 时间      | 📡 平台 | 🤲 捐赠者    | 💰 金额 | ✉️ 捐赠留言            |
-|------------|-------|-----------|-------|--------------------|
-| 2024-08-06 | 微信    | 三木        | 1 元   | 无                  |
-| 2024-08-25 | 微信    | 晚风        | 1 元   | 无                  |
-| 2024-08-27 | 微信    | x         | 1 元   | 无                  |
-| 2024-10-09 | 微信    | 解脱        | 20 元  | 无                  |
-| 2024-10-09 | 微信    | KMDN      | 20 元  | 无                  |
-| 2024-10-14 | 微信    | 121       | 5 元   | 无                  |
-| 2024-10-14 | 微信    | Different | 10 元  | 感谢您的开源             |
-| 2024-10-16 | 微信    | 。 。 。     | 50 元  | 感谢开源的frp软件         |
-| 2024-11-2  | 微信    | gesoft    | 10 元  | 加油                 |
-| 2024-11-7  | 微信    | *进        | 10 元  | 谢谢，可见可得，省心省力       |
-| 2024-11-8  | 微信    | **创       | 10 元  | 无                  |
-| 2024-11-20 | 微信    | 一東        | 20 元  | 请你喝咖啡              |
-| 2024-11-20 | 微信    | KEVINSKH  | 10 元  | 感谢开发方便快捷的图形化操作界面👍 |
-| 2024-11-26 | 微信    |           | 3 元   | 无                  |
+| 🕰 时间      | 📡 平台 | 🤲 捐赠者    | 💰 金额 | ✉️ 捐赠留言                  |
+|------------|-------|-----------|-------|--------------------------|
+| 2024-08-06 | 微信    | 三木        | 1 元   | 无                        |
+| 2024-08-25 | 微信    | 晚风        | 1 元   | 无                        |
+| 2024-08-27 | 微信    | x         | 1 元   | 无                        |
+| 2024-10-09 | 微信    | 解脱        | 20 元  | 无                        |
+| 2024-10-09 | 微信    | KMDN      | 20 元  | 无                        |
+| 2024-10-14 | 微信    | 121       | 5 元   | 无                        |
+| 2024-10-14 | 微信    | Different | 10 元  | 感谢您的开源                   |
+| 2024-10-16 | 微信    | 。 。 。     | 50 元  | 感谢开源的frp软件               |
+| 2024-11-2  | 微信    | gesoft    | 10 元  | 加油                       |
+| 2024-11-7  | 微信    | *进        | 10 元  | 谢谢，可见可得，省心省力             |
+| 2024-11-8  | 微信    | **创       | 10 元  | 无                        |
+| 2024-11-20 | 微信    | 一東        | 20 元  | 请你喝咖啡                    |
+| 2024-11-20 | 微信    | KEVINSKH  | 10 元  | 感谢开发方便快捷的图形化操作界面👍       |
+| 2024-11-26 | 微信    |           | 3 元   | 无                        |
+| 2024-11-26 | 微信    | Kaori     | 1 元   | 谢谢大佬的项目，要是能添加web控制页面就更好了 |
+| 2024-12-03 | 微信    | 17¥       | 20 元  | 谢谢，很方便的软件                |
+| 2024-12-03 | 微信    | Cr@k3r    | 5 元   | 感谢你的工作                   |
 
 ## 贡献者