diff --git a/src/IpcMainHandler.ts b/src/IpcMainHandler.ts index c14bf77..25a7045 100644 --- a/src/IpcMainHandler.ts +++ b/src/IpcMainHandler.ts @@ -40,7 +40,7 @@ export function initialize(): void { return helperDescrip ? helperDescrip.Descrip : null; }); - // Get zoom factor + // Get zoom factor by url ipcMain.handle('get-zoom-factor-by-url', async (event, url: string): Promise => { const display: Electron.Display = screen.getPrimaryDisplay(); const physicalSize: Electron.Size = { @@ -153,7 +153,7 @@ export function initialize(): void { } }); - // Set webview‘s cookie + // Set webview's cookie ipcMain.handle('set-webview-cookie', async (event, url: string, cookie: string): Promise => { try { const parsedUrl = new URL(url); @@ -188,12 +188,24 @@ export function initialize(): void { } const base64 = await captureWindowAsBase64(win); - console.log('base64:', base64); + console.debug('base64:', base64); + + const account: string = memoryCache.get('Account'); + if (!account) { + throw new Error('Not found account'); + } + console.log('account:', account); + + const ip: string = getLocalIPAddress(); + if (!ip) { + throw new Error('Not found ip'); + } + console.log('ip:', ip); try { const response: ApiResponse = await EIACDesktopApi.Help.FaultReportingAsync({ - Account: memoryCache.get('Account'), - IP: getLocalIPAddress(), + Account: account, + IP: ip, Url: url, ImgBase64: base64, Explain: `message: ${message}, status: ${status}` diff --git a/src/index.ts b/src/index.ts index 4673062..b39f707 100644 --- a/src/index.ts +++ b/src/index.ts @@ -124,13 +124,14 @@ async function addTabAsync(tabGroup: TabGroup, menuItem: MenuItem): Promise= 200 && result.status < 400) { console.log(`✅ URL ${url} 可访问:`, result.status); lastInvalidUrlResult = null; + const cookies: string = window.electronAPI.getSessionStorage('cookies'); await window.electronAPI.setWebviewCookie(url, cookies); } else { console.warn(`❌ URL ${url} 不可访问:`, result.message ?? `status ${result.status}`); lastInvalidUrlResult = { url, message: result.message, status: result.status }; - const helpDescrip: string = await window.electronAPI.getHelperDescripAsync(result.status.toString()) ?? `无法访问 {URL}\r\n异常原因:${result.message ?? `status ${result.status}`}\r\n${helpDescrip ?? ''}`; + const helpDescrip: string = await window.electronAPI.getHelperDescripAsync(result.status.toString()) ?? `无法访问{URL}\r\n异常原因:${result.message ?? `status ${result.status}`}\r\n请联系技术支持。`; showErrorModal(helpDescrip.replace('{URL}', url)); return null; }