Skip to content

Commit bafcb20

Browse files
committed
chore: 修复import别名
1 parent 56e0f9f commit bafcb20

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed

layout/internal/service/shared/storage.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ package shared
33
import (
44
"context"
55
"fmt"
6-
sharedv2 "github.com/TBXark/sphere/layout/api/shared/v1"
6+
sharedv1 "github.com/TBXark/sphere/layout/api/shared/v1"
77
"github.com/TBXark/sphere/storage"
88
"strconv"
99
)
1010

11-
var _ sharedv2.StorageServiceHTTPServer = (*Service)(nil)
11+
var _ sharedv1.StorageServiceHTTPServer = (*Service)(nil)
1212

13-
func (s *Service) UploadToken(ctx context.Context, req *sharedv2.UploadTokenRequest) (*sharedv2.UploadTokenResponse, error) {
13+
func (s *Service) UploadToken(ctx context.Context, req *sharedv1.UploadTokenRequest) (*sharedv1.UploadTokenResponse, error) {
1414
if req.Filename == "" {
1515
return nil, fmt.Errorf("filename is required")
1616
}
@@ -19,7 +19,7 @@ func (s *Service) UploadToken(ctx context.Context, req *sharedv2.UploadTokenRequ
1919
return nil, err
2020
}
2121
token := s.Storage.GenerateUploadToken(req.Filename, s.StorageDir, storage.DefaultKeyBuilder(strconv.Itoa(int(id))))
22-
return &sharedv2.UploadTokenResponse{
22+
return &sharedv1.UploadTokenResponse{
2323
Token: token.Token,
2424
Key: token.Key,
2525
Url: token.URL,

layout/internal/service/shared/test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ package shared
22

33
import (
44
"context"
5-
sharedv2 "github.com/TBXark/sphere/layout/api/shared/v1"
5+
sharedv1 "github.com/TBXark/sphere/layout/api/shared/v1"
66
)
77

8-
var _ sharedv2.TestServiceHTTPServer = (*Service)(nil)
8+
var _ sharedv1.TestServiceHTTPServer = (*Service)(nil)
99

10-
func (s *Service) RunTest(ctx context.Context, req *sharedv2.RunTestRequest) (*sharedv2.RunTestResponse, error) {
11-
return &sharedv2.RunTestResponse{
10+
func (s *Service) RunTest(ctx context.Context, req *sharedv1.RunTestRequest) (*sharedv1.RunTestResponse, error) {
11+
return &sharedv1.RunTestResponse{
1212
FieldTest1: req.FieldTest1,
1313
FieldTest2: req.FieldTest2,
1414
PathTest1: req.PathTest1,

server/middleware/auth/middleware.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package auth
22

33
import (
4-
authorizer2 "github.com/TBXark/sphere/server/auth/authorizer"
4+
"github.com/TBXark/sphere/server/auth/authorizer"
55
"github.com/gin-gonic/gin"
66
"net/http"
77
"strings"
@@ -15,7 +15,7 @@ type AccessControl interface {
1515
IsAllowed(role, resource string) bool
1616
}
1717

18-
func NewAuthMiddleware(prefix string, parser authorizer2.Parser[authorizer2.RBACClaims[int64]], abortOnError bool) gin.HandlerFunc {
18+
func NewAuthMiddleware(prefix string, parser authorizer.Parser[authorizer.RBACClaims[int64]], abortOnError bool) gin.HandlerFunc {
1919
abort := func(ctx *gin.Context) {
2020
if abortOnError {
2121
ctx.AbortWithStatusJSON(http.StatusUnauthorized, gin.H{
@@ -41,9 +41,9 @@ func NewAuthMiddleware(prefix string, parser authorizer2.Parser[authorizer2.RBAC
4141
return
4242
}
4343

44-
ctx.Set(authorizer2.ContextKeyUID, claims.UID)
45-
ctx.Set(authorizer2.ContextKeySubject, claims.Subject)
46-
ctx.Set(authorizer2.ContextKeyRoles, claims.Roles)
44+
ctx.Set(authorizer.ContextKeyUID, claims.UID)
45+
ctx.Set(authorizer.ContextKeySubject, claims.Subject)
46+
ctx.Set(authorizer.ContextKeyRoles, claims.Roles)
4747
}
4848
}
4949

@@ -54,7 +54,7 @@ func NewPermissionMiddleware(resource string, acl AccessControl) gin.HandlerFunc
5454
})
5555
}
5656
return func(ctx *gin.Context) {
57-
rolesRaw, exist := ctx.Get(authorizer2.ContextKeyRoles)
57+
rolesRaw, exist := ctx.Get(authorizer.ContextKeyRoles)
5858
if !exist {
5959
abort(ctx)
6060
return

0 commit comments

Comments
 (0)