首页 发现 帮助
登录
www
/
test-case-app
1
0
派生 0
文件 工单管理 0 合并请求 0 Wiki
浏览代码

fix: 跨域问题

Gaokun Wang 5 天之前
父节点
0e67171af4
当前提交
812ed455fa
共有 7 个文件被更改，包括 34 次插入 和 29 次删除
合并视图 显示文件统计
  1. 1 8
      electron.vite.config.ts
  2. 9 2
      electron/main/index.ts
  3. 1 2
      index.html
  4. 2 2
      src/layouts/index.vue
  5. 2 2
      src/main.ts
  6. 6 0
      src/utils/webSocket.ts
  7. 13 13
      src/views/test/index.vue

+ 1 - 8
electron.vite.config.ts
查看文件 

@@ -28,14 +28,7 @@ export default defineConfig({
 
   },
 
   },
 
   renderer: {
 
   renderer: {
 
     server: {
 
     server: {
 
-      cors: true,
 
-      proxy: {
 
-        '/websocket': {
 
-          target: 'ws://127.0.0.1:8899/',
 
-          changeOrigin: true,
 
-          ws: true
 
-        }
 
-      }
 
+      cors: true
 
     },
 
     },
 
     root: '.',
 
     root: '.',
 
     build: {
 
     build: {

+ 9 - 2
electron/main/index.ts
查看文件 

@@ -6,8 +6,6 @@ import icon from '../../resources/icon.png?asset'
 
 function createWindow(): void {
 
 function createWindow(): void {
 
   // Create the browser window.
 
   // Create the browser window.
 
   const mainWindow = new BrowserWindow({
 
   const mainWindow = new BrowserWindow({
 
-    // width: 900,
 
-    // height: 670,
 
     maximizable: true,
 
     maximizable: true,
 
     show: false,
 
     show: false,
 
     autoHideMenuBar: true,
 
     autoHideMenuBar: true,
 
@@ -18,6 +16,15 @@ function createWindow(): void {
 
     }
 
     }
 
   })
 
   })
 
 
 
+  // 或者在加载前设置 CSP
 
+  mainWindow.webContents.on('did-finish-load', () => {
 
+    mainWindow.webContents.insertCSS(`
 
+    meta[http-equiv="Content-Security-Policy"] {
 
+      content: "default-src 'self'; connect-src 'self' ws://127.0.0.1:8899";
 
+    }
 
+  `)
 
+  })
 
+
 
   mainWindow.on('ready-to-show', () => {
 
   mainWindow.on('ready-to-show', () => {
 
     // 最大化
 
     // 最大化
 
     mainWindow.maximize()
 
     mainWindow.maximize()

+ 1 - 2
index.html
查看文件 

@@ -3,10 +3,9 @@
 
   <head>
 
   <head>
 
     <meta charset="UTF-8" />
 
     <meta charset="UTF-8" />
 
     <title>测试性用例软件</title>
 
     <title>测试性用例软件</title>
 
-    <!-- https://developer.mozilla.org/en-US/docs/Web/HTTP/CSP -->
 
     <meta
 
     <meta
 
       http-equiv="Content-Security-Policy"
 
       http-equiv="Content-Security-Policy"
 
-      content="default-src 'self'; script-src 'self'; style-src 'self' 'unsafe-inline'; img-src 'self' data:"
 
+      content="default-src 'self'; script-src 'self'; style-src 'self' 'unsafe-inline'; img-src 'self' data:; connect-src 'self' ws://127.0.0.1:8899;"
 
     />
 
     />
 
   </head>
 
   </head>

+ 2 - 2
src/layouts/index.vue
查看文件 

@@ -38,8 +38,8 @@ const reload = () => {
 
   location.reload()
 
   location.reload()
 
 }
 
 }
 
 const relink = () => {
 
 const relink = () => {
 
-  let protocol = window.location.protocol === 'https:' ? 'wss://' : 'ws://'
 
-  initWebSocket(protocol + window.location.host + '/websocket')
 
+  const wsUrl = 'ws://127.0.0.1:8899/websocket'
 
+  initWebSocket(wsUrl)
 
 }
 
 }
 
 const path = computed(() => {
 
 const path = computed(() => {
 
   return router.currentRoute.value.path
 
   return router.currentRoute.value.path

+ 2 - 2
src/main.ts
查看文件 

@@ -25,8 +25,8 @@ const setupAll = async () => {
 
   setupRouter(app)
 
   setupRouter(app)
 
   app.use(ContextMenu)
 
   app.use(ContextMenu)
 
   app.use(pinia)
 
   app.use(pinia)
 
-  let protocol = window.location.protocol === 'https:' ? 'wss://' : 'ws://'
 
-  initWebSocket(protocol + window.location.host + '/websocket')
 
+  const wsUrl = 'ws://127.0.0.1:8899/websocket'
 
+  initWebSocket(wsUrl)
 
   app.mount('#app')
 
   app.mount('#app')
 
 }
 
 }

+ 6 - 0
src/utils/webSocket.ts
查看文件 

@@ -88,6 +88,12 @@ export const initWebSocket = (url: string) => {
 
 
 
   // 监听状态变化
 
   // 监听状态变化
 
   watch(status, newStatus => {
 
   watch(status, newStatus => {
 
+    if (newStatus == 'OPEN') {
 
+      useWebSocketManager().sendMessage({
 
+        serverName: 'wsClient',
 
+        type: 'fetch'
 
+      })
 
+    }
 
     console.log(`WebSocket 状态变化: ${newStatus}`)
 
     console.log(`WebSocket 状态变化: ${newStatus}`)
 
   })
 
   })

+ 13 - 13
src/views/test/index.vue
查看文件 

@@ -81,19 +81,19 @@ import { ElMessageBox } from 'element-plus'
 
 const { sendMessage } = useWebSocketManager()
 
 const { sendMessage } = useWebSocketManager()
 
 const useStoreCaseFlowData = useCaseFlowData()
 
 const useStoreCaseFlowData = useCaseFlowData()
 
 // 组件加载完成后发送初始消息
 
 // 组件加载完成后发送初始消息
 
-onMounted(() => {
 
-  console.log('组件已加载，发送初始消息')
 
-  nextTick(() => {
 
-    if (wsClient.value && wsStatus.value === '已连接') {
 
-      sendMessage({
 
-        serverName: 'wsClient',
 
-        type: 'fetch'
 
-      })
 
-    } else {
 
-      console.log('WebSocket 未连接，无法发送初始消息')
 
-    }
 
-  })
 
-})
 
+// onMounted(() => {
 
+//   console.log('组件已加载，发送初始消息')
 
+//   nextTick(() => {
 
+//     if (wsClient.value && wsStatus.value === '已连接') {
 
+//       sendMessage({
 
+//         serverName: 'wsClient',
 
+//         type: 'fetch'
 
+//       })
 
+//     } else {
 
+//       console.log('WebSocket 未连接，无法发送初始消息')
 
+//     }
 
+//   })
 
+// })
 
 
 
 const caseList = computed(() => {
 
 const caseList = computed(() => {
 
   return useStoreCaseFlowData.getCaseList
 
   return useStoreCaseFlowData.getCaseList