Browse Source

update---websocket配置

QuietShadow 3 years ago
parent
commit
293ebb7b40
3 changed files with 13 additions and 5 deletions
  1. 9 1
      config/index.js
  2. 3 3
      nginx.conf
  3. 1 1
      src/components/main.vue

+ 9 - 1
config/index.js

@@ -73,7 +73,6 @@ module.exports = {
       '/zhongsteel.pass.web/pass/ems': {
         // target: '172.16.90.238:8888',
         target: 'http://localhost:8086',
-        ws: true,
         changeOrigin: true,
         pathRewrite: {
           '^/zhongsteel.pass.web/pass/ems': '/'
@@ -93,6 +92,15 @@ module.exports = {
         pathRewrite: {
           '^/zhongsteel.pass.web/pass/localhost': '/'
         }
+      },
+      '/zhongsteel.pass.web/pass/emswebsocket': {
+        // target: '172.16.90.238:8888',
+        target: 'http://localhost:8086',
+        ws: true,
+        changeOrigin: true,
+        pathRewrite: {
+          '^/zhongsteel.pass.web/pass/emswebsocket': '/'
+        }
       }
       // '/websocket': {
       //   target: 'ws://localhost:8086',

+ 3 - 3
nginx.conf

@@ -93,12 +93,12 @@ http {
             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
             proxy_pass http://ems-ems-datasource/v1; # 转发地址.dev.svc.cluster.local
         }
-        location /zhongsteel.pass.web/pass/ems/websocket {
-            rewrite ^/zhongsteel.pass.web/pass/ems/websocket/(.*)$ /$1 break; # 去除本地接口/api前缀, 否则会出现404
+        location /zhongsteel.pass.web/pass/emswebsocket {
+            rewrite ^/zhongsteel.pass.web/pass/emswebsocket/(.*)$ /$1 break; # 去除本地接口/api前缀, 否则会出现404
             proxy_set_header Host $host;
             proxy_set_header X-Real-IP $remote_addr;
             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-            proxy_pass http://ems-ems-api/websocket; # 转发地址.dev.svc.cluster.local
+            proxy_pass http://ems-ems-api/v1; # 转发地址.dev.svc.cluster.local
             proxy_set_header Upgrade $http_upgrade;
             proxy_set_header Connection "upgrade";
         }	

+ 1 - 1
src/components/main.vue

@@ -1285,7 +1285,7 @@ export default {
           if ('WebSocket' in window) {
             // this.websocket = new WebSocket('ws://localhost:8086/websocket/123?token=' + token,[token])
             // this.websocket = new WebSocket('ws:'+window.location.host+'/websocket/' + token);
-            that.websocket = new WebSocket('ws:'+window.location.host+'/zhongsteel.pass.web/pass/ems/websocket/' + token);
+            that.websocket = new WebSocket('ws:'+window.location.host+'/zhongsteel.pass.web/pass/emswebsocket/websocket/' + token);
                 // 连接错误
                 that.websocket.onerror = that.setErrorMessage