diff --git a/server/data-transfer/internal/handler/routes.go b/server/data-transfer/internal/handler/routes.go index 91d08deb..1c9fc143 100644 --- a/server/data-transfer/internal/handler/routes.go +++ b/server/data-transfer/internal/handler/routes.go @@ -22,11 +22,6 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) { Path: "/qrcode-set/list", Handler: GetQrCodeSetListHandler(serverCtx), }, - { - Method: http.MethodPost, - Path: "/upload/qrcode", - Handler: UploadQrcodeHandler(serverCtx), - }, }, ) } diff --git a/server/data-transfer/internal/types/types.go b/server/data-transfer/internal/types/types.go index e176e1da..51aead14 100644 --- a/server/data-transfer/internal/types/types.go +++ b/server/data-transfer/internal/types/types.go @@ -16,14 +16,7 @@ type GetQrCodeSetListRsp struct { Name string `json:"name"` } -type UploadQrcodeReq struct { - Url string `json:"url"` - QRcodeType int64 `json:"QRcodeType"` -} - -type UploadQrcodeRsp struct { - Link string `json:"link"` - Data string `json:"d"` +type Request struct { } type Response struct { @@ -32,20 +25,26 @@ type Response struct { Data interface{} `json:"data"` } -type ResponseJwt struct { - Code int `json:"code"` - Message string `json:"msg"` - Data interface{} `json:"data"` - AccessSecret string `json:"accessSecret"` - AccessExpire int64 `json:"accessExpire"` -} - type Auth struct { AccessSecret string `json:"accessSecret"` AccessExpire int64 `json:"accessExpire"` RefreshAfter int64 `json:"refreshAfter"` } +type File struct { + Filename string `fsfile:"filename"` + Header map[string][]string `fsfile:"header"` + Size int64 `fsfile:"size"` + Data []byte `fsfile:"data"` +} + +type Meta struct { + TotalCount int64 `json:"totalCount"` + PageCount int64 `json:"pageCount"` + CurrentPage int `json:"currentPage"` + PerPage int `json:"perPage"` +} + // Set 设置Response的Code和Message值 func (resp *Response) Set(Code int, Message string) *Response { return &Response{ diff --git a/server/upload/internal/handler/routes.go b/server/upload/internal/handler/routes.go index 0ef94f41..a2e52541 100644 --- a/server/upload/internal/handler/routes.go +++ b/server/upload/internal/handler/routes.go @@ -27,6 +27,11 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) { Path: "/upload/upload-file-backend", Handler: UploadFileBackendHandler(serverCtx), }, + { + Method: http.MethodPost, + Path: "/upload/qrcode", + Handler: UploadQrcodeHandler(serverCtx), + }, }, ) } diff --git a/server/data-transfer/internal/handler/uploadqrcodehandler.go b/server/upload/internal/handler/uploadqrcodehandler.go similarity index 93% rename from server/data-transfer/internal/handler/uploadqrcodehandler.go rename to server/upload/internal/handler/uploadqrcodehandler.go index 79bf19bb..8ff3d05a 100644 --- a/server/data-transfer/internal/handler/uploadqrcodehandler.go +++ b/server/upload/internal/handler/uploadqrcodehandler.go @@ -10,9 +10,9 @@ import ( "fusenapi/utils/auth" "fusenapi/utils/basic" - "fusenapi/server/data-transfer/internal/logic" - "fusenapi/server/data-transfer/internal/svc" - "fusenapi/server/data-transfer/internal/types" + "fusenapi/server/upload/internal/logic" + "fusenapi/server/upload/internal/svc" + "fusenapi/server/upload/internal/types" ) func UploadQrcodeHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { diff --git a/server/data-transfer/internal/logic/uploadqrcodelogic.go b/server/upload/internal/logic/uploadqrcodelogic.go similarity index 94% rename from server/data-transfer/internal/logic/uploadqrcodelogic.go rename to server/upload/internal/logic/uploadqrcodelogic.go index 81cd0fe7..f3242661 100644 --- a/server/data-transfer/internal/logic/uploadqrcodelogic.go +++ b/server/upload/internal/logic/uploadqrcodelogic.go @@ -4,14 +4,16 @@ import ( "context" "errors" "fusenapi/model/gmodel" - "fusenapi/server/data-transfer/internal/svc" - "fusenapi/server/data-transfer/internal/types" "fusenapi/utils/auth" "fusenapi/utils/basic" "fusenapi/utils/qrcode" - "github.com/zeromicro/go-zero/core/logx" "gorm.io/gorm" "strings" + + "fusenapi/server/upload/internal/svc" + "fusenapi/server/upload/internal/types" + + "github.com/zeromicro/go-zero/core/logx" ) type UploadQrcodeLogic struct { @@ -28,7 +30,6 @@ func NewUploadQrcodeLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Uplo } } -// 生成base64二维码 func (l *UploadQrcodeLogic) UploadQrcode(req *types.UploadQrcodeReq, userinfo *auth.UserInfo) (resp *basic.Response) { if userinfo.GetIdType() != auth.IDTYPE_User { return resp.SetStatusWithMessage(basic.CodeServiceErr, "please login first") diff --git a/server/upload/internal/types/types.go b/server/upload/internal/types/types.go index 28ea0c8f..9f64f4ea 100644 --- a/server/upload/internal/types/types.go +++ b/server/upload/internal/types/types.go @@ -23,6 +23,16 @@ type RequestUploadFileBackend struct { Category string `form:"category"` // 类别 } +type UploadQrcodeReq struct { + Url string `json:"url"` + QRcodeType int64 `json:"QRcodeType"` +} + +type UploadQrcodeRsp struct { + Link string `json:"link"` + Data string `json:"d"` +} + type Request struct { } diff --git a/server_api/data-transfer.api b/server_api/data-transfer.api index eda03215..cfaba6e8 100644 --- a/server_api/data-transfer.api +++ b/server_api/data-transfer.api @@ -16,9 +16,6 @@ service data-transfer { //获取二维码设置列表 @handler GetQrCodeSetListHandler get /qrcode-set/list returns (response); - //生成二维码 - @handler UploadQrcodeHandler - post /upload/qrcode (UploadQrcodeReq) returns (response); } //获取标准logo列表 @@ -31,13 +28,4 @@ type GetStandardLogoListRsp { type GetQrCodeSetListRsp { Id int64 `json:"id"` Name string `json:"name"` -} -//生成二维码 -type UploadQrcodeReq { - Url string `json:"url"` - QRcodeType int64 `json:"QRcodeType"` -} -type UploadQrcodeRsp { - Link string `json:"link"` - Data string `json:"d"` } \ No newline at end of file diff --git a/server_api/upload.api b/server_api/upload.api index c5b0e56f..002150cb 100644 --- a/server_api/upload.api +++ b/server_api/upload.api @@ -9,6 +9,20 @@ info ( import "basic.api" +service upload { + @handler UploadUpFileHandler + get /upload/up-file(RequestUpFile) returns (response); + + @handler UploadFileFrontendHandler + post /upload/upload-file-frontend(RequestUploadFileFrontend) returns (response); + + @handler UploadFileBackendHandler + post /upload/upload-file-backend(RequestUploadFileBackend) returns (response); + //生成二维码 + @handler UploadQrcodeHandler + post /upload/qrcode (UploadQrcodeReq) returns (response); +} + type RequestUpFile { UpFile string `form:"upfile"` IsCut string `form:"is_cut"` // 是否裁剪 @@ -27,13 +41,12 @@ type RequestUploadFileBackend { Category string `form:"category"` // 类别 } -service upload { - @handler UploadUpFileHandler - get /upload/up-file(RequestUpFile) returns (response); - - @handler UploadFileFrontendHandler - post /upload/upload-file-frontend(RequestUploadFileFrontend) returns (response); - - @handler UploadFileBackendHandler - post /upload/upload-file-backend(RequestUploadFileBackend) returns (response); +//生成二维码 +type UploadQrcodeReq { + Url string `json:"url"` + QRcodeType int64 `json:"QRcodeType"` +} +type UploadQrcodeRsp { + Link string `json:"link"` + Data string `json:"d"` } \ No newline at end of file