From 76b65935456337a09b9d61f9657ab16db7302fc2 Mon Sep 17 00:00:00 2001
From: kangfenmao <kangfenmao@qq.com>
Date: Wed, 16 Oct 2024 13:14:15 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=A3=80=E6=9F=A5=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E4=B8=8D=E7=94=9F=E6=95=88=20#184?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

close #184
---
 .github/workflows/release.yml                 |  1 +
 electron-builder.yml                          | 14 ----------
 package.json                                  |  2 +-
 src/main/services/AppUpdater.ts               |  2 ++
 .../src/pages/settings/AboutSettings.tsx      |  2 +-
 yarn.lock                                     | 28 ++++++++++++++++++-
 6 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 238b8327..c2ed841b 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -71,5 +71,6 @@ jobs:
             dist/*.rpm
             dist/*.tar.gz
             dist/latest*.yml
+            dist/*.blockmap
         env:
           GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
diff --git a/electron-builder.yml b/electron-builder.yml
index 41562736..ff685dc1 100644
--- a/electron-builder.yml
+++ b/electron-builder.yml
@@ -61,17 +61,3 @@ publish:
 electronDownload:
   mirror: https://npmmirror.com/mirrors/electron/
 afterSign: scripts/notarize.js
-releaseInfo:
-  releaseNotes: |
-    本次更新：
-      增加腾讯混元服务商 @1355873789
-      附件按钮支持选择多个文件
-      支持拖拽文件到输入框
-      模型切换搜索支持搜索服务商
-      设置界面增加数据设置页面
-      服务商API地址支持预览
-      代码增加行号显示，不再默认换行
-      修复初次WebDAV恢复数据出错的问题
-    近期更新：
-      支持 PDF, DOC等办公文件格式
-      增加 Artifacts 网页预览功能
diff --git a/package.json b/package.json
index 7842b427..b50de592 100644
--- a/package.json
+++ b/package.json
@@ -35,7 +35,7 @@
     "archiver": "^7.0.1",
     "electron-log": "^5.1.5",
     "electron-store": "^8.2.0",
-    "electron-updater": "^6.1.7",
+    "electron-updater": "^6.3.9",
     "electron-window-state": "^5.0.3",
     "fs-extra": "^11.2.0",
     "html2canvas": "^1.4.1",
diff --git a/src/main/services/AppUpdater.ts b/src/main/services/AppUpdater.ts
index e6c4d80b..30796e1b 100644
--- a/src/main/services/AppUpdater.ts
+++ b/src/main/services/AppUpdater.ts
@@ -20,8 +20,10 @@ export default class AppUpdater {
     autoUpdater.on('update-available', (releaseInfo: UpdateInfo) => {
       autoUpdater.logger?.info('检测到新版本，确认是否下载')
       mainWindow.webContents.send('update-available', releaseInfo)
+
       const releaseNotes = releaseInfo.releaseNotes
       let releaseContent = ''
+
       if (releaseNotes) {
         if (typeof releaseNotes === 'string') {
           releaseContent = <string>releaseNotes
diff --git a/src/renderer/src/pages/settings/AboutSettings.tsx b/src/renderer/src/pages/settings/AboutSettings.tsx
index 46f0cb6e..16cb9d91 100644
--- a/src/renderer/src/pages/settings/AboutSettings.tsx
+++ b/src/renderer/src/pages/settings/AboutSettings.tsx
@@ -29,7 +29,7 @@ const AboutSettings: FC = () => {
       try {
         await window.api.checkForUpdate()
       } catch (error) {
-        setCheckUpdateLoading(false)
+        window.message.error(t('settings.about.updateError'))
       }
 
       setCheckUpdateLoading(false)
diff --git a/yarn.lock b/yarn.lock
index f7499179..ac0fe921 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2270,7 +2270,7 @@ __metadata:
     electron-icon-builder: "npm:^2.0.1"
     electron-log: "npm:^5.1.5"
     electron-store: "npm:^8.2.0"
-    electron-updater: "npm:^6.1.7"
+    electron-updater: "npm:^6.3.9"
     electron-vite: "npm:^2.0.0"
     electron-window-state: "npm:^5.0.3"
     emittery: "npm:^1.0.3"
@@ -3112,6 +3112,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"builder-util-runtime@npm:9.2.10":
+  version: 9.2.10
+  resolution: "builder-util-runtime@npm:9.2.10"
+  dependencies:
+    debug: "npm:^4.3.4"
+    sax: "npm:^1.2.4"
+  checksum: 10c0/28681b8037ad0fb6a33c79532656f7eeddcf7c1d3c922253630d8794929c20a78adc6e4028111708643a1d10e25812c65ac1241886570ff12d6aa6308abe9015
+  languageName: node
+  linkType: hard
+
 "builder-util-runtime@npm:9.2.4":
   version: 9.2.4
   resolution: "builder-util-runtime@npm:9.2.4"
@@ -4318,6 +4328,22 @@ __metadata:
   languageName: node
   linkType: hard
 
+"electron-updater@npm:^6.3.9":
+  version: 6.3.9
+  resolution: "electron-updater@npm:6.3.9"
+  dependencies:
+    builder-util-runtime: "npm:9.2.10"
+    fs-extra: "npm:^10.1.0"
+    js-yaml: "npm:^4.1.0"
+    lazy-val: "npm:^1.0.5"
+    lodash.escaperegexp: "npm:^4.1.2"
+    lodash.isequal: "npm:^4.5.0"
+    semver: "npm:^7.6.3"
+    tiny-typed-emitter: "npm:^2.1.0"
+  checksum: 10c0/e692e8d744ba311caf17bfdf59d469b3f331b8dcbb174786ed69bba52b630093e8cd7d48f04c10e28cd25ead9c0896d42c92a25525275daaf47681da0dfd2094
+  languageName: node
+  linkType: hard
+
 "electron-vite@npm:^2.0.0":
   version: 2.3.0
   resolution: "electron-vite@npm:2.3.0"