fix: 修复 OpenAPI 文档生成器启动 panic,路由缺少 path parameter 定义
All checks were successful
构建并部署到测试环境(无 SSH) / build-and-deploy (push) Successful in 7m2s
All checks were successful
构建并部署到测试环境(无 SSH) / build-and-deploy (push) Successful in 7m2s
- 新增 UpdateWechatConfigParams/AgentOfflinePayParams 聚合结构体,嵌入 IDReq 提供 path:id 标签 - 修复 PUT /:id 和 POST /:id/offline-pay 路由的 Input 引用 - 修复 Makefile 构建路径从单文件改为包路径,解决多文件编译问题 - 标记 tasks.md 中 1.2.4 迁移任务为已完成
This commit is contained in:
4
Makefile
4
Makefile
@@ -7,8 +7,8 @@ GOCLEAN=$(GOCMD) clean
|
|||||||
GOTEST=$(GOCMD) test
|
GOTEST=$(GOCMD) test
|
||||||
GOGET=$(GOCMD) get
|
GOGET=$(GOCMD) get
|
||||||
BINARY_NAME=bin/junhong-cmp
|
BINARY_NAME=bin/junhong-cmp
|
||||||
MAIN_PATH=cmd/api/main.go
|
MAIN_PATH=./cmd/api
|
||||||
WORKER_PATH=cmd/worker/main.go
|
WORKER_PATH=./cmd/worker
|
||||||
WORKER_BINARY=bin/junhong-worker
|
WORKER_BINARY=bin/junhong-worker
|
||||||
|
|
||||||
# Database migration parameters
|
# Database migration parameters
|
||||||
|
|||||||
@@ -12,6 +12,12 @@ type AgentOfflinePayRequest struct {
|
|||||||
OperationPassword string `json:"operation_password" validate:"required" required:"true" description:"操作密码"`
|
OperationPassword string `json:"operation_password" validate:"required" required:"true" description:"操作密码"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// AgentOfflinePayParams 确认线下充值聚合参数 (用于文档生成)
|
||||||
|
type AgentOfflinePayParams struct {
|
||||||
|
IDReq
|
||||||
|
AgentOfflinePayRequest
|
||||||
|
}
|
||||||
|
|
||||||
// AgentRechargeResponse 代理充值记录响应
|
// AgentRechargeResponse 代理充值记录响应
|
||||||
type AgentRechargeResponse struct {
|
type AgentRechargeResponse struct {
|
||||||
ID uint `json:"id" description:"充值记录ID"`
|
ID uint `json:"id" description:"充值记录ID"`
|
||||||
|
|||||||
@@ -70,6 +70,12 @@ type UpdateWechatConfigRequest struct {
|
|||||||
FyNotifyURL *string `json:"fy_notify_url" validate:"omitempty,max=500" maxLength:"500" description:"富友支付回调地址"`
|
FyNotifyURL *string `json:"fy_notify_url" validate:"omitempty,max=500" maxLength:"500" description:"富友支付回调地址"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// UpdateWechatConfigParams 更新微信参数配置聚合参数 (用于文档生成)
|
||||||
|
type UpdateWechatConfigParams struct {
|
||||||
|
IDReq
|
||||||
|
UpdateWechatConfigRequest
|
||||||
|
}
|
||||||
|
|
||||||
// WechatConfigListRequest 微信参数配置列表查询请求
|
// WechatConfigListRequest 微信参数配置列表查询请求
|
||||||
type WechatConfigListRequest struct {
|
type WechatConfigListRequest struct {
|
||||||
Page int `json:"page" query:"page" validate:"omitempty,min=1" minimum:"1" description:"页码"`
|
Page int `json:"page" query:"page" validate:"omitempty,min=1" minimum:"1" description:"页码"`
|
||||||
|
|||||||
@@ -48,7 +48,7 @@ func registerAgentRechargeRoutes(router fiber.Router, handler *admin.AgentRechar
|
|||||||
Register(group, doc, groupPath, "POST", "/:id/offline-pay", handler.OfflinePay, RouteSpec{
|
Register(group, doc, groupPath, "POST", "/:id/offline-pay", handler.OfflinePay, RouteSpec{
|
||||||
Summary: "确认线下充值",
|
Summary: "确认线下充值",
|
||||||
Tags: []string{"代理预充值"},
|
Tags: []string{"代理预充值"},
|
||||||
Input: new(dto.AgentOfflinePayRequest),
|
Input: new(dto.AgentOfflinePayParams),
|
||||||
Output: new(dto.AgentRechargeResponse),
|
Output: new(dto.AgentRechargeResponse),
|
||||||
Auth: true,
|
Auth: true,
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -58,7 +58,7 @@ func registerWechatConfigRoutes(router fiber.Router, handler *admin.WechatConfig
|
|||||||
Register(group, doc, groupPath, "PUT", "/:id", handler.Update, RouteSpec{
|
Register(group, doc, groupPath, "PUT", "/:id", handler.Update, RouteSpec{
|
||||||
Summary: "更新支付配置",
|
Summary: "更新支付配置",
|
||||||
Tags: []string{"微信支付配置管理"},
|
Tags: []string{"微信支付配置管理"},
|
||||||
Input: new(dto.UpdateWechatConfigRequest),
|
Input: new(dto.UpdateWechatConfigParams),
|
||||||
Output: new(dto.WechatConfigResponse),
|
Output: new(dto.WechatConfigResponse),
|
||||||
Auth: true,
|
Auth: true,
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -21,7 +21,7 @@
|
|||||||
- [x] 1.2.1 创建数据库迁移文件:新建 `tb_wechat_config` 表(基础字段、OAuth 公众号字段、OAuth 小程序字段、微信直连支付字段、富友支付字段),`is_active` 默认 `false`
|
- [x] 1.2.1 创建数据库迁移文件:新建 `tb_wechat_config` 表(基础字段、OAuth 公众号字段、OAuth 小程序字段、微信直连支付字段、富友支付字段),`is_active` 默认 `false`
|
||||||
- [x] 1.2.2 创建数据库迁移文件:`tb_order` 新增 `payment_config_id` 列(bigint, nullable, 带索引)
|
- [x] 1.2.2 创建数据库迁移文件:`tb_order` 新增 `payment_config_id` 列(bigint, nullable, 带索引)
|
||||||
- [x] 1.2.3 创建数据库迁移文件:`tb_asset_recharge_record` 新增 `payment_config_id` 列(bigint, nullable, 带索引)
|
- [x] 1.2.3 创建数据库迁移文件:`tb_asset_recharge_record` 新增 `payment_config_id` 列(bigint, nullable, 带索引)
|
||||||
- [ ] 1.2.4 执行迁移,确认表结构正确
|
- [x] 1.2.4 执行迁移,确认表结构正确
|
||||||
- [x] 1.2.5 创建 `internal/model/wechat_config.go`:WechatConfig 模型(GORM 标签、TableName、渠道类型常量 `ProviderTypeWechat` / `ProviderTypeFuiou`)
|
- [x] 1.2.5 创建 `internal/model/wechat_config.go`:WechatConfig 模型(GORM 标签、TableName、渠道类型常量 `ProviderTypeWechat` / `ProviderTypeFuiou`)
|
||||||
- [x] 1.2.6 修改 `internal/model/order.go`:Order 模型新增 `PaymentConfigID *uint` 字段
|
- [x] 1.2.6 修改 `internal/model/order.go`:Order 模型新增 `PaymentConfigID *uint` 字段
|
||||||
- [x] 1.2.7 修改 `internal/model/asset_wallet.go`:AssetRechargeRecord 模型新增 `PaymentConfigID *uint` 字段
|
- [x] 1.2.7 修改 `internal/model/asset_wallet.go`:AssetRechargeRecord 模型新增 `PaymentConfigID *uint` 字段
|
||||||
|
|||||||
Reference in New Issue
Block a user