From c3fc0c18e64174f58839efd9174be2cf54094638 Mon Sep 17 00:00:00 2001 From: tiger_zhou Date: Tue, 21 May 2024 16:46:53 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8C=97=E4=BA=AC?= =?UTF-8?q?=E7=8E=B0=E5=9C=BA=E6=89=93=E5=8C=85=E8=84=9A=E6=9C=AC=E5=8F=8A?= =?UTF-8?q?=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 1 + src/configs/UrlManage.ts | 10 ++++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 02dfac9..3b80257 100644 --- a/package.json +++ b/package.json @@ -12,6 +12,7 @@ "dev": "quasar dev", "build": "quasar build", "build:local": "URL_ENV=local_test quasar build", + "build:local-pxf": "URL_ENV=local_pxf quasar build", "build:test": "URL_ENV=test quasar build", "build:publish": "URL_ENV=publish quasar build", "protoc": "node scripts/proto.cjs", diff --git a/src/configs/UrlManage.ts b/src/configs/UrlManage.ts index 19a909f..65324f1 100644 --- a/src/configs/UrlManage.ts +++ b/src/configs/UrlManage.ts @@ -5,7 +5,11 @@ function getHost(): string { return 'joylink.club/bjrtsts-server'; } else if (process.env.URL_ENV == 'local_test') { return '192.168.33.233:9091'; + }else if(process.env.URL_ENV == 'local_pxf'){ + //北京现场 + return '172.29.5.168/bjrtss-server' } + // return '192.168.3.7:9091'; // return '192.168.3.47:9091'; // return '192.168.3.37:9091'; @@ -13,7 +17,7 @@ function getHost(): string { // return '192.168.33.93:9091'; // return '192.168.3.37:9091'; //卫志宏 // return 'test.joylink.club/bjrtsts-service'; // 测试 - return '192.168.33.233:9091'; + return '127.0.0.1:9091'; } export function getHttpBase() { @@ -26,7 +30,7 @@ export function getHttpBase() { export function getWebsocketUrl() { let protocol = 'ws'; - let host = '192.168.33.233'; + let host = '127.0.0.1'; // let host = 'test.joylink.club'; let port = '8083'; let url = `${protocol}://${host}:${port}`; @@ -42,6 +46,8 @@ export function getWebsocketUrl() { url = `${protocol}://${host}`; } else if (process.env.URL_ENV == 'local_test') { host = '192.168.33.233'; + } else if (process.env.URL_ENV == 'local_pxf') { + host = '172.29.5.168'; } return `${url}/mqtt`; From d8600d9460a9d5ceb5dc7e4d21cef180951813f6 Mon Sep 17 00:00:00 2001 From: tiger_zhou Date: Tue, 21 May 2024 17:28:27 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8C=97=E4=BA=AC?= =?UTF-8?q?=E7=8E=B0=E5=9C=BA=E6=89=93=E5=8C=85=E8=84=9A=E6=9C=AC=E5=8F=8A?= =?UTF-8?q?=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/configs/UrlManage.ts | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 3b80257..7a20af7 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "dev": "quasar dev", "build": "quasar build", "build:local": "URL_ENV=local_test quasar build", - "build:local-pxf": "URL_ENV=local_pxf quasar build", + "build:pxf": "URL_ENV=local_pxf quasar build", "build:test": "URL_ENV=test quasar build", "build:publish": "URL_ENV=publish quasar build", "protoc": "node scripts/proto.cjs", diff --git a/src/configs/UrlManage.ts b/src/configs/UrlManage.ts index 65324f1..b5dfc18 100644 --- a/src/configs/UrlManage.ts +++ b/src/configs/UrlManage.ts @@ -7,6 +7,7 @@ function getHost(): string { return '192.168.33.233:9091'; }else if(process.env.URL_ENV == 'local_pxf'){ //北京现场 + return '172.29.5.168/bjrtss-server' }