Merge branch 'pr1229' into dev
This commit is contained in:
commit
871dc051d7
1
webapp/.gitignore
vendored
1
webapp/.gitignore
vendored
@ -13,6 +13,7 @@ dist
|
||||
dist-ssr
|
||||
coverage
|
||||
*.local
|
||||
vite.user.ts
|
||||
|
||||
/cypress/videos/
|
||||
/cypress/screenshots/
|
||||
|
||||
@ -9,6 +9,14 @@ import VueI18nPlugin from '@intlify/unplugin-vue-i18n/vite'
|
||||
|
||||
const path = require('path')
|
||||
|
||||
// example 'vite.user.ts': export const proxy_target = '192.168.16.107'
|
||||
let proxy_target;
|
||||
try {
|
||||
proxy_target = require('./vite.user.ts').proxy_target;
|
||||
} catch (error) {
|
||||
proxy_target = '192.168.178.87';
|
||||
}
|
||||
|
||||
// https://vitejs.dev/config/
|
||||
export default defineConfig({
|
||||
plugins: [
|
||||
@ -52,15 +60,15 @@ export default defineConfig({
|
||||
server: {
|
||||
proxy: {
|
||||
'^/api': {
|
||||
target: 'http://192.168.20.110/'
|
||||
target: 'http://' + proxy_target
|
||||
},
|
||||
'^/livedata': {
|
||||
target: 'ws://192.168.20.110/',
|
||||
target: 'ws://' + proxy_target,
|
||||
ws: true,
|
||||
changeOrigin: true
|
||||
},
|
||||
'^/console': {
|
||||
target: 'ws://192.168.20.110/',
|
||||
target: 'ws://' + proxy_target,
|
||||
ws: true,
|
||||
changeOrigin: true
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user