From 5442e55d63e455ce0601c7f759543d5f1337c3e9 Mon Sep 17 00:00:00 2001 From: xuhuajiao <13476289682@163.com> Date: Tue, 30 Apr 2024 15:56:01 +0800 Subject: [PATCH] =?UTF-8?q?0430=E9=9C=80=E6=B1=82=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 11 +++--- .env.production | 6 ++++ public/index.html | 31 ++++++++--------- public/static/config.js | 9 +++++ src/assets/styles/yxk-admin.scss | 2 +- src/store/modules/api.js | 57 ++++++++++++++++---------------- src/utils/request.js | 3 +- src/views/system/role/index.vue | 6 ++-- 8 files changed, 70 insertions(+), 55 deletions(-) create mode 100644 public/static/config.js diff --git a/.env.development b/.env.development index 3137c52..739e89d 100644 --- a/.env.development +++ b/.env.development @@ -6,15 +6,12 @@ ENV = 'development' # VUE_APP_BASE_API = 'http://192.168.99.107:7077' # VUE_APP_WS_API = 'ws://192.168.99.107:7077' VUE_APP_CAMERA_API = '192.168.99.107:3000' -# VUE_APP_BASE_API = 'http://192.168.99.107:7070' -# VUE_APP_WS_API = 'ws://192.168.99.107:7070' +VUE_APP_BASE_API = 'http://192.168.99.107:7070' +VUE_APP_WS_API = 'ws://192.168.99.107:7070' # 许镇-本地服地址 -#VUE_APP_BASE_API = 'http://192.168.99.84:7070' -#VUE_APP_WS_API = 'ws://192.168.99.84:7070' - -VUE_APP_BASE_API = 'http://192.168.99.67:7070' -VUE_APP_WS_API = 'ws://192.168.99.67:7070' +#VUE_APP_BASE_API = 'http://192.168.99.67:7070' +#VUE_APP_WS_API = 'ws://192.168.99.67:7070' # 是否启用 babel-plugin-dynamic-import-node插件 diff --git a/.env.production b/.env.production index 6bda747..a23ca8f 100644 --- a/.env.production +++ b/.env.production @@ -3,7 +3,13 @@ ENV = 'production' # 如果使用 Nginx 代理后端接口，那么此处需要改为 '/'，文件查看 Docker 部署篇，Nginx 配置 # 接口地址，注意协议，如果你没有配置 ssl，需要将 https 改为 http # VUE_APP_BASE_API = 'https://openapitest.aiyxlib.com' +# 火箭军 VUE_APP_BASE_API = 'http://192.168.1.100:7070' +# VUE_APP_BASE_API = 'http://192.168.99.107:7070' # 如果接口是 http 形式， wss 需要改为 ws +# 火箭军 VUE_APP_WS_API = 'ws://192.168.1.100:7071' VUE_APP_CAMERA_API = '192.168.1.100:3000' +# VUE_APP_WS_API = 'ws://192.168.99.107:7071' +# VUE_APP_CAMERA_API = '192.168.1.107:3000' + diff --git a/public/index.html b/public/index.html index 294da2d..789283f 100644 --- a/public/index.html +++ b/public/index.html @@ -1,15 +1,16 @@ - - - - - - - - - <%= webpackConfig.name %> - - -
- - - + + + + + + + + + <%= webpackConfig.name %> + + + +
+ + + diff --git a/public/static/config.js b/public/static/config.js new file mode 100644 index 0000000..62ca3b6 --- /dev/null +++ b/public/static/config.js @@ -0,0 +1,9 @@ +window.g = { + AXIOS_TIMEOUT: 10000, + ApiUrl: 'http://192.168.1.100:7070', // 配置服务器地址, + // ParentPage: { // 后续看需求配置 + // CrossDomainProxyUrl: '/Home/CrossDomainProxy', + // BtnsApi: '/api/services/app/Authorization/GetBtns', + // OrgsApi: '/api/services/app/authorization/GetOrgsByUserId' + // }, +} \ No newline at end of file diff --git a/src/assets/styles/yxk-admin.scss b/src/assets/styles/yxk-admin.scss index 29297f0..1dc4aac 100644 --- a/src/assets/styles/yxk-admin.scss +++ b/src/assets/styles/yxk-admin.scss @@ -516,7 +516,7 @@ content: ""; width: 134px; height: 63px; - z-index: 99; + z-index: 101; } &::before{ left: -6px; diff --git a/src/store/modules/api.js b/src/store/modules/api.js index f65785e..2698684 100644 --- a/src/store/modules/api.js +++ b/src/store/modules/api.js @@ -1,28 +1,29 @@ -// 适配 Nginx 反向代理 -const baseUrl = process.env.VUE_APP_BASE_API === '/' ? '' : process.env.VUE_APP_BASE_API -const api = { - state: { - // 部署包上传 - deployUploadApi: baseUrl + '/api/deploy/upload', - // SQL脚本上传 - databaseUploadApi: baseUrl + '/api/database/upload', - // 实时控制台 - socketApi: baseUrl + '/websocket?token=kl', - // 图片上传 - imagesUploadApi: baseUrl + '/api/localStorage/pictures', - // 修改头像 - updateAvatarApi: baseUrl + '/api/users/updateAvatar', - // 上传文件到七牛云 - qiNiuUploadApi: baseUrl + '/api/qiNiuContent', - // Sql 监控 - sqlApi: baseUrl + '/druid/index.html', - // swagger - swaggerApi: baseUrl + '/swagger-ui.html', - // 文件上传 - fileUploadApi: baseUrl + '/api/localStorage', - // baseUrl， - baseApi: baseUrl - } -} - -export default api +// 适配 Nginx 反向代理 +// const baseUrl = process.env.VUE_APP_BASE_API === '/' ? '' : process.env.VUE_APP_BASE_API +const baseUrl = process.env.NODE_ENV === 'production' ? window.g.ApiUrl : process.env.VUE_APP_BASE_API +const api = { + state: { + // 部署包上传 + deployUploadApi: baseUrl + '/api/deploy/upload', + // SQL脚本上传 + databaseUploadApi: baseUrl + '/api/database/upload', + // 实时控制台 + socketApi: baseUrl + '/websocket?token=kl', + // 图片上传 + imagesUploadApi: baseUrl + '/api/localStorage/pictures', + // 修改头像 + updateAvatarApi: baseUrl + '/api/users/updateAvatar', + // 上传文件到七牛云 + qiNiuUploadApi: baseUrl + '/api/qiNiuContent', + // Sql 监控 + sqlApi: baseUrl + '/druid/index.html', + // swagger + swaggerApi: baseUrl + '/swagger-ui.html', + // 文件上传 + fileUploadApi: baseUrl + '/api/localStorage', + // baseUrl， + baseApi: baseUrl + } +} + +export default api diff --git a/src/utils/request.js b/src/utils/request.js index d47f7e6..c601849 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -10,7 +10,8 @@ import { reject } from 'core-js/fn/promise' // 创建axios实例 const service = axios.create({ - baseURL: process.env.NODE_ENV === 'production' ? process.env.VUE_APP_BASE_API : '/', // api 的 base_url + baseURL: process.env.NODE_ENV === 'production' ? window.g.ApiUrl : '/', // api 的 base_url + // baseURL: process.env.NODE_ENV === 'production' ? process.env.VUE_APP_BASE_API : '/', // api 的 base_url // baseURL: process.env.NODE_ENV === 'production' ? 'http://192.168.99.84:7070' : '/', // api 的 base_url timeout: Config.timeout // 请求超时时间 diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue index e9cf3f0..5ee8bbd 100644 --- a/src/views/system/role/index.vue +++ b/src/views/system/role/index.vue @@ -64,10 +64,10 @@ - - + - +