From df8a3d26923483d47f1f5abec6eb2291bfeffba3 Mon Sep 17 00:00:00 2001
From: hanhh <18330117883@163.com>
Date: Wed, 13 Oct 2021 22:45:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=89=88=E6=9C=AC=E5=8F=B7?=
 =?UTF-8?q?=E5=8C=B9=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/services/user.ts             | 5 ++---
 src/pages/setting/checkUpdate.tsx | 6 +++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/back/services/user.ts b/back/services/user.ts
index 1f4e6205..ce17644f 100644
--- a/back/services/user.ts
+++ b/back/services/user.ts
@@ -380,9 +380,8 @@ export default class UserService {
 
   public async checkUpdate() {
     try {
-      const versionRegx = /.*export const version = (.*)\n/;
-      const logRegx = /.*export const changeLog = (.*)\n/;
-      const linkRegx = /.*export const changeLogLink = (.*)\n/;
+      const versionRegx = /.*export const version = \'(.*)\'\n/;
+      const logRegx = /.*export const changeLog = \`(.*)\`/;
 
       const currentVersionFile = fs.readFileSync(config.versionFile, 'utf8');
       const currentVersion = currentVersionFile.match(versionRegx)![1];
diff --git a/src/pages/setting/checkUpdate.tsx b/src/pages/setting/checkUpdate.tsx
index 4a62272a..91464073 100644
--- a/src/pages/setting/checkUpdate.tsx
+++ b/src/pages/setting/checkUpdate.tsx
@@ -40,14 +40,14 @@ const CheckUpdate = ({ ws }: any) => {
   };
 
   const showConfirmUpdateModal = (data: any) => {
-    const { version: newVersion, changeLog } = data;
+    const { lastVersion, lastLog } = data;
     Modal.confirm({
       width: 500,
       title: (
         <>
           <div>更新可用</div>
           <div style={{ fontSize: 12, fontWeight: 400, marginTop: 5 }}>
-            新版本{newVersion}可用。你使用的版本为{version}。
+            新版本{lastVersion}可用。你使用的版本为{version}。
           </div>
         </>
       ),
@@ -61,7 +61,7 @@ const CheckUpdate = ({ ws }: any) => {
             fontWeight: 400,
           }}
         >
-          {changeLog}
+          {lastLog}
         </pre>
       ),
       okText: '更新',