Merge branch 'main' into develop

2024-08-06 19:49:21 +08:00 · 2024-08-06 19:49:21 +08:00 · 9d2c142d91
commit 9d2c142d91
parent 75bbd9c219 575f536e29
37 changed files with 8 additions and 6 deletions
--- a/README.md
+++ b/README.md
@ -10,7 +10,7 @@
 <br />
 <div align="center">
  <a href="https://github.com/luckjiawei/frpc-desktop">
-    <img src="public/logo/512x512.png" alt="Logo" width="80" height="80">
+    <img src="public/logo/pack/1024x1024.png" alt="Logo" width="140">
  </a>

 <h3 align="center">Frpc-Desktop</h3>
@ -27,8 +27,10 @@
 - [ ] 支持配置的导出导入
 - [ ] 优化配置
 - [ ] 便携版
+- [ ] 在线更新

 ## 里程碑
+- 2024-08-06: 发布v1.0.5版本
 - 2024-08-06: 发布v1.0.4版本 适配支持多用户插件
 - 2024-07-17: 发布v1.0.3版本 修复已知bug 增加开机自启 增加删除frp版本
 - 2024-01-29: 发布v1.0.2版本 增加Linux客户端和代理模式
--- a/electron-builder.json5
+++ b/electron-builder.json5
@ -9,7 +9,7 @@
  "directories": {
    "output": "release/${version}"
  },
-  "icon": "./public/logo/512x512.png",
+  "icon": "./public/logo/pack/512x512.png",
  "files": [
    "dist",
    "dist-electron"
--- a/electron/main/index.ts
+++ b/electron/main/index.ts
@ -54,7 +54,7 @@ log.transports.console.level = "debug";
 async function createWindow() {
    win = new BrowserWindow({
        title: "Frpc Desktop",
-        icon: join(process.env.VITE_PUBLIC, "logo/16x16.png"),
+        icon: join(process.env.VITE_PUBLIC, "logo/only/16x16.png"),
        width: 800,
        height: 600,
        minWidth: 800,
@ -137,7 +137,7 @@ export const createTray = () => {
            }
        }
    ];
-    tray = new Tray(node_path.join(process.env.VITE_PUBLIC, "logo/16x16.png"))
+    tray = new Tray(node_path.join(process.env.VITE_PUBLIC, "logo/only/16x16.png"))
    tray.setToolTip('Frpc Desktop')
    const contextMenu = Menu.buildFromTemplate(menu)
    tray.setContextMenu(contextMenu)
--- a/index.html
+++ b/index.html
@ -2,7 +2,7 @@
 <html lang="zh-cn">
  <head>
    <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="/logo/32x32.png" />
+    <link rel="icon" type="image/svg+xml" href="/logo/only/icon.ico" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline';" />
    <title>Frpc Desktop</title>
--- a/logo(new).pxd
+++ b/logo(new).pxd
--- a/public/logo/1024x1024.png
+++ b/public/logo/1024x1024.png
--- a/public/logo/128x128.png
+++ b/public/logo/128x128.png
--- a/public/logo/16x16.png
+++ b/public/logo/16x16.png
--- a/public/logo/24x24.png
+++ b/public/logo/24x24.png
--- a/public/logo/256x256.png
+++ b/public/logo/256x256.png
--- a/public/logo/32x32.png
+++ b/public/logo/32x32.png
--- a/public/logo/48x48.png
+++ b/public/logo/48x48.png
--- a/public/logo/512x512.png
+++ b/public/logo/512x512.png
--- a/public/logo/64x64.png
+++ b/public/logo/64x64.png
--- a/public/logo/only/1024x1024.png
+++ b/public/logo/only/1024x1024.png
--- a/public/logo/only/128x128.png
+++ b/public/logo/only/128x128.png
--- a/public/logo/only/16x16.png
+++ b/public/logo/only/16x16.png
--- a/public/logo/only/24x24.png
+++ b/public/logo/only/24x24.png
--- a/public/logo/only/256x256.png
+++ b/public/logo/only/256x256.png
--- a/public/logo/only/32x32.png
+++ b/public/logo/only/32x32.png
--- a/public/logo/only/48x48.png
+++ b/public/logo/only/48x48.png
--- a/public/logo/only/512x512.png
+++ b/public/logo/only/512x512.png
--- a/public/logo/only/64x64.png
+++ b/public/logo/only/64x64.png
--- a/public/logo/only/icon.icns
+++ b/public/logo/only/icon.icns
--- a/public/logo/only/icon.ico
+++ b/public/logo/only/icon.ico
--- a/public/logo/pack/1024x1024.png
+++ b/public/logo/pack/1024x1024.png
--- a/public/logo/pack/128x128.png
+++ b/public/logo/pack/128x128.png
--- a/public/logo/pack/16x16.png
+++ b/public/logo/pack/16x16.png
--- a/public/logo/pack/24x24.png
+++ b/public/logo/pack/24x24.png
--- a/public/logo/pack/256x256.png
+++ b/public/logo/pack/256x256.png
--- a/public/logo/pack/32x32.png
+++ b/public/logo/pack/32x32.png
--- a/public/logo/pack/48x48.png
+++ b/public/logo/pack/48x48.png
--- a/public/logo/pack/512x512.png
+++ b/public/logo/pack/512x512.png
--- a/public/logo/pack/64x64.png
+++ b/public/logo/pack/64x64.png
--- a/public/logo/pack/icon.icns
+++ b/public/logo/pack/icon.icns
--- a/public/logo/pack/icon.ico
+++ b/public/logo/pack/icon.ico
--- a/src/layout/compoenets/LeftMenu.vue
+++ b/src/layout/compoenets/LeftMenu.vue
@ -47,7 +47,7 @@ onMounted(() => {
 <template>
  <div class="left-menu-container drop-shadow-xl">
    <div class="logo-container">
-      <img src="/logo/64x64.png" class="logo" alt="Logo"/>
+      <img src="/logo/only/128x128.png" class="logo" alt="Logo"/>
    </div>
    <ul class="menu-container">
      <!--      enter-active-class="animate__animated animate__bounceIn"-->