Merge branch 'feature/rbac' into 'master'

middleware/auth/auth.go

@@ -8,20 +8,16 @@ import (
 	"strings"
 )
 
-func AUTH(handlerTableName map[string]string) gin.HandlerFunc {
+func AUTH() gin.HandlerFunc {
 	return func(ctx *gin.Context) {
 
 		token := ctx.Request.Header.Get("Token")
 		user, _ := util.ParseToken(token)
-		if 81 != user.UserInfo.Uid {
-			ctx.Next()
+		if !strings.Contains(strings.ToLower(user.UserInfo.Username), "kefu") {
+			return
 		}
 
 		handlerName := strings.Split(ctx.HandlerName(), ".")[1]
-		if _, ok := handlerTableName[handlerName]; !ok {
-			ctx.Next()
-		}
-
 		handleAlowed := []string{"GetCoinChains", "GetUserChains"}
 		_, handle := util.Contains(handleAlowed, handlerName)
 

routers/router.go

 package routers
 
 import (
+	"bwallet/middleware/auth"
 	"bwallet/middleware/jwt"
 	"bwallet/middleware/log"
 	"bwallet/pkg/e"
@@ -52,11 +53,10 @@ func InitRouter() *gin.Engine {
 
 	api := r.Group("/api")
 
-	api.Use(jwt.JWT())
+	api.Use(jwt.JWT()).Use(auth.AUTH())
 	api.POST("/log", backend.AddOperationLog)
 	api.GET("/logs", backend.GetOperationLogs)
 	api.Use(log.LogMiddleware(e.HandleTableName))
-	//api.Use(auth.AUTH(e.HandleTableName))
 	{
 		//api.POST("/upload",backend.Upload)
 		api.GET("/coins", backend.GetCoins)