fix(card_info_apple):修复订单分配中的解密与数据库链接问题
- 更新 Python 版本至 3.13.9 - 使用 gerror 替代 errHandler 处理解密错误 - 修改分隔符从 "|" 为 ":"用于商户 ID 解析 - 更新 MySQL 数据库链接密码配置 - 调整 trace span 初始化顺序以确保上下文正确追踪
This commit is contained in:
@@ -1,2 +1,2 @@
|
||||
golang 1.25.2
|
||||
python 3.13.3
|
||||
python 3.13.9
|
||||
|
||||
@@ -3,6 +3,7 @@ package card_info_apple
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"github.com/gogf/gf/v2/errors/gerror"
|
||||
"kami/internal/consts"
|
||||
"kami/internal/errHandler"
|
||||
"kami/internal/model"
|
||||
@@ -34,19 +35,19 @@ var mutex = gmutex.RWMutex{}
|
||||
|
||||
// RechargeHandler 分配订单
|
||||
func (c *ControllerV1) RechargeHandler(ctx context.Context, req *v1.RechargeHandlerReq) (res *v1.RechargeHandlerRes, err error) {
|
||||
ctx, span := gtrace.NewSpan(ctx, "苹果分配订单")
|
||||
defer span.End()
|
||||
mutex.Lock()
|
||||
defer mutex.Unlock()
|
||||
ctx, span := gtrace.NewSpan(ctx, "苹果分配订单")
|
||||
defer span.End()
|
||||
//解密
|
||||
merchantId, err := utils.Decrypt(req.MachineID)
|
||||
if err != nil {
|
||||
err = errHandler.WrapError(ctx, gcode.CodeInternalError, err, "解密失败")
|
||||
err = gerror.NewCode(gcode.CodeInternalError, "解密失败")
|
||||
return
|
||||
}
|
||||
merchantIds := strings.Split(merchantId, "|")
|
||||
merchantIds := strings.Split(merchantId, ":")
|
||||
if len(merchantIds) != 2 {
|
||||
err = errHandler.WrapError(ctx, gcode.CodeInternalError, err, "解密失败")
|
||||
err = gerror.NewCode(gcode.CodeInternalError, "解密失败")
|
||||
return
|
||||
}
|
||||
merchantId = merchantIds[0]
|
||||
|
||||
@@ -36,7 +36,7 @@ database:
|
||||
maxLifetime: "30s" #(单位秒)连接对象可重复使用的时间长度
|
||||
|
||||
v1:
|
||||
link: "mysql:root:Woaizixkie!123@tcp(127.0.0.1:3306)/kami?charset=utf8mb4&parseTime=true&loc=Local"
|
||||
link: "mysql:root:mysql123@tcp(127.0.0.1:3306)/kami?charset=utf8mb4&parseTime=true&loc=Local"
|
||||
debug: true
|
||||
charset: "utf8mb4" #数据库编码
|
||||
dryRun: false #空跑
|
||||
|
||||
Reference in New Issue
Block a user