From 5f78f6426d2f3f388f9c608361520e231bb06e7f Mon Sep 17 00:00:00 2001 From: chenyao <1219716595@qq.com> Date: Wed, 07 Jan 2026 14:55:00 +0800 Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/jagzwxm/ja_web --- applications/task-work-order/env/.env.production | 16 ----- applications/task-work-order/env/.env | 14 ++++ applications/drone-command/env/.env.production | 16 ----- applications/drone-command/env/.env.test | 18 ----- applications/task-work-order/env/.env.test | 18 ----- applications/drone-command/env/.env.development | 30 --------- applications/drone-command/env/.env | 14 ++++ applications/task-work-order/env/.env.development | 23 +------ 8 files changed, 35 insertions(+), 114 deletions(-) diff --git a/applications/drone-command/env/.env b/applications/drone-command/env/.env new file mode 100644 index 0000000..2fef687 --- /dev/null +++ b/applications/drone-command/env/.env @@ -0,0 +1,14 @@ +#接口地址 +VITE_APP_API=/api + +#页面基础路径 +VITE_APP_BASE=/drone-command + +#天地图token 浏览器端口 +VITE_APP_TDT_TOKEN=e110584a27d506da2740edca951683f4 + +#cesium token +VITE_APP_CESIUM_TOKEN=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiJkYTZlNGNlYS01NTU1LTQ1MGEtYmNlZS0yNTE2NDk5YWM2MjEiLCJpZCI6MTc5Njk2LCJpYXQiOjE3MDA1NDcwMjV9.qcl4AH2731cfFd0-I1ZLUINPXqvglLkDFD-UGR2zU5M + +# 是否在打包时开启压缩，支持 gzip 和 brotli +VITE_BUILD_COMPRESS=gzip diff --git a/applications/drone-command/env/.env.development b/applications/drone-command/env/.env.development index 144e9fc..3225ff7 100644 --- a/applications/drone-command/env/.env.development +++ b/applications/drone-command/env/.env.development @@ -1,29 +1,13 @@ -### - # @Author : yuan - # @Date : 2026-01-06 09:47:05 - # @LastEditors : yuan - # @LastEditTime : 2026-01-07 10:54:42 - # @FilePath : \applications\drone-command\env\.env.development - # @Description : - # Copyright 2026 OBKoro1, All Rights Reserved. - # 2026-01-06 09:47:05 -### NODE_ENV = 'development' #开发环境配置 VITE_APP_ENV = 'development' -#接口地址 -VITE_APP_API=/api -#页面基础路径 -VITE_APP_BASE=/drone-command - -# 服务地址 +#开发环境代理地址（推荐本地新建文件 .env.development.local 来进行覆盖） # VITE_APP_URL = https://wrj.shuixiongit.com/api -#VITE_APP_URL= http://192.168.1.168 VITE_APP_URL= http://192.168.1.33:81 -# VITE_APP_URL= http://192.168.1.204 + #新大屏地址 VITE_APP_DASHBOARD_URL = 'https://wrj.shuixiongit.com/command-center-dashboard/' @@ -42,16 +26,6 @@ VITE_APP_REGION_URL = https://wrj.shuixiongit.com/aiskyminio/cloud-bucket/ztzf_region # 算法仓库图片地址 VITE_APP_PICTURE_URL = https://wrj.shuixiongit.com/aiskyminio/cloud-bucket - -# 是否在打包时开启压缩，支持 gzip 和 brotli -VITE_BUILD_COMPRESS = gzip - -#页面基础路径 -# VITE_APP_BASE_COMMAND = /drone-command/ - -#天地图token 浏览器端口 -VITE_APP_TDT_TOKEN = e110584a27d506da2740edca951683f4 -VITE_APP_CESIUM_TOKEN = eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiJkYTZlNGNlYS01NTU1LTQ1MGEtYmNlZS0yNTE2NDk5YWM2MjEiLCJpZCI6MTc5Njk2LCJpYXQiOjE3MDA1NDcwMjV9.qcl4AH2731cfFd0-I1ZLUINPXqvglLkDFD-UGR2zU5M # 设备ip地址 VITE_APP_DEVICE_IP = '139.196.74.78:1883' diff --git a/applications/drone-command/env/.env.production b/applications/drone-command/env/.env.production index 4123f09..0e9c292 100644 --- a/applications/drone-command/env/.env.production +++ b/applications/drone-command/env/.env.production @@ -4,14 +4,6 @@ #生产环境配置 VITE_APP_ENV = 'production' -#接口地址 -#填写前缀 [/api] 需要用nginx进行反向代理 -#填写地址 [https://api.bladex.cn] 只需要保证接口支持跨域即可, 无需再做代理 -VITE_APP_API=/api - -#页面基础路径 -VITE_APP_BASE=/drone-command - # 服务地址 VITE_APP_URL = https://aisky.org.cn/api @@ -35,14 +27,6 @@ # 行政区划存放地址 VITE_APP_REGION_URL = https://wrj.shuixiongit.com/aiskyminio/cloud-bucket/ztzf_region -# 是否在打包时开启压缩，支持 gzip 和 brotli -VITE_BUILD_COMPRESS = gzip - -#页面基础路径 -# VITE_APP_BASE_COMMAND = /drone-command/ -#天地图token 浏览器端口 -VITE_APP_TDT_TOKEN = e110584a27d506da2740edca951683f4 -VITE_APP_CESIUM_TOKEN = eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiJkYTZlNGNlYS01NTU1LTQ1MGEtYmNlZS0yNTE2NDk5YWM2MjEiLCJpZCI6MTc5Njk2LCJpYXQiOjE3MDA1NDcwMjV9.qcl4AH2731cfFd0-I1ZLUINPXqvglLkDFD-UGR2zU5M # 设备ip地址 VITE_APP_DEVICE_IP = '101.132.85.201:1883' diff --git a/applications/drone-command/env/.env.test b/applications/drone-command/env/.env.test index 55f3d65..4600bb8 100644 --- a/applications/drone-command/env/.env.test +++ b/applications/drone-command/env/.env.test @@ -3,16 +3,9 @@ #开发环境配置 VITE_APP_ENV = 'test' -#接口地址 -VITE_APP_API=/api - -#页面基础路径 -VITE_APP_BASE=/drone-command - # 服务地址 VITE_APP_URL = https://wrj.shuixiongit.com/api -#VITE_APP_URL= http://192.168.1.168 rjg -#VITE_APP_URL= http://192.168.1.33 + #新大屏地址 VITE_APP_DASHBOARD_URL = 'https://wrj.shuixiongit.com/command-center-dashboard/' @@ -33,15 +26,6 @@ # 行政区划存放地址 VITE_APP_REGION_URL = https://wrj.shuixiongit.com/aiskyminio/cloud-bucket/ztzf_region -# 是否在打包时开启压缩，支持 gzip 和 brotli -VITE_BUILD_COMPRESS = gzip - -#页面基础路径 -# VITE_APP_BASE_COMMAND = /drone-command/ - -#天地图token 浏览器端口 -VITE_APP_TDT_TOKEN = e110584a27d506da2740edca951683f4 -VITE_APP_CESIUM_TOKEN = eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiJkYTZlNGNlYS01NTU1LTQ1MGEtYmNlZS0yNTE2NDk5YWM2MjEiLCJpZCI6MTc5Njk2LCJpYXQiOjE3MDA1NDcwMjV9.qcl4AH2731cfFd0-I1ZLUINPXqvglLkDFD-UGR2zU5M # 设备ip地址 VITE_APP_DEVICE_IP = '139.196.74.78:1883' diff --git a/applications/task-work-order/env/.env b/applications/task-work-order/env/.env new file mode 100644 index 0000000..f541bd6 --- /dev/null +++ b/applications/task-work-order/env/.env @@ -0,0 +1,14 @@ +#接口地址 +VITE_APP_API=/api + +#页面基础路径 +VITE_APP_BASE=/task-work-order + +#天地图token 浏览器端口 +VITE_APP_TDT_TOKEN=e110584a27d506da2740edca951683f4 + +#cesium token +VITE_APP_CESIUM_TOKEN=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiJkYTZlNGNlYS01NTU1LTQ1MGEtYmNlZS0yNTE2NDk5YWM2MjEiLCJpZCI6MTc5Njk2LCJpYXQiOjE3MDA1NDcwMjV9.qcl4AH2731cfFd0-I1ZLUINPXqvglLkDFD-UGR2zU5M + +# 是否在打包时开启压缩，支持 gzip 和 brotli +VITE_BUILD_COMPRESS=gzip diff --git a/applications/task-work-order/env/.env.development b/applications/task-work-order/env/.env.development index 58f8649..5efa25f 100644 --- a/applications/task-work-order/env/.env.development +++ b/applications/task-work-order/env/.env.development @@ -3,17 +3,10 @@ #开发环境配置 VITE_APP_ENV = 'development' -#接口地址 -VITE_APP_API=/api +#开发环境代理地址（推荐本地新建文件 .env.development.local 来进行覆盖） +# VITE_APP_URL = https://wrj.shuixiongit.com/api +VITE_APP_URL= http://192.168.1.33:81 -#页面基础路径 -VITE_APP_BASE=/task-work-order - -# 服务地址 -VITE_APP_URL = https://wrj.shuixiongit.com/api -#VITE_APP_URL= http://192.168.1.168 -# VITE_APP_URL= http://192.168.1.33 -#VITE_APP_URL= http://192.168.1.204 #新大屏地址 VITE_APP_DASHBOARD_URL = 'https://wrj.shuixiongit.com/command-center-dashboard/' @@ -32,16 +25,6 @@ VITE_APP_REGION_URL = https://wrj.shuixiongit.com/aiskyminio/cloud-bucket/ztzf_region # 算法仓库图片地址 VITE_APP_PICTURE_URL = https://wrj.shuixiongit.com/aiskyminio/cloud-bucket - -# 是否在打包时开启压缩，支持 gzip 和 brotli -VITE_BUILD_COMPRESS = gzip - -#页面基础路径 -# VITE_APP_BASE_COMMAND = /drone-web-manage/ - -#天地图token 浏览器端口 -VITE_APP_TDT_TOKEN = e110584a27d506da2740edca951683f4 -VITE_APP_CESIUM_TOKEN = eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiJkYTZlNGNlYS01NTU1LTQ1MGEtYmNlZS0yNTE2NDk5YWM2MjEiLCJpZCI6MTc5Njk2LCJpYXQiOjE3MDA1NDcwMjV9.qcl4AH2731cfFd0-I1ZLUINPXqvglLkDFD-UGR2zU5M # 设备ip地址 VITE_APP_DEVICE_IP = '139.196.74.78:1883' diff --git a/applications/task-work-order/env/.env.production b/applications/task-work-order/env/.env.production index 4567778..0e9c292 100644 --- a/applications/task-work-order/env/.env.production +++ b/applications/task-work-order/env/.env.production @@ -4,14 +4,6 @@ #生产环境配置 VITE_APP_ENV = 'production' -#接口地址 -#填写前缀 [/api] 需要用nginx进行反向代理 -#填写地址 [https://api.bladex.cn] 只需要保证接口支持跨域即可, 无需再做代理 -VITE_APP_API=/api - -#页面基础路径 -VITE_APP_BASE=/task-work-order - # 服务地址 VITE_APP_URL = https://aisky.org.cn/api @@ -35,14 +27,6 @@ # 行政区划存放地址 VITE_APP_REGION_URL = https://wrj.shuixiongit.com/aiskyminio/cloud-bucket/ztzf_region -# 是否在打包时开启压缩，支持 gzip 和 brotli -VITE_BUILD_COMPRESS = gzip - -#页面基础路径 -# VITE_APP_BASE_COMMAND = /drone-web-manage/ -#天地图token 浏览器端口 -VITE_APP_TDT_TOKEN = e110584a27d506da2740edca951683f4 -VITE_APP_CESIUM_TOKEN = eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiJkYTZlNGNlYS01NTU1LTQ1MGEtYmNlZS0yNTE2NDk5YWM2MjEiLCJpZCI6MTc5Njk2LCJpYXQiOjE3MDA1NDcwMjV9.qcl4AH2731cfFd0-I1ZLUINPXqvglLkDFD-UGR2zU5M # 设备ip地址 VITE_APP_DEVICE_IP = '101.132.85.201:1883' diff --git a/applications/task-work-order/env/.env.test b/applications/task-work-order/env/.env.test index 2ebce81..4600bb8 100644 --- a/applications/task-work-order/env/.env.test +++ b/applications/task-work-order/env/.env.test @@ -3,16 +3,9 @@ #开发环境配置 VITE_APP_ENV = 'test' -#接口地址 -VITE_APP_API=/api - -#页面基础路径 -VITE_APP_BASE=/task-work-order - # 服务地址 VITE_APP_URL = https://wrj.shuixiongit.com/api -#VITE_APP_URL= http://192.168.1.168 rjg -#VITE_APP_URL= http://192.168.1.33 + #新大屏地址 VITE_APP_DASHBOARD_URL = 'https://wrj.shuixiongit.com/command-center-dashboard/' @@ -33,15 +26,6 @@ # 行政区划存放地址 VITE_APP_REGION_URL = https://wrj.shuixiongit.com/aiskyminio/cloud-bucket/ztzf_region -# 是否在打包时开启压缩，支持 gzip 和 brotli -VITE_BUILD_COMPRESS = gzip - -#页面基础路径 -# VITE_APP_BASE_COMMAND = /drone-web-manage/ - -#天地图token 浏览器端口 -VITE_APP_TDT_TOKEN = e110584a27d506da2740edca951683f4 -VITE_APP_CESIUM_TOKEN = eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiJkYTZlNGNlYS01NTU1LTQ1MGEtYmNlZS0yNTE2NDk5YWM2MjEiLCJpZCI6MTc5Njk2LCJpYXQiOjE3MDA1NDcwMjV9.qcl4AH2731cfFd0-I1ZLUINPXqvglLkDFD-UGR2zU5M # 设备ip地址 VITE_APP_DEVICE_IP = '139.196.74.78:1883' -- Gitblit v1.9.3