From be6663b710c04217ab196b7ae2b4949deeca49cc Mon Sep 17 00:00:00 2001
From: Leonard Wang <wangdeyu1994@163.com>
Date: Wed, 12 May 2021 00:54:07 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9C=A8=E7=BA=BF?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=B3=BB=E7=BB=9F=E9=85=8D=E7=BD=AE=E7=9A=84?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/core/viper.go     | 1 +
 server/utils/fmt_plus.go | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/server/core/viper.go b/server/core/viper.go
index 282770d6..9a7ccc37 100644
--- a/server/core/viper.go
+++ b/server/core/viper.go
@@ -36,6 +36,7 @@ func Viper(path ...string) *viper.Viper {
 
 	v := viper.New()
 	v.SetConfigFile(config)
+	v.SetConfigType("yaml")
 	err := v.ReadInConfig()
 	if err != nil {
 		panic(fmt.Errorf("Fatal error config file: %s \n", err))
diff --git a/server/utils/fmt_plus.go b/server/utils/fmt_plus.go
index b31c3f0e..45956256 100644
--- a/server/utils/fmt_plus.go
+++ b/server/utils/fmt_plus.go
@@ -18,7 +18,11 @@ func StructToMap(obj interface{}) map[string]interface{} {
 
 	var data = make(map[string]interface{})
 	for i := 0; i < obj1.NumField(); i++ {
-		data[obj1.Field(i).Name] = obj2.Field(i).Interface()
+		if obj1.Field(i).Tag.Get("mapstructure") != "" {
+			data[obj1.Field(i).Tag.Get("mapstructure")] = obj2.Field(i).Interface()
+		} else {
+			data[obj1.Field(i).Name] = obj2.Field(i).Interface()
+		}
 	}
 	return data
 }

From a11af0325292b060d086819593ce525d997d2e84 Mon Sep 17 00:00:00 2001
From: pixel <303176530@qq.com>
Date: Wed, 12 May 2021 17:13:53 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=87=8D=E5=90=AF?=
 =?UTF-8?q?=E5=90=8E=E6=96=AD=E5=90=8E=E9=A1=B5=E9=9D=A2=E7=99=BD=E5=B1=8F?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/permission.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/web/src/permission.js b/web/src/permission.js
index 07cc154e..69d16e68 100644
--- a/web/src/permission.js
+++ b/web/src/permission.js
@@ -24,9 +24,7 @@ router.beforeEach(async (to, from, next) => {
                 asyncRouterFlag++
                 await store.dispatch('router/SetAsyncRouter')
                 const asyncRouters = store.getters['router/asyncRouters']
-                asyncRouters.forEach(item => {
-                    router.addRoute(item)
-                })
+                router.addRoutes(asyncRouters)
                 next({ ...to, replace: true })
             } else {
                 if (to.matched.length) {