From f8ebbff9d8cc3ab5a3096dcf3fffbf453b509356 Mon Sep 17 00:00:00 2001 From: yuguojian <18126816215> Date: Thu, 8 May 2025 14:39:42 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.en.md | 36 -------------------------------- README.md | 50 ++++++++++++++------------------------------- log.go | 29 +++++++++----------------- rabbitmq_order.go | 8 ++++---- rabbitmq_product.go | 4 ++-- 5 files changed, 31 insertions(+), 96 deletions(-) delete mode 100644 README.en.md diff --git a/README.en.md b/README.en.md deleted file mode 100644 index 6c3f8fd..0000000 --- a/README.en.md +++ /dev/null @@ -1,36 +0,0 @@ -# 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/) diff --git a/README.md b/README.md index 72f69fe..e336bdf 100644 --- a/README.md +++ b/README.md @@ -1,39 +1,19 @@ # rabbitMQ公共结构体 -#### 介绍 -{**以下是 Gitee 平台说明，您可以替换此简介** -Gitee 是 OSCHINA 推出的基于 Git 的代码托管平台（同时支持 SVN）。专为开发者提供稳定、高效、安全的云端软件开发协作平台 -无论是个人、团队、或是企业，都能够用 Gitee 实现代码托管、项目管理、协作开发。企业项目请看 [https://gitee.com/enterprises](https://gitee.com/enterprises)} +## window开发者执行 +```bash +git config --global core.autocrlf true # 提交时转 CRLF 为 LF，检出时转 LF 为 CRLF +``` -#### 软件架构 -软件架构说明 +## mac开发者执行 +```bash +git config --global core.autocrlf input # 提交时转 CRLF 为 LF，检出时不转换 +``` - -#### 安装教程 - -1. xxxx -2. xxxx -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/) +## 格式化 +```bash +gofumpt -l -w . +``` +```bash +go install mvdan.cc/gofumpt@latest +``` diff --git a/log.go b/log.go index 047e8f6..7f96206 100644 --- a/log.go +++ b/log.go @@ -5,13 +5,19 @@ import "time" type LogType = string const ( - LogTypeOrder LogType = "order" // 订单 - LogTypeProduct LogType = "product" // 商品 - LogTypeGPS LogType = "gps" // gps + LogTypeOrder LogType = "order" // 订单 + LogTypeProduct LogType = "product" // 商品 + LogTypeMerchant LogType = "merchant" // 商家 + LogTypeMerchantUser LogType = "merchant_user" // 商家用户 + LogTypePay LogType = "pay" // 支付 + LogTypeUser LogType = "user" // 用户 + LogTypeGPS LogType = "gps" // gps + LogTypeSMS LogType = "sms" // 短信 + LogTypeSystem LogType = "system" // 系统、日志、定时任务初始化、定时任务、mq初始化等 ) type LogInfo struct { - InfoType LogType `json:"info_type"` // 类型 + InfoType LogType `json:"info_type"` // 日志类型，按被操作对象划分 Operator Operator `json:"operator"` // 操作人 ObjectorID int `json:"objector_id"` // 被操作对象ID，如果是gps，短信等服务则为0 Title string `json:"title"` // 标题，做什么事情 @@ -34,18 +40,3 @@ type Operator struct { ID int // 系统ID设置0 OperatorType OperatorType } - -type ObjectorType = string - -const ( - ObjectorTypeGPS ObjectorType = "gps" // gps - ObjectorTypeSMS ObjectorType = "sms" // sms - ObjectorTypeProduct ObjectorType = "product" - ObjectorTypeOrder ObjectorType = "order" - ObjectorTypePay ObjectorType = "pay" -) - -type Objector struct { - ID int // 系统ID设置0 - ObjectorType ObjectorType -} diff --git a/rabbitmq_order.go b/rabbitmq_order.go index 96bb5d2..d6caab3 100644 --- a/rabbitmq_order.go +++ b/rabbitmq_order.go @@ -12,10 +12,10 @@ const ( OrderCloseTypeMerchantClose OrderCloseType = 30 // 商家关闭 OrderCloseTypeThirdOrderFailedClose OrderCloseType = 40 // 第三方订单下单失败关闭 OrderCloseTypeUser OrderCloseType = 50 // 用户主动关闭 - OrderCloseTypeMerchantCancel OrderCloseType = 60 //商家取消订单关闭 - OrderCloseTypeDeliveryTimeout OrderCloseType = 70 //发货超时关闭 - OrderCloseTypePaymentFailed OrderCloseType = 80 //创建支付失败 - OrderCloseTypeAbandonPayment OrderCloseType = 90 //放弃支付 + OrderCloseTypeMerchantCancel OrderCloseType = 60 // 商家取消订单关闭 + OrderCloseTypeDeliveryTimeout OrderCloseType = 70 // 发货超时关闭 + OrderCloseTypePaymentFailed OrderCloseType = 80 // 创建支付失败 + OrderCloseTypeAbandonPayment OrderCloseType = 90 // 放弃支付 ) diff --git a/rabbitmq_product.go b/rabbitmq_product.go index 622f024..6761941 100644 --- a/rabbitmq_product.go +++ b/rabbitmq_product.go @@ -17,8 +17,8 @@ type ProductsIncreaseSold struct { type StockState = string const ( - StockStateIncrease StockState = "increase_inventory" //增加库存 - StockStateDecrease StockState = "reduce_inventory" //减少库存 + StockStateIncrease StockState = "increase_inventory" // 增加库存 + StockStateDecrease StockState = "reduce_inventory" // 减少库存 ) type ProductsChangeStockType = int