区分不同环境

18166454052 · Jul 27, 2019 · 9a37fad · 9a37fad
1 parent 7ba760d
commit 9a37fad
Show file tree

Hide file tree

Showing 17 changed files with 28 additions and 22 deletions.
diff --git a/config/dev.env.js b/config/dev.env.js
@@ -3,5 +3,8 @@ const merge = require('webpack-merge')
 const prodEnv = require('./prod.env')
 
 module.exports = merge(prodEnv, {
-  NODE_ENV: '"development"'
+  NODE_ENV: '"development"',
+  ENV_CONFIG: '"dev"',
+  BASE_API: '"127.0.0.1/7001/"',
+  publicPath: '127.0.0.1:80/',
 })
diff --git a/config/index.js b/config/index.js
@@ -3,7 +3,7 @@
 // see http://vuejs-templates.github.io/webpack for documentation.
 
 const path = require('path')
-
+const publicPath = require('./prod.env.js').publicPath
 module.exports = {
   dev: {
 
@@ -43,7 +43,7 @@ module.exports = {
     // Paths
     assetsRoot: path.resolve(__dirname, '../dist'),
     assetsSubDirectory: 'static',
-    assetsPublicPath: 'http://127.0.0.1:80/dist/',
+    assetsPublicPath: publicPath + 'dist/',
 
     /**
      * Source Maps

diff --git a/config/prod.env.js b/config/prod.env.js
@@ -1,4 +1,7 @@
 'use strict'
 module.exports = {
-  NODE_ENV: '"production"'
+  NODE_ENV: '"production"',
+  ENV_CONFIG: '"prod"',
+  BASE_API: '"http://39.108.15.156:7001/"',
+  publicPath: 'http://127.0.0.1:80/'
 }
diff --git a/dist/index.html b/dist/index.html
@@ -1 +1 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><title>movies</title><link href=http://127.0.0.1:80/dist/static/css/app.aa46c833fbb7a28752d9ef52a4573c9c.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=http://127.0.0.1:80/dist/static/js/manifest.7be29d609369d27a1f05.js></script><script type=text/javascript src=http://127.0.0.1:80/dist/static/js/vendor.2335fd1721f060746153.js></script><script type=text/javascript src=http://127.0.0.1:80/dist/static/js/app.922b1c636ac6e1538691.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=utf-8><title>movies</title><link href=http://127.0.0.1:80/dist/static/css/app.b033e6efa68465c007c436552627592a.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=http://127.0.0.1:80/dist/static/js/manifest.7be29d609369d27a1f05.js></script><script type=text/javascript src=http://127.0.0.1:80/dist/static/js/vendor.7ca0be04407f4d17369e.js></script><script type=text/javascript src=http://127.0.0.1:80/dist/static/js/app.e90240f763b3d63eba3a.js></script></body></html>
diff --git a/dist/static/css/app.aa46c833fbb7a28752d9ef52a4573c9c.css b/dist/static/css/app.aa46c833fbb7a28752d9ef52a4573c9c.css
diff --git a/dist/static/css/app.aa46c833fbb7a28752d9ef52a4573c9c.css.map b/dist/static/css/app.aa46c833fbb7a28752d9ef52a4573c9c.css.map
diff --git a/dist/static/css/app.b033e6efa68465c007c436552627592a.css b/dist/static/css/app.b033e6efa68465c007c436552627592a.css
diff --git a/dist/static/css/app.b033e6efa68465c007c436552627592a.css.map b/dist/static/css/app.b033e6efa68465c007c436552627592a.css.map
diff --git a/dist/static/fonts/icon.979c614.woff2 b/dist/static/fonts/icon.979c614.woff2
diff --git a/dist/static/js/app.922b1c636ac6e1538691.js b/dist/static/js/app.922b1c636ac6e1538691.js
diff --git a/dist/static/js/app.922b1c636ac6e1538691.js.map b/dist/static/js/app.922b1c636ac6e1538691.js.map
diff --git a/dist/static/js/app.e90240f763b3d63eba3a.js b/dist/static/js/app.e90240f763b3d63eba3a.js
diff --git a/dist/static/js/app.e90240f763b3d63eba3a.js.map b/dist/static/js/app.e90240f763b3d63eba3a.js.map
diff --git a/dist/static/js/manifest.7be29d609369d27a1f05.js.map b/dist/static/js/manifest.7be29d609369d27a1f05.js.map
diff --git a/.../static/js/vendor.2335fd1721f060746153.js → .../static/js/vendor.7ca0be04407f4d17369e.js b/.../static/js/vendor.2335fd1721f060746153.js → .../static/js/vendor.7ca0be04407f4d17369e.js
diff --git a/...tic/js/vendor.2335fd1721f060746153.js.map → ...tic/js/vendor.7ca0be04407f4d17369e.js.map b/...tic/js/vendor.2335fd1721f060746153.js.map → ...tic/js/vendor.7ca0be04407f4d17369e.js.map
diff --git a/src/utils/request.js b/src/utils/request.js
@@ -10,7 +10,7 @@ Vue.use(Toast,{
 })
 // create an axios instance
 const service = axios.create({
-  baseURL: "http://127.0.0.1:7001/", // api的base_url
+  baseURL: process.env.BASE_API, // api的base_url
   timeout: 3600000, // request timeout
   widthCredentials: false  // 设置 withCredentials 使请求带上 `cookies`
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<!DOCTYPE html><html><head><meta charset=utf-8><title>movies</title><link href=http://127.0.0.1:80/dist/static/css/app.aa46c833fbb7a28752d9ef52a4573c9c.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=http://127.0.0.1:80/dist/static/js/manifest.7be29d609369d27a1f05.js></script><script type=text/javascript src=http://127.0.0.1:80/dist/static/js/vendor.2335fd1721f060746153.js></script><script type=text/javascript src=http://127.0.0.1:80/dist/static/js/app.922b1c636ac6e1538691.js></script></body></html>
		<!DOCTYPE html><html><head><meta charset=utf-8><title>movies</title><link href=http://127.0.0.1:80/dist/static/css/app.b033e6efa68465c007c436552627592a.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=http://127.0.0.1:80/dist/static/js/manifest.7be29d609369d27a1f05.js></script><script type=text/javascript src=http://127.0.0.1:80/dist/static/js/vendor.7ca0be04407f4d17369e.js></script><script type=text/javascript src=http://127.0.0.1:80/dist/static/js/app.e90240f763b3d63eba3a.js></script></body></html>