Merge branch 'dev' of http://47.94.165.164:13000/geg-gas/geg-gas-web into dev

.env.development

@@ -45,9 +45,9 @@ VITE_GLOB_PRINT_BASE_URL = http://114.116.210.204:3300
 VITE_GLOB_API_URL_PREFIX =
 
 #租户开关
-# VITE_GLOB_TENANT_ENABLED = true
+VITE_GLOB_TENANT_ENABLED = true
 #登录时是否需要输入租户码
-# VITE_GLOB_TENANT_INPUT_REQUIRED = true
+VITE_GLOB_TENANT_INPUT_REQUIRED = true
 
 # 屏蔽通知消息的轮询
 VITE_GLOB_DISABLE_NEWS=false

build/vite/proxy.ts

@@ -27,6 +27,7 @@ export function createProxy(list: ProxyList = []) {
       target: target,
       changeOrigin: true,
       ws: true,
+      timeout: 600000,
       rewrite: (path) => path.replace(new RegExp(`^${prefix}`), ''),
       // https is require secure=false
       ...(isHttps ? { secure: false } : {}),

package.json

@@ -13,6 +13,7 @@
     "dev": "vite",
     "build": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=8192 vite build && esno ./build/script/postBuild.ts",
     "build:test": "cross-env NODE_OPTIONS=--max-old-space-size=8192 vite build --mode test && esno ./build/script/postBuild.ts",
+    "build:dev": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=8192 vite build && esno ./build/script/postBuild.ts",
     "build:no-cache": "pnpm clean:cache && npm run build",
     "report": "cross-env REPORT=true npm run build",
     "type:check": "vue-tsc --noEmit --skipLibCheck",