yjp преди 1 година
родител
ревизия
2472014332

+ 3 - 2
convenient/domain/auth/auth.go

@@ -1,6 +1,7 @@
 package auth
 
 import (
+	"git.sxidc.com/go-framework/baize/convenient/domain/auth/middlewares"
 	"git.sxidc.com/go-framework/baize/convenient/domain/auth/permission"
 	"git.sxidc.com/go-framework/baize/convenient/domain/auth/permission_group"
 	"git.sxidc.com/go-framework/baize/convenient/domain/auth/relations"
@@ -103,7 +104,7 @@ func (simple *Simple) bind(binder *binding.Binder) {
 				"token": token,
 			}, nil
 		},
-	}, Authentication())
+	})
 
 	// 注销
 	binding.PostBind(binder, &binding.SimpleBindItem[any]{
@@ -166,7 +167,7 @@ func (simple *Simple) bind(binder *binding.Binder) {
 				"token": token,
 			}, nil
 		},
-	})
+	}, middlewares.Authentication())
 
 	// TODO Challenge
 }

+ 0 - 1
convenient/domain/auth/jwt.go

@@ -1,7 +1,6 @@
 package auth
 
 import (
-	"errors"
 	"github.com/dgrijalva/jwt-go"
 	"github.com/pkg/errors"
 	"time"

+ 4 - 3
convenient/domain/auth/middleware.go → convenient/domain/auth/middlewares/middleware.go

@@ -1,6 +1,7 @@
-package auth
+package middlewares
 
 import (
+	"git.sxidc.com/go-framework/baize/framework/binding"
 	"git.sxidc.com/go-framework/baize/framework/core/api"
 	"git.sxidc.com/go-framework/baize/framework/core/infrastructure"
 	"github.com/pkg/errors"
@@ -10,8 +11,8 @@ const (
 	tokenContextKey = "auth-context-token"
 )
 
-func Authentication(i *infrastructure.Infrastructure) api.Handler {
-	return func(c *api.Context) {
+func Authentication() binding.Middleware {
+	return func(c *api.Context, i *infrastructure.Infrastructure) {
 		// TODO 中间件
 		//dbExecutor := i.DBExecutor()
 		c.Next()

+ 1 - 1
convenient/domain/auth/permission/api.go

@@ -20,5 +20,5 @@ func (simple *Simple) Bind(binder *binding.Binder) {
 		UpdateJsonBody:     &UpdatePermissionJsonBody{},
 		QueryQueryParams:   &GetPermissionsQueryParams{},
 		GetByIDQueryParams: &GetPermissionQueryParams{},
-	})
+	}, entity_crud.WithCreateMiddlewares())
 }