From 4d58a154cc0a1a12596beef1fcd5daa3778e4bcf Mon Sep 17 00:00:00 2001
From: izory <791736813@qq.com>
Date: Thu, 14 Oct 2021 17:34:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8A=A0=E8=B7=AF=E7=94=B1?=
 =?UTF-8?q?=E5=99=A8=E5=89=8D=E7=BC=80=E9=80=9A=E8=BF=87=E7=8E=AF=E5=A2=83?=
 =?UTF-8?q?=E5=8F=98=E9=87=8F=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ZR.Admin.WebApi/Filters/ActionPermissionFilter.cs | 1 +
 ZR.Vue/.env.development                           | 2 +-
 ZR.Vue/.env.production                            | 2 +-
 ZR.Vue/src/layout/components/Navbar.vue           | 2 +-
 ZR.Vue/src/router/index.js                        | 2 +-
 ZR.Vue/src/utils/request.js                       | 2 +-
 ZR.Vue/vue.config.js                              | 2 +-
 7 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/ZR.Admin.WebApi/Filters/ActionPermissionFilter.cs b/ZR.Admin.WebApi/Filters/ActionPermissionFilter.cs
index be6684e..16f5ae7 100644
--- a/ZR.Admin.WebApi/Filters/ActionPermissionFilter.cs
+++ b/ZR.Admin.WebApi/Filters/ActionPermissionFilter.cs
@@ -20,6 +20,7 @@ namespace ZR.Admin.WebApi.Filters
         /// </summary>
         public string Permission { get; set; }
         private bool HasPermi { get; set; }
+        private bool HasRole { get; set; }
 
         public ActionPermissionFilter() { }
 
diff --git a/ZR.Vue/.env.development b/ZR.Vue/.env.development
index 2028595..7ee997f 100644
--- a/ZR.Vue/.env.development
+++ b/ZR.Vue/.env.development
@@ -6,4 +6,4 @@ ENV = 'development'
 VUE_APP_BASE_API = 'http://localhost:8888/'
 
 # 路由前缀
-VUE_APP_ROUTER_PREFIX = ''
+VUE_APP_ROUTER_PREFIX = '/admin'
diff --git a/ZR.Vue/.env.production b/ZR.Vue/.env.production
index dc272e2..163fe39 100644
--- a/ZR.Vue/.env.production
+++ b/ZR.Vue/.env.production
@@ -5,4 +5,4 @@ ENV = 'production'
 VUE_APP_BASE_API = '/prod-api'
 
 # 路由前缀
-VUE_APP_ROUTER_PREFIX = ''
+VUE_APP_ROUTER_PREFIX = '/admin/'
diff --git a/ZR.Vue/src/layout/components/Navbar.vue b/ZR.Vue/src/layout/components/Navbar.vue
index 0fbaffb..cadd596 100644
--- a/ZR.Vue/src/layout/components/Navbar.vue
+++ b/ZR.Vue/src/layout/components/Navbar.vue
@@ -88,7 +88,7 @@ export default {
         type: "warning",
       }).then(() => {
         this.$store.dispatch("LogOut").then(() => {
-          location.href = "/index";
+          location.href = process.env.VUE_APP_ROUTER_PREFIX + "index";
         });
       });
     },
diff --git a/ZR.Vue/src/router/index.js b/ZR.Vue/src/router/index.js
index f603cb2..8cd2d6a 100644
--- a/ZR.Vue/src/router/index.js
+++ b/ZR.Vue/src/router/index.js
@@ -109,8 +109,8 @@ export const constantRoutes = [
 ]
 
 export default new Router({
+  base: process.env.VUE_APP_ROUTER_PREFIX,
   mode: 'history', // 去掉url中的#
-  // base: '',
   // scrollBehavior: () => ({ y: 0 }),
   routes: constantRoutes
 })
diff --git a/ZR.Vue/src/utils/request.js b/ZR.Vue/src/utils/request.js
index b832f95..a58006c 100644
--- a/ZR.Vue/src/utils/request.js
+++ b/ZR.Vue/src/utils/request.js
@@ -54,7 +54,7 @@ service.interceptors.response.use(res => {
     }
     ).then(() => {
       store.dispatch('LogOut').then(() => {
-        location.href = '/index';
+        location.href = process.env.VUE_APP_ROUTER_PREFIX + '/index';
       })
     })
 
diff --git a/ZR.Vue/vue.config.js b/ZR.Vue/vue.config.js
index badd996..d16cb6e 100644
--- a/ZR.Vue/vue.config.js
+++ b/ZR.Vue/vue.config.js
@@ -18,7 +18,7 @@ module.exports = {
   // 部署生产环境和开发环境下的URL。
   // 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上
   // 例如 https://www.baidu.com/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.baidu.com/admin/，则设置 baseUrl 为 /admin/。
-  publicPath: process.env.VUE_ROUTER_PREFIX,
+  publicPath: process.env.VUE_APP_ROUTER_PREFIX,
   // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist）
   outputDir: 'dist',
   // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下）