From c6349fff595014b9d965fa257a6abbadde7e76e4 Mon Sep 17 00:00:00 2001 From: purocean Date: Sat, 30 Jan 2021 22:47:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E8=B7=AF=E5=BE=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- electron-builder.json | 3 ++- src/server/constant.ts | 2 +- src/server/convert.ts | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/electron-builder.json b/electron-builder.json index 42680306..11730193 100644 --- a/electron-builder.json +++ b/electron-builder.json @@ -7,7 +7,8 @@ "bin/**/*", "help/**/*", "dist/resources/**/*", - "node_modules/node-plantuml/**/*" + "node_modules/node-plantuml/**/*", + "node_modules/node-nailgun-server/**/*" ], "files": [ "./bin/**", diff --git a/src/server/constant.ts b/src/server/constant.ts index ad4d9413..0b685d22 100644 --- a/src/server/constant.ts +++ b/src/server/constant.ts @@ -15,4 +15,4 @@ export const HELP_DIR = path.join(__dirname, '../../help') export const ASSETS_DIR = path.join(__dirname, '../assets') export const BIN_DIR = path.join(__dirname, '../../bin').replace('app.asar', 'app.asar.unpacked') -export const RESOURCES_DIR = path.join(__dirname, '../../resources').replace('app.asar', 'app.asar.unpacked') +export const RESOURCES_DIR = path.join(__dirname, '../resources').replace('app.asar', 'app.asar.unpacked') diff --git a/src/server/convert.ts b/src/server/convert.ts index 7240dc9a..71fe217f 100644 --- a/src/server/convert.ts +++ b/src/server/convert.ts @@ -12,7 +12,7 @@ const convert = async (html: string, type: string) => { const path = os.tmpdir() + `/yn_convert_${new Date().getTime()}.${type}` return new Promise((resolve, reject) => { - const args = ['-f', 'html', '-o', path, '--reference-doc', docxTplPath] + const args = ['-f', 'html', '-o', path, '--reference-doc', docxTplPath] console.log(binPath, args) const process = spawn(binPath, args)