Browse Source

lrl-2021-11-10

lirl 3 years ago
parent
commit
b64041f973
2 changed files with 22 additions and 31 deletions
  1. 22 20
      cors.js
  2. 0 11
      nginx.conf

+ 22 - 20
cors.js

@@ -103,27 +103,29 @@ module.exports = {
         pathRewrite: {
           '^/icore.icp.web/pass/localhost': '/'
         }
-      },
-      '/icore.icp.web/pass/websocket': {
-        target: 'http://172.16.90.221:8002',
-        changeOrigin: true,
-        pathRewrite: {
-          '^/icore.icp.web/pass/websocket': '/'
-        }
-      },
-      '/xt.pass.web/pass/emswebsocket': {
-        // target: '172.16.90.238:8888',
-        target: 'http://172.16.90.221:8002',
-        ws: true,
-        changeOrigin: true,
-        pathRewrite: {
-          '^/xt.pass.web/pass/emswebsocket': '/'
-        }
       }
+      // '/icore.icp.web/pass/websocket': {
+      //   target: 'http://172.16.90.221:8002',
+      //   changeOrigin: true,
+      //   pathRewrite: {
+      //     '^/icore.icp.web/pass/websocket': '/'
+      //   }
+      // },
+      // '/xt.pass.web/pass/emswebsocket': {
+      //   // target: '172.16.90.238:8888',
+      //   target: 'http://172.16.90.221:8002',
+      //   ws: true,
+      //   changeOrigin: true,
+      //   pathRewrite: {
+      //     '^/xt.pass.web/pass/emswebsocket': '/'
+      //   }
+      // }
   },
-  //devModules: ['index','workFlow','ApiManage','apollo','authManage','configManager','devops','dingtalk','serviceManager','microService','monitor','systemConfig','metaData','multEntry','demo']
   //  devModules: ['all'] // 不建议使用,运行速度太慢,发布构建会失败
-    devModules: ['dingtalk','dingtalkMobileEnd','formGenerator','gatewayCfg','index','logAudit','metaData','workFlow','preview','serviceManager',
-    'systemConfig','multEntry','microService','basicInformation','energyAnalysis','energyBalance','energyOperationSupport',
-    'energyPerformance','energyPlan','energyQuality','energyScheduling','systemInterface']
+    // devModules: ['dingtalk','dingtalkMobileEnd','formGenerator','gatewayCfg','index','logAudit','metaData','workFlow','preview','serviceManager',
+    // 'systemConfig','multEntry','microService','basicInformation','energyAnalysis','energyBalance','energyOperationSupport',
+    // 'energyPerformance','energyPlan','energyQuality','energyScheduling','systemInterface']
+    // 用于构建
+    devModules: ['index','metaData','systemConfig','multEntry',
+    'basicInformation','energyAnalysis','energyBalance','energyOperationSupport','energyPerformance','energyPlan','energyQuality','energyScheduling','systemInterface']
 }

+ 0 - 11
nginx.conf

@@ -108,17 +108,6 @@ http {
             proxy_set_header X-Real-IP $remote_addr;
             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
             proxy_pass http://ems-ems-datasource/v1; # 转发地址.dev.svc.cluster.local
-        }
-        location /xt.pass.web/pass/emswebsocket {
-            rewrite ^/xt.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://paas-websocket; # 转发地址
-            # proxy_pass http://ems-ems-api/v1;
-            proxy_pass http://ems-ems-websocket/v1;
-            proxy_set_header Upgrade $http_upgrade;
-            proxy_set_header Connection "upgrade";
         }
      }
 }