From 6622ea12e99fcd58e0268a986f2963851c57ddb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Sun, 5 Dec 2021 18:17:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=89=8D=E7=AB=AF=E5=BC=80?=
 =?UTF-8?q?=E5=8F=91=E7=8E=AF=E5=A2=83=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ZR.Admin.WebApi/build.bat | 2 +-
 ZR.Vue/.env.development   | 2 +-
 ZR.Vue/.env.staging       | 8 ++++++++
 ZR.Vue/vue.config.js      | 6 +++---
 4 files changed, 13 insertions(+), 5 deletions(-)
 create mode 100644 ZR.Vue/.env.staging

diff --git a/ZR.Admin.WebApi/build.bat b/ZR.Admin.WebApi/build.bat
index f3d0008..5aa4fb6 100644
--- a/ZR.Admin.WebApi/build.bat
+++ b/ZR.Admin.WebApi/build.bat
@@ -1,6 +1,6 @@
 @echo off
 
-docker build -t ZRAdmin:latest -f ./Dockerfile .
+docker build -t ZRAdmin.NET:latest -f ./Dockerfile .
 
 echo "==============�鿴����==========="
 docker images
diff --git a/ZR.Vue/.env.development b/ZR.Vue/.env.development
index e4fd273..d7d1cf0 100644
--- a/ZR.Vue/.env.development
+++ b/ZR.Vue/.env.development
@@ -3,7 +3,7 @@
 ENV = 'development'
 
 # ZR管理系统/开发环境
-VUE_APP_BASE_API = 'http://localhost:8888/'
+VUE_APP_BASE_API = '/dev-api'
 
 # 路由前缀
 VUE_APP_ROUTER_PREFIX = '/'
diff --git a/ZR.Vue/.env.staging b/ZR.Vue/.env.staging
new file mode 100644
index 0000000..184dcfe
--- /dev/null
+++ b/ZR.Vue/.env.staging
@@ -0,0 +1,8 @@
+# 测试环境配置
+ENV = 'staging'
+
+# ZR管理系统/生产环境
+VUE_APP_BASE_API = '/stage-api'
+
+# 路由前缀
+VUE_APP_ROUTER_PREFIX = '/'
diff --git a/ZR.Vue/vue.config.js b/ZR.Vue/vue.config.js
index 4b9cde4..a366f0e 100644
--- a/ZR.Vue/vue.config.js
+++ b/ZR.Vue/vue.config.js
@@ -34,11 +34,11 @@ module.exports = {
     open: true,
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
-      '/api': {
-        target: process.env.VUE_APP_BASE_API,
+      [process.env.VUE_APP_BASE_API]: {
+        target: 'http://localhost:8888/',// 后端接口地址
         changeOrigin: true,
         pathRewrite: {
-          '^/api': ''//需要rewrite的
+          ['^' + process.env.VUE_APP_BASE_API]: ''//需要rewrite的
         }
       }
     },