Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into feature/auth
This commit is contained in:
eson
34
utils/curl/http_curl.go
Normal file
34
utils/curl/http_curl.go
Normal file
@@ -0,0 +1,34 @@
|
||||
package curl
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"io"
|
||||
"net/http"
|
||||
"strings"
|
||||
"time"
|
||||
)
|
||||
|
||||
// 接口请求
|
||||
func ApiCall(url, method string, header map[string]string, body io.Reader, timeOut time.Duration) (rsp *http.Response, err error) {
|
||||
method = strings.ToUpper(method)
|
||||
if method != "GET" && method != "POST" && method != "PUT" && method != "DELETE" {
|
||||
return nil, errors.New("invalid http method")
|
||||
}
|
||||
if url == "" {
|
||||
return nil, errors.New("request url can`t be empty")
|
||||
}
|
||||
client := &http.Client{}
|
||||
if timeOut <= 0 {
|
||||
client.Timeout = time.Second * 15
|
||||
} else {
|
||||
client.Timeout = timeOut
|
||||
}
|
||||
requestHandle, err := http.NewRequest(method, url, body)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
for k, v := range header {
|
||||
requestHandle.Header.Set(k, v)
|
||||
}
|
||||
return client.Do(requestHandle)
|
||||
}
|
||||
@@ -4,6 +4,7 @@ import (
|
||||
"context"
|
||||
"fusenapi/model/gmodel"
|
||||
"fusenapi/utils/basic"
|
||||
"net/http"
|
||||
"time"
|
||||
|
||||
"github.com/aws/aws-sdk-go/aws"
|
||||
@@ -28,6 +29,7 @@ type UploadBaseReq struct {
|
||||
ApiType int64
|
||||
UserId int64
|
||||
GuestId int64
|
||||
FileByte []byte
|
||||
}
|
||||
|
||||
type UploadBaseRes struct {
|
||||
@@ -65,63 +67,160 @@ func (upload *Upload) UploadFileByBase64(req *UploadBaseReq) (*UploadBaseRes, er
|
||||
|
||||
var uploadBaseRes = UploadBaseRes{}
|
||||
resourceModel := gmodel.NewFsResourceModel(upload.MysqlConn)
|
||||
resourceInfo, err := resourceModel.FindOneById(upload.Ctx, resourceId)
|
||||
if err == nil && resourceInfo.ResourceId != "" {
|
||||
uploadBaseRes.Status = 1
|
||||
uploadBaseRes.ResourceId = resourceId
|
||||
uploadBaseRes.ResourceUrl = *resourceInfo.ResourceUrl
|
||||
} else {
|
||||
dist, contentType, err := FileBase64ToByte(req.FileData)
|
||||
|
||||
if err != nil {
|
||||
logx.Errorf("err:%+v，desc:%+v", err, "fail.upload.resourceInfoGet.mysql")
|
||||
return nil, err
|
||||
}
|
||||
|
||||
// 创建S3对象存储请求
|
||||
s3req, _ = svc.PutObjectRequest(
|
||||
&s3.PutObjectInput{
|
||||
Bucket: bucketName,
|
||||
Key: &resourceId,
|
||||
},
|
||||
)
|
||||
|
||||
// 设置请求体为文件数据
|
||||
s3req.SetBufferBody(dist)
|
||||
|
||||
// 发送请求
|
||||
err = s3req.Send()
|
||||
|
||||
// 检查是否有错误
|
||||
if err != nil {
|
||||
logx.Errorf("err:%+v，desc:%+v", err, "fail.upload.s3req")
|
||||
return nil, err
|
||||
} else {
|
||||
var url = s3req.HTTPRequest.URL.String()
|
||||
// 打印请求URL
|
||||
logx.Info(url)
|
||||
err := resourceModel.Trans(upload.Ctx, func(ctx context.Context, connGorm *gorm.DB) error {
|
||||
resourceModelTS := gmodel.NewFsResourceModel(connGorm)
|
||||
resourceInfo, err := resourceModelTS.FindOneById(ctx, resourceId)
|
||||
if err == nil && resourceInfo.ResourceId != "" {
|
||||
uploadBaseRes.Status = 1
|
||||
uploadBaseRes.ResourceId = resourceId
|
||||
uploadBaseRes.ResourceUrl = url
|
||||
var version string = "0.0.1"
|
||||
var nowTime = time.Now()
|
||||
_, err = resourceModel.Create(upload.Ctx, &gmodel.FsResource{
|
||||
ResourceId: resourceId,
|
||||
UserId: &req.UserId,
|
||||
GuestId: &req.GuestId,
|
||||
ResourceType: &contentType,
|
||||
ResourceUrl: &url,
|
||||
Version: &version,
|
||||
UploadedAt: &nowTime,
|
||||
Metadata: &req.Metadata,
|
||||
ApiType: &apiType,
|
||||
BucketName: bucketName,
|
||||
})
|
||||
uploadBaseRes.ResourceUrl = *resourceInfo.ResourceUrl
|
||||
} else {
|
||||
dist, contentType, err := FileBase64ToByte(req.FileData)
|
||||
|
||||
if err != nil {
|
||||
logx.Errorf("err:%+v，desc:%+v", err, "fail.upload.resourceInfoAdd.mysql")
|
||||
return nil, err
|
||||
logx.Errorf("err:%+v，desc:%+v", err, "fail.upload.resourceInfoGet.mysql")
|
||||
return err
|
||||
}
|
||||
|
||||
// 创建S3对象存储请求
|
||||
s3req, _ = svc.PutObjectRequest(
|
||||
&s3.PutObjectInput{
|
||||
Bucket: bucketName,
|
||||
Key: &resourceId,
|
||||
},
|
||||
)
|
||||
|
||||
// 设置请求体为文件数据
|
||||
s3req.SetBufferBody(dist)
|
||||
|
||||
// 发送请求
|
||||
err = s3req.Send()
|
||||
|
||||
// 检查是否有错误
|
||||
if err != nil {
|
||||
logx.Errorf("err:%+v，desc:%+v", err, "fail.upload.s3req")
|
||||
return err
|
||||
} else {
|
||||
var url = s3req.HTTPRequest.URL.String()
|
||||
// 打印请求URL
|
||||
logx.Info(url)
|
||||
uploadBaseRes.Status = 1
|
||||
uploadBaseRes.ResourceId = resourceId
|
||||
uploadBaseRes.ResourceUrl = url
|
||||
var version string = "0.0.1"
|
||||
var nowTime = time.Now()
|
||||
_, err = resourceModelTS.Create(upload.Ctx, &gmodel.FsResource{
|
||||
ResourceId: resourceId,
|
||||
UserId: &req.UserId,
|
||||
GuestId: &req.GuestId,
|
||||
ResourceType: &contentType,
|
||||
ResourceUrl: &url,
|
||||
Version: &version,
|
||||
UploadedAt: &nowTime,
|
||||
Metadata: &req.Metadata,
|
||||
ApiType: &apiType,
|
||||
BucketName: bucketName,
|
||||
})
|
||||
if err != nil {
|
||||
logx.Errorf("err:%+v，desc:%+v", err, "fail.upload.resourceInfoAdd.mysql")
|
||||
return err
|
||||
}
|
||||
}
|
||||
}
|
||||
return nil
|
||||
})
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return &uploadBaseRes, err
|
||||
}
|
||||
|
||||
func (upload *Upload) UploadFileByByte(req *UploadBaseReq) (*UploadBaseRes, error) {
|
||||
// 定义存储桶名称
|
||||
var bucketName *string
|
||||
var apiType int64 = req.ApiType
|
||||
|
||||
// 根据类别选择存储桶
|
||||
switch req.UploadBucket {
|
||||
case 2:
|
||||
bucketName = basic.TempfileBucketName
|
||||
default:
|
||||
bucketName = basic.StorageBucketName
|
||||
}
|
||||
|
||||
// 设置AWS会话的区域
|
||||
upload.AwsSession.Config.Region = aws.String("us-west-1")
|
||||
|
||||
// 创建新的S3服务实例
|
||||
svc := s3.New(upload.AwsSession)
|
||||
|
||||
// 定义S3请求和当前时间
|
||||
var s3req *request.Request
|
||||
|
||||
var resourceId string = req.FileHash
|
||||
|
||||
var uploadBaseRes = UploadBaseRes{}
|
||||
resourceModel := gmodel.NewFsResourceModel(upload.MysqlConn)
|
||||
err := resourceModel.Trans(upload.Ctx, func(ctx context.Context, connGorm *gorm.DB) error {
|
||||
resourceModelTS := gmodel.NewFsResourceModel(connGorm)
|
||||
resourceInfo, err := resourceModelTS.FindOneById(ctx, resourceId)
|
||||
if err == nil && resourceInfo.ResourceId != "" {
|
||||
uploadBaseRes.Status = 1
|
||||
uploadBaseRes.ResourceId = resourceId
|
||||
uploadBaseRes.ResourceUrl = *resourceInfo.ResourceUrl
|
||||
} else {
|
||||
contentType := http.DetectContentType(req.FileByte)
|
||||
// 创建S3对象存储请求
|
||||
s3req, _ = svc.PutObjectRequest(
|
||||
&s3.PutObjectInput{
|
||||
Bucket: bucketName,
|
||||
Key: &resourceId,
|
||||
},
|
||||
)
|
||||
|
||||
// 设置请求体为文件数据
|
||||
s3req.SetBufferBody(req.FileByte)
|
||||
|
||||
// 发送请求
|
||||
err = s3req.Send()
|
||||
|
||||
// 检查是否有错误
|
||||
if err != nil {
|
||||
logx.Errorf("err:%+v，desc:%+v", err, "fail.upload.s3req")
|
||||
return err
|
||||
} else {
|
||||
var url = s3req.HTTPRequest.URL.String()
|
||||
// 打印请求URL
|
||||
logx.Info(url)
|
||||
uploadBaseRes.Status = 1
|
||||
uploadBaseRes.ResourceId = resourceId
|
||||
uploadBaseRes.ResourceUrl = url
|
||||
var version string = "0.0.1"
|
||||
var nowTime = time.Now()
|
||||
_, err = resourceModelTS.Create(upload.Ctx, &gmodel.FsResource{
|
||||
ResourceId: resourceId,
|
||||
UserId: &req.UserId,
|
||||
GuestId: &req.GuestId,
|
||||
ResourceType: &contentType,
|
||||
ResourceUrl: &url,
|
||||
Version: &version,
|
||||
UploadedAt: &nowTime,
|
||||
Metadata: &req.Metadata,
|
||||
ApiType: &apiType,
|
||||
BucketName: bucketName,
|
||||
})
|
||||
if err != nil {
|
||||
logx.Errorf("err:%+v，desc:%+v", err, "fail.upload.resourceInfoAdd.mysql")
|
||||
return err
|
||||
}
|
||||
}
|
||||
}
|
||||
return nil
|
||||
})
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return &uploadBaseRes, err
|
||||
}
|
||||
|
||||
@@ -12,11 +12,11 @@ type RenderImageReqMsg struct {
|
||||
RenderData RenderData `json:"render_data"`
|
||||
}
|
||||
type RenderData struct {
|
||||
TemplateTagId int64 `json:"template_tag_id"` //模板标签id
|
||||
ProductId int64 `json:"product_id"` //产品id
|
||||
Data interface{} `json:"data"` //面片数据
|
||||
UserId int64 `json:"user_id"` //用户id
|
||||
GuestId int64 `json:"guest_id"` //游客id
|
||||
TemplateTagId int64 `json:"template_tag_id"` //模板标签id
|
||||
ProductId int64 `json:"product_id"` //产品id
|
||||
Logo string `json:"logo"` //log资源地址(websocket连接建立再赋值)
|
||||
UserId int64 `json:"user_id"` //用户id(websocket连接建立再赋值)
|
||||
GuestId int64 `json:"guest_id"` //游客id(websocket连接建立再赋值)
|
||||
}
|
||||
|
||||
// websocket发送渲染完的数据
|
||||
|
||||
Reference in New Issue
Block a user