Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into feature/auth

utils/basic/basic.go

@@ -84,8 +84,9 @@ var (
 	CodeSharedStateErr       = &StatusResponse{5201, "shared state server  err"} // 状态机错误
 	CodeEmailConfirmationErr = &StatusResponse{5202, "email confirmation   err"} // email 验证错误
 
-	CodeFileUploadErr     = &StatusResponse{5110, "file upload  err"} // 文件上传失败
-	CodeFileUploadLogoErr = &StatusResponse{5111, "logo upload  err"} // 用户上传LOGO失败
+	CodeFileUploadErr      = &StatusResponse{5110, "file upload  err"} // 文件上传失败
+	CodeFileUploadLogoErr  = &StatusResponse{5111, "logo upload  err"} // 用户上传LOGO失败
+	CodeFileLogoCombineErr = &StatusResponse{5112, "logo upload  err"} // 用户合图失败
 )
 
 type Response struct {

utils/basic/request_parse.go

@@ -52,7 +52,7 @@ func NormalAfterLogic(w http.ResponseWriter, r *http.Request, resp *Response) {
 }
 
 func RequestParse(w http.ResponseWriter, r *http.Request, state *fsm.SharedState, LogicRequest any) (*auth.UserInfo, error) {
-
+	// log.Println(io.ReadAll(r.Body))
 	token, info, err := auth.ParseJwtTokenHeader[auth.UserInfo](r) //解析Token头, 和payload信息
 	if err != nil {
 		logx.Error(err)
@@ -60,16 +60,19 @@ func RequestParse(w http.ResponseWriter, r *http.Request, state *fsm.SharedState
 	}
 
 	var secret uint64 = 0
-	if info.IsUser() {
-		us, err := state.GetUserState(info.UserId) //获取缓存的用户状态
-		if err != nil {
-			logx.Error(err)
-			return nil, err
-		}
-		secret = us.PwdHash // 获取密码的hash做jwt, 便于重置密码的使用
+	if info != nil {
 
-	} else if info.IsGuest() {
-		secret = DefaultJwtSecret //获取默认的hash
+		if info.IsUser() {
+			us, err := state.GetUserState(info.UserId) //获取缓存的用户状态
+			if err != nil {
+				logx.Error(err)
+				return nil, err
+			}
+			secret = us.PwdHash // 获取密码的hash做jwt, 便于重置密码的使用
+
+		} else if info.IsGuest() {
+			secret = DefaultJwtSecret //获取默认的hash
+		}
 	}
 
 	var userinfo *auth.UserInfo

utils/file/upload.go

@@ -0,0 +1,127 @@
+package file
+
+import (
+	"context"
+	"fusenapi/model/gmodel"
+	"fusenapi/utils/basic"
+	"time"
+
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/request"
+	"github.com/aws/aws-sdk-go/aws/session"
+	"github.com/aws/aws-sdk-go/service/s3"
+	"github.com/zeromicro/go-zero/core/logx"
+	"gorm.io/gorm"
+)
+
+type Upload struct {
+	Ctx        context.Context
+	MysqlConn  *gorm.DB
+	AwsSession *session.Session
+}
+
+type UploadBaseReq struct {
+	FileHash     string
+	FileData     string
+	Metadata     string
+	UploadBucket int64
+	ApiType      int64
+	UserId       int64
+	GuestId      int64
+}
+
+type UploadBaseRes struct {
+	Key          string `json:"key"`
+	Status       int64  `json:"status"`
+	ApiType      int64  `json:"api_type"`
+	ResourceId   string `json:"resource_id"`
+	ResourceType string `json:"resource_type"`
+	ResourceUrl  string `json:"resource_url"`
+}
+
+func (upload *Upload) UploadFileByBase64(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)
+	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)
+			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,
+			})
+			if err != nil {
+				logx.Errorf("err:%+v，desc:%+v", err, "fail.upload.resourceInfoAdd.mysql")
+				return nil, err
+			}
+		}
+	}
+	return &uploadBaseRes, err
+}

utils/websocket_data/render_data.go

@@ -16,6 +16,7 @@ type RenderData struct {
 	ProductId     int64       `json:"product_id"`      //产品id
 	Data          interface{} `json:"data"`            //面片数据
 	UserId        int64       `json:"user_id"`         //用户id
+	GuestId       int64       `json:"guest_id"`        //游客id
 }
 
 // websocket发送渲染完的数据