From 4f1f3c210594007de4eaef97e1d9ef6dba504d66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=88=8F=E8=88=9E=E5=A4=A9=E6=AE=87?= <99065478+XiTianGame@users.noreply.github.com> Date: Tue, 19 Sep 2023 03:55:29 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9B=BE=E7=89=87=E7=94=9F?= =?UTF-8?q?=E6=88=90=E5=A4=B1=E8=B4=A5=20(#258)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/puppeteer/puppeteer.js | 2 +- renderers/puppeteer/lib/puppeteer.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/puppeteer/puppeteer.js b/lib/puppeteer/puppeteer.js index e21b510..11e06fc 100644 --- a/lib/puppeteer/puppeteer.js +++ b/lib/puppeteer/puppeteer.js @@ -5,7 +5,7 @@ import Renderer from '../renderer/loader.js' * 后期会逐步废弃 * 只提供截图及分片截图功能 */ -let renderer = Renderer.getRenderer('puppeteer') +let renderer = Renderer.getRenderer() renderer.screenshot = async (name, data) => { let img = await renderer.render(name, data) return img ? segment.image(img) : img diff --git a/renderers/puppeteer/lib/puppeteer.js b/renderers/puppeteer/lib/puppeteer.js index f2c5d25..9635743 100644 --- a/renderers/puppeteer/lib/puppeteer.js +++ b/renderers/puppeteer/lib/puppeteer.js @@ -5,8 +5,8 @@ import puppeteer from 'puppeteer' // 暂时保留对原config的兼容 import cfg from '../../../lib/config/config.js' import { Data } from '#miao' -import path from 'path' +const _path = process.cwd() // mac地址 let mac = '' @@ -176,7 +176,7 @@ export default class Puppeteer extends Renderer { try { const page = await this.browser.newPage() let pageGotoParams = lodash.extend({ timeout: 120000 }, data.pageGotoParams || {}) - await page.goto('file://' + path.resolve(savePath), pageGotoParams) + await page.goto(`file://${_path}${lodash.trim(savePath, '.')}`, pageGotoParams) let body = await page.$('#container') || await page.$('body') // 计算页面高度