diff --git a/app/src/protyle/export/index.ts b/app/src/protyle/export/index.ts index d3a9b1542..2c8053e4b 100644 --- a/app/src/protyle/export/index.ts +++ b/app/src/protyle/export/index.ts @@ -2,7 +2,7 @@ import {hideMessage, showMessage} from "../../dialog/message"; import {Constants} from "../../constants"; /// #if !BROWSER import {OpenDialogReturnValue} from "electron"; -import {BrowserWindow, dialog} from "@electron/remote"; +import {BrowserWindow, dialog, app} from "@electron/remote"; import * as fs from "fs"; import * as path from "path"; import {afterExport} from "./util"; @@ -381,6 +381,7 @@ const renderPDF = (id: string) => { webSecurity: false, }, }); + window.siyuan.printWin.webContents.userAgent = `SiYuan/${app.getVersion()} https://b3log.org/siyuan Electron` fetchPost("/api/export/exportTempContent", {content: html}, (response) => { window.siyuan.printWin.loadURL(response.data.url); }); diff --git a/kernel/api/export.go b/kernel/api/export.go index e369c26eb..35e343b56 100644 --- a/kernel/api/export.go +++ b/kernel/api/export.go @@ -193,14 +193,14 @@ func exportTempContent(c *gin.Context) { } content := arg["content"].(string) - tmpExport := filepath.Join(util.TempDir, "export") + tmpExport := filepath.Join(util.TempDir, "export", "temp") if err := os.MkdirAll(tmpExport, 0755); nil != err { ret.Code = 1 ret.Msg = err.Error() ret.Data = map[string]interface{}{"closeTimeout": 7000} return } - p := filepath.Join(tmpExport, "temp", gulu.Rand.String(7)) + p := filepath.Join(tmpExport, gulu.Rand.String(7)) if err := os.WriteFile(p, []byte(content), 0644); nil != err { ret.Code = 1 ret.Msg = err.Error() @@ -209,7 +209,7 @@ func exportTempContent(c *gin.Context) { } url := path.Join("/export/temp/", filepath.Base(p)) ret.Data = map[string]interface{}{ - "url": url, + "url": "http://127.0.0.1:" + util.ServerPort + url, } }