Merge remote-tracking branch 'origin/develop' into local-test
All checks were successful
CI / Docker-Build (push) Successful in 2m59s
All checks were successful
CI / Docker-Build (push) Successful in 2m59s
This commit is contained in:
commit
309d97d9c8
@ -10,9 +10,9 @@
|
|||||||
"format": "prettier --write \"**/*.{js,ts,vue,scss,html,md,json}\" --ignore-path .gitignore",
|
"format": "prettier --write \"**/*.{js,ts,vue,scss,html,md,json}\" --ignore-path .gitignore",
|
||||||
"test": "echo \"No test specified\" && exit 0",
|
"test": "echo \"No test specified\" && exit 0",
|
||||||
"dev": "quasar dev",
|
"dev": "quasar dev",
|
||||||
"build": "set NODE_ENV=local_test&&quasar build",
|
"build": "set URL_ENV=local_test&&quasar build",
|
||||||
"build:test": "set NODE_ENV=test&&quasar build",
|
"build:test": "set URL_ENV=test&&quasar build",
|
||||||
"build:publish": "set NODE_ENV=publish&&quasar build",
|
"build:publish": "set URL_ENV=publish&&quasar build",
|
||||||
"protoc": "node scripts/proto.cjs",
|
"protoc": "node scripts/proto.cjs",
|
||||||
"sync": "node scripts/sync.cjs"
|
"sync": "node scripts/sync.cjs"
|
||||||
},
|
},
|
||||||
|
@ -1,10 +1,10 @@
|
|||||||
function getHost(): string {
|
function getHost(): string {
|
||||||
console.log(process.env.ENV_MODE, process.env.NODE_ENV, '000');
|
console.log(process.env.ENV_MODE, process.env.URL_ENV, '000');
|
||||||
if (process.env.ENV_MODE == 'test') {
|
if (process.env.URL_ENV == 'test') {
|
||||||
return 'test.joylink.club/bjrtsts-server';
|
return 'test.joylink.club/bjrtsts-server';
|
||||||
} else if (process.env.ENV_MODE == 'publish') {
|
} else if (process.env.URL_ENV == 'publish') {
|
||||||
return 'joylink.club/bjrtsts-server';
|
return 'joylink.club/bjrtsts-server';
|
||||||
} else if (process.env.ENV_MODE == 'local_test') {
|
} else if (process.env.URL_ENV == 'local_test') {
|
||||||
return '192.168.33.233:9091';
|
return '192.168.33.233:9091';
|
||||||
}
|
}
|
||||||
// return '192.168.3.7:9091';
|
// return '192.168.3.7:9091';
|
||||||
|
Loading…
Reference in New Issue
Block a user