diff --git a/.env.production b/.env.production index f9398d4..0fed46a 100644 --- a/.env.production +++ b/.env.production @@ -2,10 +2,10 @@ ENV = 'production' # base api -VUE_APP_BASE_API=http://192.168.60.78:9001/ -VUE_APP_UPLOAD_API=http://192.168.60.78:9001/api/admin/upload-file -VUE_APP_OA_URL=http://192.168.60.18:2021 +#VUE_APP_BASE_API=http://192.168.60.78:9001/ +#VUE_APP_UPLOAD_API=http://192.168.60.78:9001/api/admin/upload-file +#VUE_APP_OA_URL=http://192.168.60.18:2021 -#VUE_APP_BASE_API=http://diaoling-test.ali251.langye.net/ -#VUE_APP_UPLOAD_API=http://diaoling-test.ali251.langye.net/api/admin/upload-file -#VUE_APP_OA_URL=http://suzhouhedaooa.langye.net +VUE_APP_BASE_API=http://diaoling-test.ali251.langye.net/ +VUE_APP_UPLOAD_API=http://diaoling-test.ali251.langye.net/api/admin/upload-file +VUE_APP_OA_URL=http://suzhouhedaooa.langye.net diff --git a/.env.staging b/.env.staging index a8793a0..dff6d62 100644 --- a/.env.staging +++ b/.env.staging @@ -4,5 +4,7 @@ NODE_ENV = production ENV = 'staging' # base api -VUE_APP_BASE_API = '/stage-api' +VUE_APP_BASE_API=http://diaoling-test.ali251.langye.net/ +VUE_APP_UPLOAD_API=http://diaoling-test.ali251.langye.net/api/admin/upload-file +VUE_APP_OA_URL=http://suzhouhedaooa.langye.net diff --git a/.env.tests b/.env.tests deleted file mode 100644 index 62f65e2..0000000 --- a/.env.tests +++ /dev/null @@ -1,11 +0,0 @@ -# just a flag -ENV='tests' - -# base api -#VUE_APP_BASE_API=http://192.168.60.78:9001/ -#VUE_APP_UPLOAD_API=http://192.168.60.78:9001/api/admin/upload-file -#VUE_APP_OA_URL=http://192.168.60.18:2021 - -VUE_APP_BASE_API=http://diaoling-test.ali251.langye.net/ -VUE_APP_UPLOAD_API=http://diaoling-test.ali251.langye.net/api/admin/upload-file -VUE_APP_OA_URL=http://suzhouhedaooa.langye.net diff --git a/.eslintrc.js b/.eslintrc.js index c977505..1c8a0cc 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -189,7 +189,7 @@ module.exports = { 'yield-star-spacing': [2, 'both'], 'yoda': [2, 'never'], 'prefer-const': 2, - 'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0, + 'no-debugger': (process.env.NODE_ENV === 'production' || process.env.NODE_ENV === 'tests') ? 2 : 0, 'object-curly-spacing': [2, 'always', { objectsInObjects: false }], diff --git a/package.json b/package.json index 763529a..79a4fde 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,6 @@ "dev": "vue-cli-service serve", "dev:prod": "vue-cli-service serve --mode production", "build:prod": "vue-cli-service build", - "build:tests": "vue-cli-service build --mode tests", "build:stage": "vue-cli-service build --mode staging", "preview": "node build/index.js --preview", "svgo": "svgo -f src/icons/svg --config=src/icons/svgo.yml", diff --git a/vue.config.js b/vue.config.js index 92a646c..874c306 100644 --- a/vue.config.js +++ b/vue.config.js @@ -24,7 +24,7 @@ module.exports = { * In most cases please use '/' !!! * Detail: https://cli.vuejs.org/config/#publicpath */ - publicPath: process.env.NODE_ENV === 'tests' ? '/admin_test' : '/admin', + publicPath: process.env.ENV === 'staging' ? '/admin_test' : '/admin', outputDir: './dist', assetsDir: 'static', css: {