From 1f941b7c9deae40ec5cabf53db61d6cb57601385 Mon Sep 17 00:00:00 2001 From: laodaming <11058467+laudamine@user.noreply.gitee.com> Date: Thu, 15 Jun 2023 15:28:17 +0800 Subject: [PATCH] fixz --- model/gmodel/fsusermodel.go | 52 ++++++------- server/orders/etc/orders.yaml | 8 ++ .../handler/getorderinvoicehandler.go | 78 +++++++++++++++++++ server/orders/internal/handler/routes.go | 22 ++++++ .../internal/logic/getorderinvoicelogic.go | 68 ++++++++++++++++ server/orders/internal/svc/servicecontext.go | 50 ++++++++++++ server/orders/internal/types/types.go | 76 ++++++++++++++++++ server/orders/orders.go | 49 ++++++++++++ 8 files changed, 377 insertions(+), 26 deletions(-) create mode 100644 server/orders/etc/orders.yaml create mode 100644 server/orders/internal/handler/getorderinvoicehandler.go create mode 100644 server/orders/internal/handler/routes.go create mode 100644 server/orders/internal/logic/getorderinvoicelogic.go create mode 100644 server/orders/internal/svc/servicecontext.go create mode 100644 server/orders/internal/types/types.go create mode 100644 server/orders/orders.go diff --git a/model/gmodel/fsusermodel.go b/model/gmodel/fsusermodel.go index bf9767aa..a78e2217 100755 --- a/model/gmodel/fsusermodel.go +++ b/model/gmodel/fsusermodel.go @@ -7,32 +7,32 @@ import ( ) type FsUser struct { - Id int64 `gorm:"primary_key" json:"id"` // ID - FaceId int64 `gorm:"default:0" json:"face_id"` // facebook的userid - Sub int64 `gorm:"default:0" json:"sub"` // google的sub - FirstName string `gorm:"default:''" json:"first_name"` // FirstName - LastName string `gorm:"default:''" json:"last_name"` // LastName - Username string `gorm:"default:''" json:"username"` // 用户名 - Company string `gorm:"default:''" json:"company"` // 公司名称 - Mobile string `gorm:"default:''" json:"mobile" ` // 手机号码 - AuthKey string `gorm:"default:''" json:"auth_key"` - PasswordHash string `gorm:"default:''" json:"password_hash"` - VerificationToken string `gorm:"default:''" json:"verification_token"` - PasswordResetToken string `gorm:"default:''" json:"password_reset_token"` - Email string `gorm:"default:''" json:"email"` // 邮箱 - Type int64 `gorm:"default:1" json:"type"` // 1普通餐厅 2连锁餐厅 - Status int64 `gorm:"default:1" json:"status"` // 1正常 0不正常 - IsDel int64 `gorm:"default:0" json:"is_del"` // 是否删除 1删除 - CreatedAt int64 `gorm:"default:0" json:"created_at"` // 添加时间 - UpdatedAt int64 `gorm:"default:0" json:"updated_at"` // 更新时间 - IsOrderStatusEmail int64 `gorm:"default:0" json:"is_order_status_email"` // 订单状态改变时是否接收邮件 - IsEmailAdvertisement int64 `gorm:"default:0" json:"is_email_advertisement"` // 是否接收邮件广告 - IsOrderStatusPhone int64 `gorm:"default:0" json:"is_order_status_phone"` // 订单状态改变是是否接收电话 - IsPhoneAdvertisement int64 `gorm:"default:0" json:"is_phone_advertisement"` // 是否接收短信广告 - IsOpenRender int64 `gorm:"default:0" json:"is_open_render"` // 是否打开个性化渲染（1：开启，0：关闭） - IsThousandFace int64 `gorm:"default:0" json:"is_thousand_face"` // 是否已经存在千人千面（1：存在，0：不存在） - IsLowRendering int64 `gorm:"default:0" json:"is_low_rendering"` // 是否开启低渲染模型渲染 - IsRemoveBg int64 `gorm:"default:1" json:"is_remove_bg"` // 用户上传logo是否去除背景 + Id int64 `gorm:"primary_key" json:"id"` // ID + FaceId *int64 `gorm:"default:0" json:"face_id"` // facebook的userid + Sub *int64 `gorm:"default:0" json:"sub"` // google的sub + FirstName *string `gorm:"default:''" json:"first_name"` // FirstName + LastName *string `gorm:"default:''" json:"last_name"` // LastName + Username *string `gorm:"default:''" json:"username"` // 用户名 + Company *string `gorm:"default:''" json:"company"` // 公司名称 + Mobile *string `gorm:"default:''" json:"mobile" ` // 手机号码 + AuthKey *string `gorm:"default:''" json:"auth_key"` + PasswordHash *string `gorm:"default:''" json:"password_hash"` + VerificationToken *string `gorm:"default:''" json:"verification_token"` + PasswordResetToken *string `gorm:"default:''" json:"password_reset_token"` + Email *string `gorm:"default:''" json:"email"` // 邮箱 + Type *int64 `gorm:"default:1" json:"type"` // 1普通餐厅 2连锁餐厅 + Status *int64 `gorm:"default:1" json:"status"` // 1正常 0不正常 + IsDel *int64 `gorm:"default:0" json:"is_del"` // 是否删除 1删除 + CreatedAt *int64 `gorm:"default:0" json:"created_at"` // 添加时间 + UpdatedAt *int64 `gorm:"default:0" json:"updated_at"` // 更新时间 + IsOrderStatusEmail *int64 `gorm:"default:0" json:"is_order_status_email"` // 订单状态改变时是否接收邮件 + IsEmailAdvertisement *int64 `gorm:"default:0" json:"is_email_advertisement"` // 是否接收邮件广告 + IsOrderStatusPhone *int64 `gorm:"default:0" json:"is_order_status_phone"` // 订单状态改变是是否接收电话 + IsPhoneAdvertisement *int64 `gorm:"default:0" json:"is_phone_advertisement"` // 是否接收短信广告 + IsOpenRender *int64 `gorm:"default:0" json:"is_open_render"` // 是否打开个性化渲染（1：开启，0：关闭） + IsThousandFace *int64 `gorm:"default:0" json:"is_thousand_face"` // 是否已经存在千人千面（1：存在，0：不存在） + IsLowRendering *int64 `gorm:"default:0" json:"is_low_rendering"` // 是否开启低渲染模型渲染 + IsRemoveBg *int64 `gorm:"default:1" json:"is_remove_bg"` // 用户上传logo是否去除背景 } type FsUserModel struct { db *gorm.DB diff --git a/server/orders/etc/orders.yaml b/server/orders/etc/orders.yaml new file mode 100644 index 00000000..924f35e1 --- /dev/null +++ b/server/orders/etc/orders.yaml @@ -0,0 +1,8 @@ +Name: orders +Host: 0.0.0.0 +Port: 8893 +SourceMysql: fusentest:XErSYmLELKMnf3Dh@tcp(110.41.19.98:3306)/fusentest +Auth: + AccessSecret: fusen2023 + AccessExpire: 60 + RefreshAfter: 60 \ No newline at end of file diff --git a/server/orders/internal/handler/getorderinvoicehandler.go b/server/orders/internal/handler/getorderinvoicehandler.go new file mode 100644 index 00000000..03992ff7 --- /dev/null +++ b/server/orders/internal/handler/getorderinvoicehandler.go @@ -0,0 +1,78 @@ +package handler + +import ( + "errors" + "net/http" + + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/rest/httpx" + + "fusenapi/utils/auth" + "fusenapi/utils/basic" + + "fusenapi/server/orders/internal/logic" + "fusenapi/server/orders/internal/svc" + "fusenapi/server/orders/internal/types" +) + +func GetOrderInvoiceHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { + return func(w http.ResponseWriter, r *http.Request) { + + var ( + // 定义错误变量 + err error + // 定义用户信息变量 + userinfo *auth.UserInfo + ) + // 解析JWT token,并对空用户进行判断 + claims, err := svcCtx.ParseJwtToken(r) + // 如果解析JWT token出错,则返回未授权的JSON响应并记录错误消息 + if err != nil { + httpx.OkJsonCtx(r.Context(), w, &basic.Response{ + Code: 401, // 返回401状态码,表示未授权 + Message: "unauthorized", // 返回未授权信息 + }) + logx.Info("unauthorized:", err.Error()) // 记录错误日志 + return + } + + if claims != nil { + // 从token中获取对应的用户信息 + userinfo, err = auth.GetUserInfoFormMapClaims(claims) + // 如果获取用户信息出错,则返回未授权的JSON响应并记录错误消息 + if err != nil { + httpx.OkJsonCtx(r.Context(), w, &basic.Response{ + Code: 401, + Message: "unauthorized", + }) + logx.Info("unauthorized:", err.Error()) + return + } + } else { + // 如果claims为nil,则认为用户身份为白板用户 + userinfo = &auth.UserInfo{UserId: 0, GuestId: 0} + } + + var req types.GetOrderInvoiceReq + // 如果端点有请求结构体，则使用httpx.Parse方法从HTTP请求体中解析请求数据 + if err := httpx.Parse(r, &req); err != nil { + httpx.OkJsonCtx(r.Context(), w, &basic.Response{ + Code: 510, + Message: "parameter error", + }) + logx.Info(err) + return + } + // 创建一个业务逻辑层实例 + l := logic.NewGetOrderInvoiceLogic(r.Context(), svcCtx) + resp := l.GetOrderInvoice(&req, userinfo) + // 如果响应不为nil，则使用httpx.OkJsonCtx方法返回JSON响应; + if resp != nil { + httpx.OkJsonCtx(r.Context(), w, resp) + } else { + err := errors.New("server logic is error, resp must not be nil") + httpx.ErrorCtx(r.Context(), w, err) + logx.Error(err) + } + } +} diff --git a/server/orders/internal/handler/routes.go b/server/orders/internal/handler/routes.go new file mode 100644 index 00000000..818fd4f8 --- /dev/null +++ b/server/orders/internal/handler/routes.go @@ -0,0 +1,22 @@ +// Code generated by goctl. DO NOT EDIT. +package handler + +import ( + "net/http" + + "fusenapi/server/orders/internal/svc" + + "github.com/zeromicro/go-zero/rest" +) + +func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) { + server.AddRoutes( + []rest.Route{ + { + Method: http.MethodGet, + Path: "/order/invoice", + Handler: GetOrderInvoiceHandler(serverCtx), + }, + }, + ) +} diff --git a/server/orders/internal/logic/getorderinvoicelogic.go b/server/orders/internal/logic/getorderinvoicelogic.go new file mode 100644 index 00000000..97790923 --- /dev/null +++ b/server/orders/internal/logic/getorderinvoicelogic.go @@ -0,0 +1,68 @@ +package logic + +import ( + "encoding/json" + "fusenapi/model/gmodel" + "fusenapi/utils/auth" + "fusenapi/utils/basic" + + "context" + + "fusenapi/server/orders/internal/svc" + "fusenapi/server/orders/internal/types" + + "github.com/zeromicro/go-zero/core/logx" +) + +type GetOrderInvoiceLogic struct { + logx.Logger + ctx context.Context + svcCtx *svc.ServiceContext +} + +func NewGetOrderInvoiceLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetOrderInvoiceLogic { + return &GetOrderInvoiceLogic{ + Logger: logx.WithContext(ctx), + ctx: ctx, + svcCtx: svcCtx, + } +} + +func (l *GetOrderInvoiceLogic) GetOrderInvoice(req *types.GetOrderInvoiceReq, userinfo *auth.UserInfo) (resp *basic.Response) { + if userinfo.GetIdType() != auth.IDTYPE_User { + return resp.SetStatusWithMessage(basic.CodeUnAuth, "please login first") + } + //获取用户信息 + userModel := gmodel.NewFsUserModel(l.svcCtx.MysqlConn) + user, err := userModel.FindOne(l.ctx, userinfo.UserId) + if err != nil { + logx.Error(err) + return resp.SetStatusWithMessage(basic.CodeServiceErr, "failed to get user info") + } + if user.Id == 0 { + return resp.SetStatusWithMessage(basic.CodeDbRecordNotFoundErr, "user not found") + } + if req.Sn == "" { + return resp.SetStatusWithMessage(basic.CodeRequestParamsErr, "param sn is required") + } + //查询订单信息 + orderModel := gmodel.NewFsOrderModel(l.svcCtx.MysqlConn) + orderInfo, err := orderModel.FindOneBySn(l.ctx, userinfo.UserId, req.Sn) + if err != nil { + logx.Error(err) + return resp.SetStatusWithMessage(basic.CodeServiceErr, "failed to get order info") + } + if orderInfo.Id == 0 { + return resp.SetStatusWithMessage(basic.CodeDbRecordNotFoundErr, "order is not exists") + } + //地址数据 + var address gmodel.FsAddress + if err = json.Unmarshal([]byte(*orderInfo.AddressInfo), &address); err != nil { + logx.Error(err) + return resp.SetStatusWithMessage(basic.CodeServiceErr, "failed to parse address info") + } + if user.LastName != nil && user.FirstName != nil { + + } + return resp.SetStatus(basic.CodeOK) +} diff --git a/server/orders/internal/svc/servicecontext.go b/server/orders/internal/svc/servicecontext.go new file mode 100644 index 00000000..8d5a0630 --- /dev/null +++ b/server/orders/internal/svc/servicecontext.go @@ -0,0 +1,50 @@ +package svc + +import ( + "errors" + "fusenapi/initalize" + "fusenapi/server/orders/internal/config" + "github.com/golang-jwt/jwt" + "gorm.io/gorm" + "net/http" +) + +type ServiceContext struct { + Config config.Config + + MysqlConn *gorm.DB +} + +func NewServiceContext(c config.Config) *ServiceContext { + + return &ServiceContext{ + Config: c, + MysqlConn: initalize.InitMysql(c.SourceMysql), + } +} + +func (svcCxt *ServiceContext) ParseJwtToken(r *http.Request) (jwt.MapClaims, error) { + AuthKey := r.Header.Get("Authorization") + if len(AuthKey) <= 50 { + return nil, errors.New(fmt.Sprint("Error parsing token, len:", len(AuthKey))) + } + + token, err := jwt.Parse(AuthKey, func(token *jwt.Token) (interface{}, error) { + // 检查签名方法是否为 HS256 + if _, ok := token.Method.(*jwt.SigningMethodHMAC); !ok { + return nil, fmt.Errorf("unexpected signing method: %v", token.Header["alg"]) + } + // 返回用于验证签名的密钥 + return svcCxt.Config.Auth.AccessSecret, nil + }) + if err != nil { + return nil, errors.New(fmt.Sprint("Error parsing token:", err)) + } + + // 验证成功返回 + if claims, ok := token.Claims.(jwt.MapClaims); ok && token.Valid { + return claims, nil + } + + return nil, errors.New(fmt.Sprint("Invalid token", err)) +} diff --git a/server/orders/internal/types/types.go b/server/orders/internal/types/types.go new file mode 100644 index 00000000..67d5d5aa --- /dev/null +++ b/server/orders/internal/types/types.go @@ -0,0 +1,76 @@ +// Code generated by goctl. DO NOT EDIT. +package types + +import ( + "fusenapi/utils/basic" +) + +type GetOrderInvoiceReq struct { + Sn string `json:"sn"` + TimeZone string `json:"timeZone"` +} + +type GetOrderInvoiceRsp struct { + FileName string `json:"file_name"` + Pdf int64 `json:"pdf"` +} + +type Response struct { + Code int `json:"code"` + Message string `json:"msg"` + 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"` +} + +// Set 设置Response的Code和Message值 +func (resp *Response) Set(Code int, Message string) *Response { + return &Response{ + Code: Code, + Message: Message, + } +} + +// Set 设置整个Response +func (resp *Response) SetWithData(Code int, Message string, Data interface{}) *Response { + return &Response{ + Code: Code, + Message: Message, + Data: Data, + } +} + +// SetStatus 设置默认StatusResponse(内部自定义) 默认msg, 可以带data, data只使用一个参数 +func (resp *Response) SetStatus(sr *basic.StatusResponse, data ...interface{}) *Response { + newResp := &Response{ + Code: sr.Code, + } + if len(data) == 1 { + newResp.Data = data[0] + } + return newResp +} + +// SetStatusWithMessage 设置默认StatusResponse(内部自定义) 非默认msg, 可以带data, data只使用一个参数 +func (resp *Response) SetStatusWithMessage(sr *basic.StatusResponse, msg string, data ...interface{}) *Response { + newResp := &Response{ + Code: sr.Code, + Message: msg, + } + if len(data) == 1 { + newResp.Data = data[0] + } + return newResp +} diff --git a/server/orders/orders.go b/server/orders/orders.go new file mode 100644 index 00000000..d2bf841e --- /dev/null +++ b/server/orders/orders.go @@ -0,0 +1,49 @@ +package main + +import ( + "flag" + "fmt" + + "fusenapi/server/orders/internal/config" + "fusenapi/server/orders/internal/handler" + "fusenapi/server/orders/internal/svc" + + "github.com/zeromicro/go-zero/core/conf" + "github.com/zeromicro/go-zero/rest" +) + +var configFile = flag.String("f", "etc/orders.yaml", "the config file") + +func main() { + flag.Parse() + + var c config.Config + conf.MustLoad(*configFile, &c) + + server := rest.MustNewServer(c.RestConf) + defer server.Stop() + + ctx := svc.NewServiceContext(c) + handler.RegisterHandlers(server, ctx) + + fmt.Printf("Starting server at %s:%d...\n", c.Host, c.Port) + server.Start() +} + +// var testConfigFile = flag.String("f", "../etc/orders.yaml", "the config file") +// var cnf config.Config + +// func GetTestServer() *rest.Server { +// flag.Parse() + +// conf.MustLoad(*testConfigFile, &cnf) + +// server := rest.MustNewServer(cnf.RestConf) +// defer server.Stop() + +// ctx := svc.NewServiceContext(cnf) +// handler.RegisterHandlers(server, ctx) + +// fmt.Printf("Starting server at %s:%d...\n", cnf.Host, cnf.Port) +// return server +// }