data clean

modules/auth/controller/permission.go

@@ -2,9 +2,12 @@ package controller
 
 import (
 	"atom/providers/jwt"
+	"atom/providers/log"
 	"atom/providers/rbac"
+	"net/http"
 
 	"github.com/gin-gonic/gin"
+	"github.com/rogeecn/gen"
 )
 
 type PermissionController interface {
@@ -24,12 +27,14 @@ func NewPermissionController(
 }
 
 func (c *permissionControllerImpl) Get(ctx *gin.Context) (string, error) {
-	claims, err := c.jwt.GetClaims(ctx)
-	if err != nil {
-		return "", err
+	claimsCtx, exists := ctx.Get(jwt.CtxKey)
+	if !exists {
+		return "", gen.NewBusError(http.StatusBadRequest, http.StatusBadRequest, "Token 获取失败")
 	}
+	claims := claimsCtx.(jwt.Claims)
+	log.Debug("claim: ", claims)
 
-	perm, err := c.rbac.JsonPermissionsForUser(claims.Username)
+	perm, err := c.rbac.JsonPermissionsForUser("Rogee")
 	if err != nil {
 		return "", err
 	}

modules/auth/routes/routes.go

@@ -68,9 +68,9 @@ func (r *Route) Register() {
 			))
 		}
 
-		permissionGroup := group.Group("permission")
+		permissionGroup := group.Group("permissions")
 		{
-			permissionGroup.GET("/permissions", gen.DataFunc(r.permission.Get))
+			permissionGroup.GET("", gen.DataFunc(r.permission.Get))
 		}
 
 	}

modules/auth/service/user.go

@@ -59,10 +59,7 @@ func (svc *userService) AuthMatchPassword(ctx context.Context, req *dto.LoginReq
 
 func (svc *userService) GenerateJWTTokenFromUser(ctx context.Context, user *models.User) (string, error) {
 	return svc.jwt.CreateToken(svc.jwt.CreateClaims(jwt.BaseClaims{
-		UUID:     user.UUID,
-		UserID:   user.ID,
-		Username: user.Username,
-		NickName: user.Nickname,
-		RoleID:   user.RoleID,
+		UID:  user.ID,
+		Role: user.RoleID,
 	}))
 }