diff --git a/config/environments/.env.prod b/config/environments/.env.prod index ee52bb7e8..520a11a4f 100644 --- a/config/environments/.env.prod +++ b/config/environments/.env.prod @@ -1,3 +1,3 @@ NODE_ENV = 'production' VUE_APP_MODE = 'production' -VUE_APP_API_URL = 'https://prod.xxx.com/apis' \ No newline at end of file +VUE_APP_API_URL = 'http://dc3-gateway:8000' \ No newline at end of file diff --git a/config/index.js b/config/index.js index 57e6a9520..2fc3c9640 100644 --- a/config/index.js +++ b/config/index.js @@ -31,11 +31,11 @@ const args = require('minimist')(rawArgv, { 'verbose' ] }); -const command = args._[0]; const dotenv = require("dotenv"); const dotenvExpand = require("dotenv-expand"); const path = require("path"); +const command = args._[0]; const env = args.env || "dev"; loadEnv(env); @@ -59,10 +59,10 @@ function loadEnv(env) { path: localPath, debug: process.env.DEBUG, }); - dotenvExpand(localEnvConfig); + dotenvExpand.expand(localEnvConfig); // 加载env文件 const envConfig = dotenv.config({path: envPath, debug: process.env.DEBUG}); - dotenvExpand(envConfig); + dotenvExpand.expand(envConfig); } catch (err) { // 忽略文件不存在错误 if (err.toString().indexOf("ENOENT") < 0) { diff --git a/package.json b/package.json index c1d0f2954..ebce6c5b9 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,14 @@ "scripts": { "serve": "vue-cli-service serve", "build": "vue-cli-service build", - "serve:mock": "node ./config serve --env mock" + "serve:dev": "node ./config serve --env dev", + "serve:test": "node ./config serve --env test", + "serve:mock": "node ./config serve --env mock", + "serve:prod": "node ./config serve --env prod", + "build:dev": "node ./config build --env dev", + "build:test": "node ./config build --env test", + "build:mock": "node ./config build --env mock", + "build:prod": "node ./config build --env prod" }, "dependencies": { "axios": "^0.24.0", @@ -27,7 +34,10 @@ "vue-highlightjs": "^1.3.3", "vue-router": "^3.5.3", "vue-sparklines": "^0.2.1", - "vuex": "^3.6.2" + "vuex": "^3.6.2", + "dotenv": "latest", + "dotenv-expand": "latest", + "minimist": "latest" }, "devDependencies": { "@vue/cli-shared-utils": "latest", @@ -39,10 +49,7 @@ "sass-loader": "^8.0.2", "vue-cli-plugin-element": "^1.0.1", "vue-template-compiler": "^2.6.14", - "webpack": "^5.0.0", - "dotenv": "latest", - "dotenv-expand": "latest", - "minimist": "latest" + "webpack": "^5.0.0" }, "browserslist": [ "> 1%", diff --git a/vue.config.js b/vue.config.js index 0aa494165..99f1d8738 100644 --- a/vue.config.js +++ b/vue.config.js @@ -5,7 +5,7 @@ module.exports = { devServer: { proxy: { '/api': { - target: 'http://dc3-gateway:8000', + target: process.env.VUE_APP_API_URL, changeOrigin: true, ws: true, pathRewrite: { diff --git a/yarn.lock b/yarn.lock index 111577272..f5ab6dac0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5860,12 +5860,7 @@ minimatch@^3.0.4, minimatch@~3.0.2: dependencies: brace-expansion "^1.1.7" -minimist@^1.1.3, minimist@^1.2.0, minimist@^1.2.5: - version "1.2.5" - resolved "https://registry.npmmirror.com/minimist/download/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" - integrity sha1-Z9ZgFLZqaoqqDAg8X9WN9OTpdgI= - -minimist@latest: +minimist@^1.1.3, minimist@^1.2.0, minimist@^1.2.5, minimist@latest: version "1.2.5" resolved "https://pkgs.d.xiaomi.net:443/artifactory/api/npm/mi-npm/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" integrity sha1-Z9ZgFLZqaoqqDAg8X9WN9OTpdgI=