diff --git a/.env.inner b/.env.inner new file mode 100644 index 00000000..3a78ec70 --- /dev/null +++ b/.env.inner @@ -0,0 +1,37 @@ +# 生产环境: 只在打包时使用 +NODE_ENV=production + +VITE_DEV=false + +# 请求路径 +# 【修改点】这里指向内部环境的网关，比如 /admin-api-inner 或者直接留空走相对路径 +VITE_BASE_URL=' ' + +# 文件上传类型: server - 后端上传, client - 前端直连,仅支持S3服务 +VITE_UPLOAD_TYPE=server +# 上传路径 +VITE_UPLOAD_URL=/admin-api/infra/file/upload + +# 接口地址 +# 【修改点】这里改成一个内部域名或IP，例如 http://192.168.1.100:8080 +# 如果前端和后端在同一个 Docker 网络，也可以用内部服务名，比如 http://besure-server-inner:48081 +VITE_API_URL=/admin-api-inner + +# 是否删除debugger +VITE_DROP_DEBUGGER=true + +# 是否删除console.log +VITE_DROP_CONSOLE=true + +# 是否sourcemap (内网环境建议开启，方便排查线上问题，如果想极致压缩也可以false) +VITE_SOURCEMAP=false + +# 打包路径 +VITE_BASE_PATH=/ + +# 输出路径 +VITE_OUT_DIR=dist + +# 商城H5会员端域名 +# 【修改点】内网测试时，这里可能不需要或者指向一个内部H5地址 +VITE_MALL_H5_DOMAIN='http://mall.yudao.test.cn' \ No newline at end of file diff --git a/nginx-inner.conf b/nginx-inner.conf new file mode 100644 index 00000000..1faaca1c --- /dev/null +++ b/nginx-inner.conf @@ -0,0 +1,122 @@ +server { + listen 8088; + server_name localhost; + + # 关键：允许上传最大100MB + client_max_body_size 100m; + + # 超时时间 + proxy_connect_timeout 300s; + proxy_send_timeout 300s; + proxy_read_timeout 300s; + client_body_timeout 300s; + send_timeout 300s; + + # 防止大文件上传被缓冲卡死 + proxy_request_buffering off; + proxy_buffering off; + + # ========== 内网环境特有配置 ========== + + # 如果 inner 环境的后端服务名不同，比如叫 besure-server-inner + # 就把下面的 proxy_pass 改成对应的服务名或IP + location /admin-api-inner/ { + proxy_pass http://besure-server-inner:48081; # 👈 这里改！ + 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_set_header X-Forwarded-Proto $scheme; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + } + + # 如果 inner 环境还需要访问原 /admin-api/，可以保留 + location /admin-api/ { + proxy_pass http://besure-server:48081; # 👈 原生产后端 + 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_set_header X-Forwarded-Proto $scheme; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + } + + # 其他路径保持不变 + location /api/ { + proxy_pass http://besure-server:48081; + 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_set_header X-Forwarded-Proto $scheme; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + } + + location /jmreport/ { + proxy_pass http://besure-server:48081; + 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_set_header X-Forwarded-Proto $scheme; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + } + + location /v3/api-docs/ { + proxy_pass http://besure-server:48081; + 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_set_header X-Forwarded-Proto $scheme; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + } + + location /doc.html { + proxy_pass http://besure-server:48081; + 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_set_header X-Forwarded-Proto $scheme; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + } + + location /swagger-ui/ { + proxy_pass http://besure-server:48081; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + } + + # 处理Swagger静态资源 + location /webjars/ { + proxy_pass http://besure-server:48081; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + } + + # 处理API文档JSON文件 + location ~ /v3/api-docs/.*\.json$ { + proxy_pass http://besure-server:48081; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + } + + # 前端静态资源 + location / { + root /usr/share/nginx/html; + index index.html index.htm; + try_files $uri $uri/ /index.html; + } + + error_page 500 502 503 504 /50x.html; + location = /50x.html { + root /usr/share/nginx/html; + } +} \ No newline at end of file diff --git a/package.json b/package.json index 20da841e..791bcec9 100644 --- a/package.json +++ b/package.json @@ -16,6 +16,7 @@ "build:test": "node --max_old_space_size=6144 ./node_modules/vite/bin/vite.js build --mode test", "build:stage": "node --max_old_space_size=6144 ./node_modules/vite/bin/vite.js build --mode stage", "build:prod": "node --max_old_space_size=6144 ./node_modules/vite/bin/vite.js build --mode prod", + "build:inner": "node --max_old_space_size=6144 ./node_modules/vite/bin/vite.js build --mode inner", "serve:dev": "vite preview --mode dev", "serve:prod": "vite preview --mode prod", "preview": "pnpm build:local && vite preview", @@ -62,11 +63,13 @@ "markmap-view": "^0.16.0", "min-dash": "^4.1.1", "mitt": "^3.0.1", + "node-machine-id": "^1.1.12", "nprogress": "^0.2.0", "pinia": "^2.1.7", "pinia-plugin-persistedstate": "^3.2.1", "qrcode": "^1.5.3", "qs": "^6.12.0", + "socket.io-client": "^4.8.3", "sortablejs": "^1.15.3", "steady-xml": "^0.1.0", "url": "^0.11.3", diff --git a/src/views/mes/deviceledger/detail/editIndex.vue b/src/views/mes/deviceledger/detail/editIndex.vue index 63c2d348..d1ac6f19 100644 --- a/src/views/mes/deviceledger/detail/editIndex.vue +++ b/src/views/mes/deviceledger/detail/editIndex.vue @@ -180,7 +180,6 @@ :file-type="materialFileTypes" :file-size="100" :limit="9" - @uploading-change="handleFileUploadingChange" /> @@ -752,7 +751,7 @@ const materialFileTypes = [ '7z', 'dwg', 'dxf', - 'mp4' + 'mp4', 'avi', 'mov', 'wmv', 'flv', 'mkv', 'webm' ] const formData = ref({ ...initFormData()