Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
yuping
2023-02-16 22:16:26 +08:00
2 changed files with 4 additions and 4 deletions

2
.env
View File

@@ -9,7 +9,7 @@ VUE_APP_PROXY_URL=//43.143.139.204/manageApi
# 登录url # 登录url
VUE_APP_LOGIN_URL=//u-pre.boe.com/web VUE_APP_LOGIN_URL=//u-pre.boe.com/web
# boe域名 # boe域名
VUE_APP_BOE_API_URL=https://u-pre.boe.com VUE_APP_BOE_API_URL=//u-pre.boe.com
#打包路径 #打包路径
VUE_APP_OUTPUT_DIR=./dist VUE_APP_OUTPUT_DIR=./dist

View File

@@ -12,16 +12,16 @@ module.exports = defineConfig({
publicPath: process.env.VUE_APP_BASE, publicPath: process.env.VUE_APP_BASE,
outputDir: process.env.VUE_APP_OUTPUT_DIR, outputDir: process.env.VUE_APP_OUTPUT_DIR,
devServer: { devServer: {
port: 8080, port: 8070,
proxy: { proxy: {
"/manageApi": { "/manageApi": {
target: "http://localhost:30001", target: 'http:' + process.env.VUE_APP_PROXY_URL,
changeOrigin: true, //表示是否改变原域名 changeOrigin: true, //表示是否改变原域名
pathRewrite: { pathRewrite: {
"^/manageApi": "", "^/manageApi": "",
}, },
}, "/userbasic": { }, "/userbasic": {
target: process.env.VUE_APP_BOE_API_URL, target: 'https:' + process.env.VUE_APP_BOE_API_URL,
changeOrigin: true, //表示是否改变原域名 changeOrigin: true, //表示是否改变原域名
}, },
"/systemapi": { "/systemapi": {