Feat: upyun callback & authentication

This commit is contained in:
HFO4
2020-01-18 10:40:03 +08:00
parent 21ec3fc710
commit 5befbc21d0
9 changed files with 138 additions and 16 deletions

View File

@@ -13,7 +13,7 @@ import (
// CallbackProcessService 上传请求回调正文接口
type CallbackProcessService interface {
GetBody() serializer.UploadCallback
GetBody(*serializer.UploadSession) serializer.UploadCallback
}
// RemoteUploadCallbackService 远程存储上传回调请求服务
@@ -22,11 +22,11 @@ type RemoteUploadCallbackService struct {
}
// GetBody 返回回调正文
func (service RemoteUploadCallbackService) GetBody() serializer.UploadCallback {
func (service RemoteUploadCallbackService) GetBody(session *serializer.UploadSession) serializer.UploadCallback {
return service.Data
}
// UploadCallbackService 云存储上传回调请求服务
// UploadCallbackService OOS/七牛云存储上传回调请求服务
type UploadCallbackService struct {
Name string `json:"name"`
SourceName string `json:"source_name"`
@@ -34,8 +34,32 @@ type UploadCallbackService struct {
Size uint64 `json:"size"`
}
// UpyunCallbackService 又拍云上传回调请求服务
type UpyunCallbackService struct {
Code int `form:"code" binding:"required"`
Message string `form:"message" binding:"required"`
SourceName string `form:"url" binding:"required"`
Width string `form:"image-width"`
Height string `form:"image-height"`
Size uint64 `form:"file_size"`
}
// GetBody 返回回调正文
func (service UploadCallbackService) GetBody() serializer.UploadCallback {
func (service UpyunCallbackService) GetBody(session *serializer.UploadSession) serializer.UploadCallback {
res := serializer.UploadCallback{
Name: session.Name,
SourceName: service.SourceName,
Size: service.Size,
}
if service.Width != "" {
res.PicInfo = service.Width + "," + service.Height
}
return res
}
// GetBody 返回回调正文
func (service UploadCallbackService) GetBody(session *serializer.UploadSession) serializer.UploadCallback {
return serializer.UploadCallback{
Name: service.Name,
SourceName: service.SourceName,
@@ -46,8 +70,6 @@ func (service UploadCallbackService) GetBody() serializer.UploadCallback {
// ProcessCallback 处理上传结果回调
func ProcessCallback(service CallbackProcessService, c *gin.Context) serializer.Response {
// 获取回调正文
callbackBody := service.GetBody()
// 创建文件系统
fs, err := filesystem.NewFileSystemFromContext(c)
if err != nil {
@@ -62,12 +84,16 @@ func ProcessCallback(service CallbackProcessService, c *gin.Context) serializer.
}
callbackSession := callbackSessionRaw.(*serializer.UploadSession)
// 获取回调正文
callbackBody := service.GetBody(callbackSession)
// 重新指向上传策略
policy, err := model.GetPolicyByID(callbackSession.PolicyID)
if err != nil {
return serializer.Err(serializer.CodePolicyNotAllowed, err.Error(), err)
}
fs.Policy = &policy
fs.User.Policy = policy
err = fs.DispatchHandler()
if err != nil {
return serializer.Err(serializer.CodePolicyNotAllowed, err.Error(), err)

View File

@@ -12,6 +12,7 @@ import (
type UploadCredentialService struct {
Path string `form:"path" binding:"required"`
Size uint64 `form:"size" binding:"min=0"`
Name string `form:"name"`
}
// Get 获取新的上传凭证
@@ -23,7 +24,7 @@ func (service *UploadCredentialService) Get(ctx context.Context, c *gin.Context)
}
ctx = context.WithValue(ctx, fsctx.GinCtx, c)
credential, err := fs.GetUploadToken(ctx, service.Path, service.Size)
credential, err := fs.GetUploadToken(ctx, service.Path, service.Size, service.Name)
if err != nil {
return serializer.Err(serializer.CodeNotSet, err.Error(), err)
}