diff --git a/package.json b/package.json index 8e19bf3..750ac51 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "azon-seeker", - "displayName": "Azon Seeker v0.7.1.4-beta", + "displayName": "Azon Seeker v0.7.1.6-beta", "version": "0.7.2", "private": true, "description": "Starter modify by honestfox101 and PetrichorFun", diff --git a/src/composables/useCloudExporter.ts b/src/composables/useCloudExporter.ts index 9859bba..2e6f985 100644 --- a/src/composables/useCloudExporter.ts +++ b/src/composables/useCloudExporter.ts @@ -16,11 +16,17 @@ type WebSocketResponse = | { type: 'progress'; current: number; total: number } | { type: 'result'; result: string }; +// 使用 wss:// 和 https:// +const protocol = __DEV__ ? 'ws' : 'wss'; +const httpProtocol = __DEV__ ? 'http' : 'https'; + class ExportExcelPipeline { private socket: WebSocket; constructor() { - this.socket = new WebSocket(`ws://${remoteHost}/ws/daa0b9f1-4e4a-4e7c-9269-f5f0e86ae271`); + this.socket = new WebSocket( + `${protocol}://${remoteHost}/ws/daa0b9f1-4e4a-4e7c-9269-f5f0e86ae271`, + ); } private sendCommand(command: Command) { @@ -32,7 +38,9 @@ class ExportExcelPipeline { switch (this.socket.readyState) { case WebSocket.CLOSED: case WebSocket.CLOSING: - this.socket = new WebSocket(`ws://${remoteHost}/ws/daa0b9f1-4e4a-4e7c-9269-f5f0e86ae271`); + this.socket = new WebSocket( + `${protocol}://${remoteHost}/ws/daa0b9f1-4e4a-4e7c-9269-f5f0e86ae271`, + ); case WebSocket.CONNECTING: return new Promise((resolve) => { this.socket!.onopen = () => resolve(this); @@ -118,7 +126,7 @@ export const useCloudExporter = () => { await pipeline.close(); if (file) { - const url = `http://${remoteHost}${file}`; + const url = `${httpProtocol}://${remoteHost}${file}`; const link = document.createElement('a'); link.href = url; link.download = `${dayjs().format('YYYY-MM-DD')}.xlsx`; diff --git a/src/options/Options.vue b/src/options/Options.vue index 1a15fb6..f61f935 100644 --- a/src/options/Options.vue +++ b/src/options/Options.vue @@ -76,10 +76,7 @@ const handleHelpButtonClick = () => { diff --git a/src/page-worker/services/base.ts b/src/page-worker/services/base.ts index 6e6ea96..b34779b 100644 --- a/src/page-worker/services/base.ts +++ b/src/page-worker/services/base.ts @@ -8,7 +8,7 @@ const keyPairPromise = generateKeyPair(); const publicKeyBase64Promise = keyPairPromise.then(async ({ publicKey }) => exportKey(publicKey)); const httpClient = createAlova({ - baseURL: `https://${remoteHost}`, + baseURL: `${__DEV__ ? 'http' : 'https'}://${remoteHost}`, requestAdapter: adapterFetch(), timeout: 10000, statesHook: VueHook,