Compare commits
No commits in common. "master" and "v1.0.11" have entirely different histories.
36
README.en.md
Normal file
36
README.en.md
Normal file
@ -0,0 +1,36 @@
|
|||||||
|
# rabbitMQ公共结构体
|
||||||
|
|
||||||
|
#### Description
|
||||||
|
{**When you're done, you can delete the content in this README and update the file with details for others getting started with your repository**}
|
||||||
|
|
||||||
|
#### Software Architecture
|
||||||
|
Software architecture description
|
||||||
|
|
||||||
|
#### Installation
|
||||||
|
|
||||||
|
1. xxxx
|
||||||
|
2. xxxx
|
||||||
|
3. xxxx
|
||||||
|
|
||||||
|
#### Instructions
|
||||||
|
|
||||||
|
1. xxxx
|
||||||
|
2. xxxx
|
||||||
|
3. xxxx
|
||||||
|
|
||||||
|
#### Contribution
|
||||||
|
|
||||||
|
1. Fork the repository
|
||||||
|
2. Create Feat_xxx branch
|
||||||
|
3. Commit your code
|
||||||
|
4. Create Pull Request
|
||||||
|
|
||||||
|
|
||||||
|
#### Gitee Feature
|
||||||
|
|
||||||
|
1. You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md
|
||||||
|
2. Gitee blog [blog.gitee.com](https://blog.gitee.com)
|
||||||
|
3. Explore open source project [https://gitee.com/explore](https://gitee.com/explore)
|
||||||
|
4. The most valuable open source project [GVP](https://gitee.com/gvp)
|
||||||
|
5. The manual of Gitee [https://gitee.com/help](https://gitee.com/help)
|
||||||
|
6. The most popular members [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)
|
||||||
50
README.md
50
README.md
@ -1,19 +1,39 @@
|
|||||||
# rabbitMQ公共结构体
|
# rabbitMQ公共结构体
|
||||||
|
|
||||||
## window开发者执行
|
#### 介绍
|
||||||
```bash
|
{**以下是 Gitee 平台说明，您可以替换此简介**
|
||||||
git config --global core.autocrlf true # 提交时转 CRLF 为 LF，检出时转 LF 为 CRLF
|
Gitee 是 OSCHINA 推出的基于 Git 的代码托管平台（同时支持 SVN）。专为开发者提供稳定、高效、安全的云端软件开发协作平台
|
||||||
```
|
无论是个人、团队、或是企业，都能够用 Gitee 实现代码托管、项目管理、协作开发。企业项目请看 [https://gitee.com/enterprises](https://gitee.com/enterprises)}
|
||||||
|
|
||||||
## mac开发者执行
|
#### 软件架构
|
||||||
```bash
|
软件架构说明
|
||||||
git config --global core.autocrlf input # 提交时转 CRLF 为 LF，检出时不转换
|
|
||||||
```
|
|
||||||
|
|
||||||
## 格式化
|
|
||||||
```bash
|
#### 安装教程
|
||||||
gofumpt -l -w .
|
|
||||||
```
|
1. xxxx
|
||||||
```bash
|
2. xxxx
|
||||||
go install mvdan.cc/gofumpt@latest
|
3. xxxx
|
||||||
```
|
|
||||||
|
#### 使用说明
|
||||||
|
|
||||||
|
1. xxxx
|
||||||
|
2. xxxx
|
||||||
|
3. xxxx
|
||||||
|
|
||||||
|
#### 参与贡献
|
||||||
|
|
||||||
|
1. Fork 本仓库
|
||||||
|
2. 新建 Feat_xxx 分支
|
||||||
|
3. 提交代码
|
||||||
|
4. 新建 Pull Request
|
||||||
|
|
||||||
|
|
||||||
|
#### 特技
|
||||||
|
|
||||||
|
1. 使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md
|
||||||
|
2. Gitee 官方博客 [blog.gitee.com](https://blog.gitee.com)
|
||||||
|
3. 你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解 Gitee 上的优秀开源项目
|
||||||
|
4. [GVP](https://gitee.com/gvp) 全称是 Gitee 最有价值开源项目，是综合评定出的优秀开源项目
|
||||||
|
5. Gitee 官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help)
|
||||||
|
6. Gitee 封面人物是一档用来展示 Gitee 会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)
|
||||||
|
|||||||
10
go.mod
10
go.mod
@ -1,11 +1,3 @@
|
|||||||
module git.ssgfgtfy.com/public/common_structure
|
module gitee.com/shenzhen-jinhuatai-network/rabbitmq_common_structure
|
||||||
|
|
||||||
go 1.18.0
|
go 1.18.0
|
||||||
|
|
||||||
require (
|
|
||||||
github.com/dromara/carbon/v2 v2.6.4
|
|
||||||
go.uber.org/zap v1.27.0
|
|
||||||
github.com/gogf/gf/v2 v2.7.2
|
|
||||||
)
|
|
||||||
|
|
||||||
require go.uber.org/multierr v1.10.0 // indirect
|
|
||||||
|
|||||||
12
go.sum
12
go.sum
@ -1,12 +0,0 @@
|
|||||||
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
|
||||||
github.com/dromara/carbon/v2 v2.6.4 h1:cpIansyiEIEed3OlEIqo1IXj86qu0x6pf/E2keL2wYo=
|
|
||||||
github.com/dromara/carbon/v2 v2.6.4/go.mod h1:Baj3A1uBBctJmpZWJd6/+WWnmIuY2pobR6IOpB6xigc=
|
|
||||||
github.com/gogf/gf/v2 v2.7.2/go.mod h1:EBXneAg/wes86rfeh68XC0a2JBNQylmT7Sp6/8Axk88=
|
|
||||||
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
|
|
||||||
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
|
|
||||||
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
|
|
||||||
go.uber.org/multierr v1.10.0 h1:S0h4aNzvfcFsC3dRF1jLoaov7oRaKqRGC/pUEJ2yvPQ=
|
|
||||||
go.uber.org/multierr v1.10.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
|
|
||||||
go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8=
|
|
||||||
go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
|
|
||||||
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
|
|
||||||
141
log/log.go
141
log/log.go
@ -1,141 +0,0 @@
|
|||||||
package log
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"fmt"
|
|
||||||
"github.com/dromara/carbon/v2"
|
|
||||||
"github.com/gogf/gf/v2/frame/g"
|
|
||||||
"go.uber.org/zap"
|
|
||||||
)
|
|
||||||
|
|
||||||
type LogType = string
|
|
||||||
|
|
||||||
const (
|
|
||||||
LogTypeOrder LogType = "order" // 订单
|
|
||||||
LogTypeProduct LogType = "product" // 商品
|
|
||||||
LogTypeMerchant LogType = "merchant" // 商家
|
|
||||||
LogTypeMerchantRedPack LogType = "merchant_red_pack" // 商家红包
|
|
||||||
LogTypePay LogType = "pay" // 支付
|
|
||||||
LogTypeUser LogType = "user" // 用户
|
|
||||||
LogTypeUserRedPack LogType = "user_red_pack" // 用户红包
|
|
||||||
LogTypeGPS LogType = "gps" // gps
|
|
||||||
LogTypeSMS LogType = "sms" // 短信
|
|
||||||
LogTypeIP LogType = "ip" // ip信息
|
|
||||||
LogTypeAdmin LogType = "admin" // 管理员操作，例如登录、退出、修改密码、修改用户信息、修改角色信息、审核等
|
|
||||||
LogTypeSystem LogType = "system" // 系统、日志、定时任务初始化、定时任务、mq初始化等
|
|
||||||
LogTypeSystemRedPack LogType = "system_red_pack" // 系统红包
|
|
||||||
LogTypeActivity LogType = "activity" // 活动
|
|
||||||
LogTypeJJT LogType = "jjt" // 交易所
|
|
||||||
)
|
|
||||||
|
|
||||||
type LogInfo struct {
|
|
||||||
LogType LogType `json:"log_type"` // 日志类型，按被操作对象划分
|
|
||||||
Operator *Operator `json:"operator,omitempty"` // 操作人，系统操作不用填写操作人，写日志类型就可以
|
|
||||||
ObjectorID int `json:"objector_id,omitempty"` // 被操作对象ID，如果是gps，短信等服务则为0
|
|
||||||
Title string `json:"title"` // 必填，标题，做什么事情
|
|
||||||
Param interface{} `json:"param,omitempty"` // 参数，请求参数，传指针
|
|
||||||
Result interface{} `json:"result,omitempty"` // 结果，返回值，传指针，如果是报错，传err
|
|
||||||
ErrStr string `json:"err_str,omitempty"` // 错误信息，不用传入，自动记录
|
|
||||||
At string `json:"at"` // 记录时间，不用传入，自动记录
|
|
||||||
}
|
|
||||||
|
|
||||||
type OperatorType = string
|
|
||||||
|
|
||||||
const (
|
|
||||||
OperatorTypeAdmin OperatorType = "admin" // 管理员
|
|
||||||
OperatorTypeMerchant OperatorType = "merchant" // 商家
|
|
||||||
OperatorTypeUser OperatorType = "user" // 用户
|
|
||||||
)
|
|
||||||
|
|
||||||
type Operator struct {
|
|
||||||
ID int // 系统ID设置0
|
|
||||||
OperatorType OperatorType
|
|
||||||
}
|
|
||||||
|
|
||||||
func ZapDebug(logger *zap.Logger, log *LogInfo) {
|
|
||||||
handleLog(log)
|
|
||||||
logger.Debug("", zap.Any("log", log))
|
|
||||||
}
|
|
||||||
|
|
||||||
func ZapInfo(logger *zap.Logger, log *LogInfo) {
|
|
||||||
handleLog(log)
|
|
||||||
logger.Info("", zap.Any("log", log))
|
|
||||||
}
|
|
||||||
|
|
||||||
func ZapWarn(logger *zap.Logger, log *LogInfo) {
|
|
||||||
handleLog(log)
|
|
||||||
logger.Warn("", zap.Any("log", log))
|
|
||||||
}
|
|
||||||
|
|
||||||
func ZapError(logger *zap.Logger, log *LogInfo) {
|
|
||||||
handleLog(log)
|
|
||||||
logger.Error("", zap.Any("log", log))
|
|
||||||
}
|
|
||||||
|
|
||||||
func ZapPanic(logger *zap.Logger, log *LogInfo) {
|
|
||||||
handleLog(log)
|
|
||||||
logger.Panic("", zap.Any("log", log))
|
|
||||||
}
|
|
||||||
|
|
||||||
func ZapFatal(logger *zap.Logger, log *LogInfo) {
|
|
||||||
handleLog(log)
|
|
||||||
logger.Fatal("", zap.Any("log", log))
|
|
||||||
}
|
|
||||||
|
|
||||||
func handleLog(log *LogInfo) {
|
|
||||||
log.At = carbon.Now().ToDateTimeString()
|
|
||||||
if _, ok := log.Result.(error); ok {
|
|
||||||
log.ErrStr = fmt.Sprintf("%+v", log.Result)
|
|
||||||
log.Result = nil
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func GFInfo(ctx context.Context, log *LogInfo) {
|
|
||||||
handleLog(log)
|
|
||||||
g.Log().Info(ctx, log)
|
|
||||||
}
|
|
||||||
|
|
||||||
func GFWarning(ctx context.Context, log *LogInfo) {
|
|
||||||
handleLog(log)
|
|
||||||
g.Log().Warning(ctx, log)
|
|
||||||
}
|
|
||||||
|
|
||||||
func GFError(ctx context.Context, log *LogInfo) {
|
|
||||||
handleLog(log)
|
|
||||||
g.Log().Error(ctx, log)
|
|
||||||
}
|
|
||||||
|
|
||||||
func GFDebug(ctx context.Context, log *LogInfo) {
|
|
||||||
handleLog(log)
|
|
||||||
g.Log().Debug(ctx, log)
|
|
||||||
}
|
|
||||||
|
|
||||||
func GFPanic(ctx context.Context, log *LogInfo) {
|
|
||||||
handleLog(log)
|
|
||||||
g.Log().Panic(ctx, log)
|
|
||||||
}
|
|
||||||
|
|
||||||
func GFFatal(ctx context.Context, log *LogInfo) {
|
|
||||||
handleLog(log)
|
|
||||||
g.Log().Fatal(ctx, log)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (l *LogInfo) GFCommonHandelResult(ctx context.Context, result interface{}, err error) {
|
|
||||||
if err != nil {
|
|
||||||
l.Result = err
|
|
||||||
GFError(ctx, l)
|
|
||||||
} else {
|
|
||||||
l.Result = result
|
|
||||||
GFInfo(ctx, l)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (l *LogInfo) ZapCommonHandelResult(logger *zap.Logger, result interface{}, err error) {
|
|
||||||
if err != nil {
|
|
||||||
l.Result = err
|
|
||||||
ZapError(logger, l)
|
|
||||||
} else {
|
|
||||||
l.Result = result
|
|
||||||
ZapInfo(logger, l)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package common_structure
|
package rabbitmq_common_structure
|
||||||
|
|
||||||
type OrderCreate struct {
|
type OrderCreate struct {
|
||||||
ID uint `json:"id"` // 订单ID
|
ID uint `json:"id"` // 订单ID
|
||||||
@ -8,15 +8,8 @@ type OrderCloseType = int
|
|||||||
|
|
||||||
const (
|
const (
|
||||||
OrderCloseTypePayTimeout OrderCloseType = 10 // 支付超时
|
OrderCloseTypePayTimeout OrderCloseType = 10 // 支付超时
|
||||||
OrderCloseTypeRefundClose OrderCloseType = 20 // 售后完成关闭
|
OrderCloseTypeRefundClose OrderCloseType = 20 // 退款关闭，判断商品是否仅退款
|
||||||
OrderCloseTypeMerchantClose OrderCloseType = 30 // 商家关闭
|
OrderCloseTypeMerchantClose OrderCloseType = 30 // 商家关闭
|
||||||
OrderCloseTypeThirdOrderFailedClose OrderCloseType = 40 // 第三方订单下单失败关闭
|
|
||||||
OrderCloseTypeUser OrderCloseType = 50 // 用户主动关闭
|
|
||||||
OrderCloseTypeMerchantCancel OrderCloseType = 60 // 商家取消订单关闭
|
|
||||||
OrderCloseTypeDeliveryTimeout OrderCloseType = 70 // 发货超时关闭
|
|
||||||
OrderCloseTypePaymentFailed OrderCloseType = 80 // 创建支付失败
|
|
||||||
OrderCloseTypeAbandonPayment OrderCloseType = 90 // 放弃支付
|
|
||||||
|
|
||||||
)
|
)
|
||||||
|
|
||||||
type OrderClose struct {
|
type OrderClose struct {
|
||||||
@ -76,12 +69,3 @@ type OrderUpdateSuccess struct {
|
|||||||
type ThirdOrderRefund struct {
|
type ThirdOrderRefund struct {
|
||||||
ID uint `json:"id"` // 订单ID
|
ID uint `json:"id"` // 订单ID
|
||||||
}
|
}
|
||||||
|
|
||||||
type RedPacketRefund struct {
|
|
||||||
ID uint `json:"id"` // 订单ID
|
|
||||||
OrderProductsID uint `json:"order_products_id"` // 订单商品ID
|
|
||||||
}
|
|
||||||
|
|
||||||
type OrderSentOvertime struct {
|
|
||||||
ID uint `json:"id"` // 订单ID
|
|
||||||
}
|
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package common_structure
|
package rabbitmq_common_structure
|
||||||
|
|
||||||
type ProductsIncreaseSoldType = int
|
type ProductsIncreaseSoldType = int
|
||||||
|
|
||||||
@ -17,8 +17,8 @@ type ProductsIncreaseSold struct {
|
|||||||
type StockState = string
|
type StockState = string
|
||||||
|
|
||||||
const (
|
const (
|
||||||
StockStateIncrease StockState = "increase_inventory" // 增加库存
|
StockStateIncrease StockState = "increase_inventory" //增加库存
|
||||||
StockStateDecrease StockState = "reduce_inventory" // 减少库存
|
StockStateDecrease StockState = "reduce_inventory" //减少库存
|
||||||
)
|
)
|
||||||
|
|
||||||
type ProductsChangeStockType = int
|
type ProductsChangeStockType = int
|
||||||
@ -31,10 +31,8 @@ const (
|
|||||||
type ProductsChangeStock struct {
|
type ProductsChangeStock struct {
|
||||||
OrderId uint `json:"order_id"`
|
OrderId uint `json:"order_id"`
|
||||||
State StockState `json:"state"`
|
State StockState `json:"state"`
|
||||||
|
SkuItems []*SkuItem `json:"sku_items"`
|
||||||
DecreaseChangeStockType ProductsChangeStockType `json:"decrease_change_stock_type"`
|
DecreaseChangeStockType ProductsChangeStockType `json:"decrease_change_stock_type"`
|
||||||
OrderProductsIDs []uint `json:"order_products_ids"` // 对应的订单商品ID集合加减库存，如果为0，整个订单商品加减库存
|
|
||||||
|
|
||||||
SkuItems []*SkuItem `json:"sku_items"` // 商家修改商品数量使用，旧逻辑兼容
|
|
||||||
}
|
}
|
||||||
|
|
||||||
type SkuItem struct {
|
type SkuItem struct {
|
||||||
@ -1,5 +0,0 @@
|
|||||||
package common_structure
|
|
||||||
|
|
||||||
type CouponCode struct {
|
|
||||||
ID uint `json:"id"` // 优惠券ID
|
|
||||||
}
|
|
||||||
@ -1,15 +0,0 @@
|
|||||||
package common_structure
|
|
||||||
|
|
||||||
type PayNotify struct {
|
|
||||||
PayID uint `json:"pay_id"` // 支付ID
|
|
||||||
PayNo string `json:"pay_no"` // 支付单号
|
|
||||||
RemainExecNum int `json:"num"` // 剩余执行次数
|
|
||||||
RemainRepeatNum int `json:"repeat_num"` // 剩余重复执行次数
|
|
||||||
}
|
|
||||||
|
|
||||||
type HelibaoSettlementQuery struct {
|
|
||||||
ID uint `json:"id"` // 提现ID
|
|
||||||
WithdrawNo string `json:"withdraw_no"` // 提现单号
|
|
||||||
RemainExecNum int `json:"num"` // 剩余执行次数
|
|
||||||
RemainRepeatNum int `json:"repeat_num"` // 剩余重复执行次数
|
|
||||||
}
|
|
||||||
@ -1,5 +0,0 @@
|
|||||||
package common_structure
|
|
||||||
|
|
||||||
type GiveRedPacketTask struct {
|
|
||||||
TaskID uint `json:"task_id"` // 任务ID
|
|
||||||
}
|
|
||||||
@ -1,5 +0,0 @@
|
|||||||
package common_structure
|
|
||||||
|
|
||||||
type UserLogout struct {
|
|
||||||
UserID uint `json:"user_id"`
|
|
||||||
}
|
|
||||||
Loading…
x
Reference in New Issue
Block a user