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: ( <>