Revert "Chore/dot env" (#167)

lihuacai168 · Jan 30, 2024 · 65c5d08 · 65c5d08
1 parent dc124f3
commit 65c5d08
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 15 deletions.
diff --git a/web/build/webpack.dev.conf.js b/web/build/webpack.dev.conf.js
@@ -82,11 +82,10 @@ module.exports = new Promise((resolve, reject) => {
       // add port to devServer config
       devWebpackConfig.devServer.port = port
 
-        const baseUrl = `http://${devWebpackConfig.devServer.host}:${port}`
       // Add FriendlyErrorsPlugin
       devWebpackConfig.plugins.push(new FriendlyErrorsPlugin({
         compilationSuccessInfo: {
-          messages: [`Your application is running here: ${baseUrl}`],
+          messages: [`Your application is running here: http://${devWebpackConfig.devServer.host}:${port}/fastrunner/login`],
         },
         onErrors: config.dev.notifyOnErrors
         ? utils.createNotifierCallback()

diff --git a/web/config/dev.env.js b/web/config/dev.env.js
@@ -2,8 +2,6 @@
 const merge = require('webpack-merge')
 const prodEnv = require('./prod.env')
 const FasterRunner = process.env.FasterRunner ? process.env.FasterRunner : "Another FasterRunner"
-const API_URL = process.env.VUE_APP_API_URL ? process.env.VUE_APP_API_URL : ""
-console.log("API_URL: " + API_URL)
 module.exports = merge(prodEnv, {
     NODE_ENV: '"development"',
     FasterRunner: "'" + FasterRunner + "'"

diff --git a/web/config/prod.env.js b/web/config/prod.env.js
@@ -1,7 +1,6 @@
 'use strict'
-require('dotenv').config()
 const FasterRunner = process.env.FasterRunner ? process.env.FasterRunner : "Another FasterRunner"
-const API_URL = process.env.VUE_APP_API_URL ? process.env.VUE_APP_API_URL : ""
+const API_URL = process.env.API_URL ? process.env.API_URL : ""
 console.log('process args: ' + process.argv)
 console.log('get env from env API_URL: ' + API_URL)
 module.exports = {

diff --git a/web/package.json b/web/package.json
@@ -15,7 +15,6 @@
     "axios": "^0.18.0",
     "babel-preset-es2015": "^6.24.1",
     "brace": "^0.11.1",
-    "dotenv": "^16.4.1",
     "element-ui": "2.15.13",
     "sass-loader": "^11.0.1",
     "v-jsoneditor": "^1.4.4",

diff --git a/web/src/restful/api.js b/web/src/restful/api.js
@@ -20,9 +20,7 @@ import {Message} from 'element-ui';
 // }
 
 axios.defaults.withCredentials = true;
-axios.defaults.baseURL = process.env.VUE_APP_API_URL || "http://localhost:8000";
-
-console.log(`get env from .env VUE_APP_API_URL: ${JSON.stringify(process.env)}`)
+// axios.defaults.baseURL = baseUrl;
 
 const err_msg_duration = 2000 // ms
 

diff --git a/web/yarn.lock b/web/yarn.lock
@@ -2546,11 +2546,6 @@ dot-prop@^5.2.0:
   dependencies:
     is-obj "^2.0.0"
 
-dotenv@^16.4.1:
-  version "16.4.1"
-  resolved "https://registry.npmmirror.com/dotenv/-/dotenv-16.4.1.tgz#1d9931f1d3e5d2959350d1250efab299561f7f11"
-  integrity sha512-CjA3y+Dr3FyFDOAMnxZEGtnW9KBR2M0JvvUtXNW+dYJL5ROWxP9DUHCwgFqpMk0OXCc0ljhaNTr2w/kutYIcHQ==
-
 duplexer@^0.1.2:
   version "0.1.2"
   resolved "https://registry.npmmirror.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6"