Преглед на файлове

npm run build--test 、npm run build--prod打包不同环境

lihongxiao преди 3 години
родител
ревизия
84d494788e
променени са 11 файла, в които са добавени 31 реда и са изтрити 13 реда
  1. 3 2
      build/build.js
  2. 2 2
      build/webpack.prod.conf.js
  3. 3 2
      config/dev.env.js
  4. 3 0
      config/index.js
  5. 2 1
      config/prod.env.js
  6. 10 0
      config/test.env.js
  7. 3 1
      package.json
  8. 1 1
      src/http/config.js
  9. 1 1
      src/views/Letter/Letter.vue
  10. 1 1
      src/views/Letter/Orderlist.vue
  11. 2 2
      src/views/Login.vue

+ 3 - 2
build/build.js

@@ -1,7 +1,7 @@
 'use strict'
 require('./check-versions')()
 
-process.env.NODE_ENV = 'production'
+// process.env.NODE_ENV = 'production'
 const ora = require('ora')
 const rm = require('rimraf')
 const path = require('path')
@@ -9,7 +9,8 @@ const chalk = require('chalk')
 const webpack = require('webpack')
 const config = require('../config')
 const webpackConfig = require('./webpack.prod.conf')
-const spinner = ora('building for production...')
+// const spinner = ora('building for production...')
+var spinner = ora('building for ' + process.env.NODE_ENV + ' of ' + process.env.env_config+ ' mode...' )
 spinner.start()
 rm(path.join(config.build.assetsRoot, config.build.assetsSubDirectory), err => {
   if (err) throw err

+ 2 - 2
build/webpack.prod.conf.js

@@ -11,8 +11,8 @@ const ExtractTextPlugin = require('extract-text-webpack-plugin')
 const OptimizeCSSPlugin = require('optimize-css-assets-webpack-plugin')
 const UglifyJsPlugin = require('uglifyjs-webpack-plugin')
 
-const env = require('../config/prod.env')
-
+// const env = require('../config/prod.env')
+const env = config.build[process.env.env_config+'Env']  
 const webpackConfig = merge(baseWebpackConfig, {
   module: {
     rules: utils.styleLoaders({

+ 3 - 2
config/dev.env.js

@@ -4,7 +4,8 @@ const prodEnv = require('./prod.env')
 
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  // BASE_URL: '"http://39.98.239.48/web-api"',
-  BASE_URL: '"http://192.168.0.111:9001/"' //测试服务器
+  ENV_CONFIG:'"dev"',
+  BASE_URL: '"http://39.98.239.48/web-api"',
+  // BASE_URL: '"http://192.168.0.111:9001/"' //测试服务器
 
 })

+ 3 - 0
config/index.js

@@ -46,6 +46,9 @@ module.exports = {
   },
 
   build: {
+    devEnv: require('./dev.env'),
+    prodEnv: require('./prod.env'),
+    testEnv: require('./test.env'),
     // Template for index.html
     index: path.resolve(__dirname, '../dist/index.html'),
 

+ 2 - 1
config/prod.env.js

@@ -1,5 +1,6 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_URL:'"http://39.98.239.48/web-api"'
+  ENV_CONFIG:'"prod"',
+  BASE_URL:'"http://sxzgkj.baoxianzhanggui.com/web-api"',
 }

+ 10 - 0
config/test.env.js

@@ -0,0 +1,10 @@
+'use strict'
+const merge = require('webpack-merge')
+const prodEnv = require('./prod.env')
+
+module.exports = merge(prodEnv, {
+  NODE_ENV: '"testing"',
+  ENV_CONFIG:'"test"',
+  BASE_URL: '"http://39.98.239.48/web-api"',
+
+})

+ 3 - 1
package.json

@@ -7,7 +7,9 @@
   "scripts": {
     "dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js --host 0.0.0.0",
     "start": "npm run dev",
-    "build": "node build/build.js"
+    "build": "node build/build.js",
+    "build--test": "cross-env NODE_ENV=production env_config=test node build/build.js",
+    "build--prod": "cross-env NODE_ENV=production env_config=prod node build/build.js"
   },
   "dependencies": {
     "@riophae/vue-treeselect": "^0.4.0",

+ 1 - 1
src/http/config.js

@@ -4,7 +4,7 @@ import { baseUrl } from '@/config/global'
 export default {
   method: 'get',
   // 基础url前缀
-  baseUrl: baseUrl,
+  baseUrl: process.env.BASE_URL,
   // 请求头信息
   headers: {
     // "Content-Type": "application/x-www-form-urlencoded",

+ 1 - 1
src/views/Letter/Letter.vue

@@ -3972,7 +3972,7 @@ export default {
           this.imageIdList5 = [];
           for (let keys in res.data) {
             res.data[keys].map(ele => {
-              ele.url = this.global.baseUrl + ele.url;
+              ele.url = process.env.BASE_URL + ele.url;
               switch (keys) {
                 case "C01":
                   this.imageIdList1.push(ele.imageId);

+ 1 - 1
src/views/Letter/Orderlist.vue

@@ -1276,7 +1276,7 @@ export default {
                     this.$api.letter.findByQuoteNo(dy.quoteno).then((resImage) => {
                         for (let key in resImage.data) {
                             resImage.data[key].map(ele => {
-                                ele.url = this.global.baseUrl + ele.url;
+                                ele.url = process.env.BASE_URL + ele.url;
                                 return ele;
                             })
                         }

+ 2 - 2
src/views/Login.vue

@@ -201,8 +201,8 @@ export default {
       // });
     },
     refreshCaptcha() {
-      this.loginForm.src = this.global.baseUrl + "/captcha.jpg?t=" + new Date().getTime();
-      // this.loginForm.src = process.env.BASE_URL + "/captcha.jpg?t=" + new Date().getTime();
+      // this.loginForm.src = this.global.baseUrl + "/captcha.jpg?t=" + new Date().getTime();
+      this.loginForm.src = process.env.BASE_URL + "/captcha.jpg?t=" + new Date().getTime();
     },
     reset() {
       this.$refs.loginForm.resetFields()