From ac31c7ed97761dcb57d364df1a1656036f575d1e Mon Sep 17 00:00:00 2001
From: YuleiLan <yllan@aibee.com>
Date: Thu, 13 Aug 2020 19:27:58 +0800
Subject: [PATCH] fix bug.

---
 router/dashboard/dashboard.go | 10 ++++------
 router/router.go              |  7 +++++--
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/router/dashboard/dashboard.go b/router/dashboard/dashboard.go
index a99621a..0c5551f 100644
--- a/router/dashboard/dashboard.go
+++ b/router/dashboard/dashboard.go
@@ -1,8 +1,6 @@
 package dashboard
 
 import (
-	"ferry/apis/dashboard"
-	"ferry/middleware"
 	jwt "ferry/pkg/jwtauth"
 
 	"github.com/gin-gonic/gin"
@@ -13,8 +11,8 @@ import (
 */
 
 func RegisterDashboardRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) {
-	classify := v1.Group("/dashboard").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole())
-	{
-		classify.GET("", dashboard.InitData)
-	}
+	//classify := v1.Group("/dashboard").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole())
+	//{
+	//	classify.GET("", dashboard.InitData)
+	//}
 }
diff --git a/router/router.go b/router/router.go
index 1bb2fd4..7615740 100644
--- a/router/router.go
+++ b/router/router.go
@@ -1,12 +1,12 @@
 package router
 
 import (
+	"ferry/apis/dashboard"
 	"ferry/apis/monitor"
 	"ferry/apis/system"
 	"ferry/handler"
 	"ferry/pkg/jwtauth"
 	jwt "ferry/pkg/jwtauth"
-	"ferry/router/dashboard"
 	"ferry/router/process"
 	systemRouter "ferry/router/system"
 
@@ -54,6 +54,9 @@ func sysNoCheckRoleRouter(r *gin.RouterGroup) {
 	v1.GET("/monitor/server", monitor.ServerInfo)
 	v1.GET("/getCaptcha", system.GenerateCaptchaHandler)
 	v1.GET("/menuTreeselect", system.GetMenuTreeelect)
+
+	// 首页数据
+	v1.GET("/dashboard", dashboard.InitData)
 }
 
 func sysCheckRoleRouterInit(r *gin.RouterGroup, authMiddleware *jwtauth.GinJWTMiddleware) {
@@ -64,7 +67,7 @@ func sysCheckRoleRouterInit(r *gin.RouterGroup, authMiddleware *jwtauth.GinJWTMi
 	v1 := r.Group("/api/v1")
 
 	// 首页
-	dashboard.RegisterDashboardRouter(v1, authMiddleware)
+	//dashboard.RegisterDashboardRouter(v1, authMiddleware)
 
 	// 系统管理
 	systemRouter.RegisterPageRouter(v1, authMiddleware)