diff --git a/.env.staging b/.env.staging index 199883e..d0a3f69 100644 --- a/.env.staging +++ b/.env.staging @@ -1,22 +1,19 @@ # 页面标题 -VUE_APP_TITLE = 青蛙智慧农业 +VUE_APP_TITLE = 数字农业平台 -NODE_ENV = production - -# 测试环境配置 +# 生产环境配置 ENV = 'staging' -# 智慧农业智能控制系统/测试环境 +# 智慧农业智能控制系统/生产环境 VUE_APP_BASE_API = '/stage-api' # EMQX接口账号(后端地址和EMQX接口地址部署时,通过nginx配置代理) VUE_APP_EMQX_API_USER_NAME = 'admin' -VUE_APP_EMQX_API_PASSWORD = 'public' +VUE_APP_EMQX_API_PASSWORD = 'sznyb@2025' -# EMQX消息服务器连接地址 -VUE_APP_EMQX_SERVER_URL = 'ws://localhost:8083/mqtt' +# EMQX消息服务器连接地址,使用空字符串则会自动获取服务器地址 +VUE_APP_EMQX_SERVER_URL = 'ws://47.117.148.147:8083/mqtt' # 高德地图参数 -VUE_APP_GAO_DE_SECURITYJSCODE = 'nAtaBg9FYzav6c8P9rF9qXXXXXX' -VUE_APP_GAO_DE_KEY = '7f59a099e2a0a0c9b360d35fed10af19' - +VUE_APP_GAO_DE_SECURITYJSCODE = '77ef0c4c95553799630ad60dd9b692d7' +VUE_APP_GAO_DE_KEY = '661ce1b2c811daca029685d9ae25ee6d' diff --git a/package.json b/package.json index 0e7f6e6..16b4c0f 100644 --- a/package.json +++ b/package.json @@ -6,8 +6,8 @@ "license": "GPL3.0", "scripts": { "dev": "vue-cli-service serve", - "build:prod": "vue-cli-service build", - "build:stage": "vue-cli-service build --mode staging", + "build": "vue-cli-service build", + "test": "vue-cli-service build --mode staging", "preview": "node build/index.js --preview", "format": "prettier --write 'src/**/*.{vue,ts,tsx,js,jsx,css,less,scss,json,md}'", "lint": "eslint --ext .js,.vue src" diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue index 1a9366d..ea132b1 100644 --- a/src/components/FileUpload/index.vue +++ b/src/components/FileUpload/index.vue @@ -74,7 +74,7 @@ export default { data() { return { baseUrl: process.env.VUE_APP_BASE_API, - uploadFileUrl: process.env.VUE_APP_BASE_API + '/iot/tool/upload', // 上传文件服务器地址 + uploadFileUrl: process.env.VUE_APP_BASE_API + '/common/upload', // 上传文件服务器地址 headers: { Authorization: 'Bearer ' + getToken(), }, diff --git a/src/components/ImageUpload/index.vue b/src/components/ImageUpload/index.vue index 13a8286..bbae7f9 100644 --- a/src/components/ImageUpload/index.vue +++ b/src/components/ImageUpload/index.vue @@ -94,7 +94,7 @@ export default { dialogVisible: false, hideUpload: false, baseUrl: process.env.VUE_APP_BASE_API, - uploadImgUrl: process.env.VUE_APP_BASE_API + '/iot/tool/upload', // 上传的图片服务器地址 + uploadImgUrl: process.env.VUE_APP_BASE_API + '/common/upload', // 上传的图片服务器地址 headers: { Authorization: 'Bearer ' + getToken(), }, diff --git a/src/views/iot/product/product-firmware.vue b/src/views/iot/product/product-firmware.vue index ce78e13..99946d5 100644 --- a/src/views/iot/product/product-firmware.vue +++ b/src/views/iot/product/product-firmware.vue @@ -190,7 +190,7 @@ export default { Authorization: 'Bearer ' + getToken(), }, // 上传的地址 - url: process.env.VUE_APP_BASE_API + '/iot/tool/upload', + url: process.env.VUE_APP_BASE_API + '/common/upload', // 上传的文件列表 fileList: [], }, diff --git a/src/views/trace/components/EditPage/Edit/upload.js b/src/views/trace/components/EditPage/Edit/upload.js index 142d995..ea8871e 100644 --- a/src/views/trace/components/EditPage/Edit/upload.js +++ b/src/views/trace/components/EditPage/Edit/upload.js @@ -3,7 +3,7 @@ import request from '@/utils/request'; export default function upload(formData) { return request({ - url: '/iot/tool/upload', + url: '/common/upload', method: 'post', headers: { 'Content-Type': 'multipart/form-data', // 覆盖默认设置