Browse Source

优化接口名字,增加版本号

gitlink
Sydonian 1 year ago
parent
commit
fab655ec90
8 changed files with 56 additions and 16 deletions
  1. +1
    -1
      client/internal/cmdline/getp.go
  2. +1
    -1
      client/internal/cmdline/load.go
  3. +1
    -1
      client/internal/cmdline/lsp.go
  4. +1
    -1
      client/internal/cmdline/put.go
  5. +4
    -4
      client/internal/http/object.go
  6. +5
    -5
      client/internal/http/package.go
  7. +42
    -2
      client/internal/http/server.go
  8. +1
    -1
      client/internal/services/package.go

+ 1
- 1
client/internal/cmdline/getp.go View File

@@ -52,7 +52,7 @@ func getpByPath(cmdCtx *CommandContext, path string, output string) {
return
}

pkg, err := cmdCtx.Cmdline.Svc.PackageSvc().GetByName(userID, comps[0], comps[1])
pkg, err := cmdCtx.Cmdline.Svc.PackageSvc().GetByFullName(userID, comps[0], comps[1])
if err != nil {
fmt.Println(err)
return


+ 1
- 1
client/internal/cmdline/load.go View File

@@ -49,7 +49,7 @@ func loadByPath(cmdCtx *CommandContext, pkgPath string, stgName string, rootPath
return
}

pkg, err := cmdCtx.Cmdline.Svc.PackageSvc().GetByName(userID, comps[0], comps[1])
pkg, err := cmdCtx.Cmdline.Svc.PackageSvc().GetByFullName(userID, comps[0], comps[1])
if err != nil {
fmt.Println(err)
return


+ 1
- 1
client/internal/cmdline/lsp.go View File

@@ -46,7 +46,7 @@ func lspByPath(cmdCtx *CommandContext, path string) {
return
}

pkg, err := cmdCtx.Cmdline.Svc.PackageSvc().GetByName(userID, comps[0], comps[1])
pkg, err := cmdCtx.Cmdline.Svc.PackageSvc().GetByFullName(userID, comps[0], comps[1])
if err != nil {
fmt.Println(err)
return


+ 1
- 1
client/internal/cmdline/put.go View File

@@ -48,7 +48,7 @@ func init() {
return
}

pkg, err := cmdCtx.Cmdline.Svc.PackageSvc().GetByName(userID, comps[0], comps[1])
pkg, err := cmdCtx.Cmdline.Svc.PackageSvc().GetByFullName(userID, comps[0], comps[1])
if err != nil {
if codeMsg, ok := err.(*mq.CodeMessageError); ok && codeMsg.Code == errorcode.DataNotFound {
pkg2, err := cmdCtx.Cmdline.Svc.PackageSvc().Create(userID, bkt.BucketID, comps[1])


+ 4
- 4
client/internal/http/object.go View File

@@ -28,10 +28,10 @@ func (s *Server) Object() *ObjectService {
}
}

func (s *ObjectService) List(ctx *gin.Context) {
log := logger.WithField("HTTP", "Object.List")
func (s *ObjectService) ListByPath(ctx *gin.Context) {
log := logger.WithField("HTTP", "Object.ListByPath")

var req cdsapi.ObjectList
var req cdsapi.ObjectListByPath
if err := ctx.ShouldBindQuery(&req); err != nil {
log.Warnf("binding body: %s", err.Error())
ctx.JSON(http.StatusBadRequest, Failed(errorcode.BadArgument, "missing argument or invalid argument"))
@@ -45,7 +45,7 @@ func (s *ObjectService) List(ctx *gin.Context) {
return
}

ctx.JSON(http.StatusOK, OK(cdsapi.ObjectListResp{Objects: objs}))
ctx.JSON(http.StatusOK, OK(cdsapi.ObjectListByPathResp{Objects: objs}))
}

func (s *ObjectService) ListByIDs(ctx *gin.Context) {


+ 5
- 5
client/internal/http/package.go View File

@@ -46,24 +46,24 @@ func (s *PackageService) Get(ctx *gin.Context) {
ctx.JSON(http.StatusOK, OK(cdsapi.PackageGetResp{Package: *pkg}))
}

func (s *PackageService) GetByName(ctx *gin.Context) {
log := logger.WithField("HTTP", "Package.GetByName")
func (s *PackageService) GetByFullName(ctx *gin.Context) {
log := logger.WithField("HTTP", "Package.GetByFullName")

var req cdsapi.PackageGetByName
var req cdsapi.PackageGetByFullName
if err := ctx.ShouldBindQuery(&req); err != nil {
log.Warnf("binding query: %s", err.Error())
ctx.JSON(http.StatusBadRequest, Failed(errorcode.BadArgument, "missing argument or invalid argument"))
return
}

pkg, err := s.svc.PackageSvc().GetByName(req.UserID, req.BucketName, req.PackageName)
pkg, err := s.svc.PackageSvc().GetByFullName(req.UserID, req.BucketName, req.PackageName)
if err != nil {
log.Warnf("getting package by name: %s", err.Error())
ctx.JSON(http.StatusOK, FailedError(err))
return
}

ctx.JSON(http.StatusOK, OK(cdsapi.PackageGetByNameResp{Package: *pkg}))
ctx.JSON(http.StatusOK, OK(cdsapi.PackageGetByFullNameResp{Package: *pkg}))
}

// Create 处理创建新包的HTTP请求。


+ 42
- 2
client/internal/http/server.go View File

@@ -43,7 +43,9 @@ func (s *Server) initRouters() {

// initTemp(rt, s)

rt.GET(cdsapi.ObjectListPath, s.Object().List)
s.routeV1(s.engine)

rt.GET(cdsapi.ObjectListPathByPath, s.Object().ListByPath)
rt.POST(cdsapi.ObjectListByIDsPath, s.Object().ListByIDs)
rt.GET(cdsapi.ObjectDownloadPath, s.Object().Download)
rt.GET(cdsapi.ObjectDownloadByPathPath, s.Object().DownloadByPath)
@@ -57,7 +59,7 @@ func (s *Server) initRouters() {
rt.POST(cdsapi.ObjectClonePath, s.Object().Clone)

rt.GET(cdsapi.PackageGetPath, s.Package().Get)
rt.GET(cdsapi.PackageGetByNamePath, s.Package().GetByName)
rt.GET(cdsapi.PackageGetByFullNamePath, s.Package().GetByFullName)
rt.POST(cdsapi.PackageCreatePath, s.Package().Create)
rt.POST(cdsapi.PackageCreateLoadPath, s.Package().CreateLoad)
rt.POST(cdsapi.PackageDeletePath, s.Package().Delete)
@@ -75,4 +77,42 @@ func (s *Server) initRouters() {
rt.POST(cdsapi.BucketCreatePath, s.Bucket().Create)
rt.POST(cdsapi.BucketDeletePath, s.Bucket().Delete)
rt.GET(cdsapi.BucketListUserBucketsPath, s.Bucket().ListUserBuckets)

}

func (s *Server) routeV1(eg *gin.Engine) {
v1 := eg.Group("/v1")

v1.GET(cdsapi.ObjectListPathByPath, s.Object().ListByPath)
v1.POST(cdsapi.ObjectListByIDsPath, s.Object().ListByIDs)
v1.GET(cdsapi.ObjectDownloadPath, s.Object().Download)
v1.GET(cdsapi.ObjectDownloadByPathPath, s.Object().DownloadByPath)
v1.POST(cdsapi.ObjectUploadPath, s.Object().Upload)
v1.GET(cdsapi.ObjectGetPackageObjectsPath, s.Object().GetPackageObjects)
v1.POST(cdsapi.ObjectUpdateInfoPath, s.Object().UpdateInfo)
v1.POST(cdsapi.ObjectUpdateInfoByPathPath, s.Object().UpdateInfoByPath)
v1.POST(cdsapi.ObjectMovePath, s.Object().Move)
v1.POST(cdsapi.ObjectDeletePath, s.Object().Delete)
v1.POST(cdsapi.ObjectDeleteByPathPath, s.Object().DeleteByPath)
v1.POST(cdsapi.ObjectClonePath, s.Object().Clone)

v1.GET(cdsapi.PackageGetPath, s.Package().Get)
v1.GET(cdsapi.PackageGetByFullNamePath, s.Package().GetByFullName)
v1.POST(cdsapi.PackageCreatePath, s.Package().Create)
v1.POST(cdsapi.PackageCreateLoadPath, s.Package().CreateLoad)
v1.POST(cdsapi.PackageDeletePath, s.Package().Delete)
v1.POST(cdsapi.PackageClonePath, s.Package().Clone)
v1.GET(cdsapi.PackageListBucketPackagesPath, s.Package().ListBucketPackages)
v1.GET(cdsapi.PackageGetCachedStoragesPath, s.Package().GetCachedStorages)

v1.POST(cdsapi.StorageLoadPackagePath, s.Storage().LoadPackage)
v1.POST(cdsapi.StorageCreatePackagePath, s.Storage().CreatePackage)
v1.GET(cdsapi.StorageGetPath, s.Storage().Get)

v1.POST(cdsapi.CacheMovePackagePath, s.Cache().MovePackage)

v1.GET(cdsapi.BucketGetByNamePath, s.Bucket().GetByName)
v1.POST(cdsapi.BucketCreatePath, s.Bucket().Create)
v1.POST(cdsapi.BucketDeletePath, s.Bucket().Delete)
v1.GET(cdsapi.BucketListUserBucketsPath, s.Bucket().ListUserBuckets)
}

+ 1
- 1
client/internal/services/package.go View File

@@ -36,7 +36,7 @@ func (svc *PackageService) Get(userID cdssdk.UserID, packageID cdssdk.PackageID)
return &getResp.Package, nil
}

func (svc *PackageService) GetByName(userID cdssdk.UserID, bucketName string, packageName string) (*cdssdk.Package, error) {
func (svc *PackageService) GetByFullName(userID cdssdk.UserID, bucketName string, packageName string) (*cdssdk.Package, error) {
coorCli, err := stgglb.CoordinatorMQPool.Acquire()
if err != nil {
return nil, fmt.Errorf("new coordinator client: %w", err)


Loading…
Cancel
Save