new
This commit is contained in:
parent
14b5d10992
commit
31d797a092
@ -2,14 +2,16 @@ package pay
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"github.com/smartwalle/alipay/v3"
|
|
||||||
"net/http"
|
"net/http"
|
||||||
"os"
|
"os"
|
||||||
"time"
|
"time"
|
||||||
"tydata-server/pkg/lzkit/lzUtils"
|
"tydata-server/pkg/lzkit/lzUtils"
|
||||||
|
|
||||||
"github.com/zeromicro/go-zero/core/logx"
|
"github.com/smartwalle/alipay/v3"
|
||||||
|
|
||||||
"tydata-server/app/user/cmd/api/internal/svc"
|
"tydata-server/app/user/cmd/api/internal/svc"
|
||||||
|
|
||||||
|
"github.com/zeromicro/go-zero/core/logx"
|
||||||
)
|
)
|
||||||
|
|
||||||
type AlipayCallbackLogic struct {
|
type AlipayCallbackLogic struct {
|
||||||
@ -72,7 +74,7 @@ func (l *AlipayCallbackLogic) AlipayCallback(w http.ResponseWriter, r *http.Requ
|
|||||||
default:
|
default:
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
order.PlatformOrderId = lzUtils.StringToNullString(notification.OutTradeNo)
|
order.PlatformOrderId = lzUtils.StringToNullString(notification.TradeNo)
|
||||||
if updateErr := l.svcCtx.OrderModel.UpdateWithVersion(l.ctx, nil, order); updateErr != nil {
|
if updateErr := l.svcCtx.OrderModel.UpdateWithVersion(l.ctx, nil, order); updateErr != nil {
|
||||||
logx.Errorf("支付宝支付回调,修改订单信息失败: %+v", updateErr)
|
logx.Errorf("支付宝支付回调,修改订单信息失败: %+v", updateErr)
|
||||||
return nil
|
return nil
|
||||||
|
@ -33,8 +33,6 @@ func NewPaymentLogic(ctx context.Context, svcCtx *svc.ServiceContext) *PaymentLo
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (l *PaymentLogic) Payment(req *types.PaymentReq) (resp *types.PaymentResp, err error) {
|
func (l *PaymentLogic) Payment(req *types.PaymentReq) (resp *types.PaymentResp, err error) {
|
||||||
return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "")
|
|
||||||
|
|
||||||
userID, getUidErr := ctxdata.GetUidFromCtx(l.ctx)
|
userID, getUidErr := ctxdata.GetUidFromCtx(l.ctx)
|
||||||
if getUidErr != nil {
|
if getUidErr != nil {
|
||||||
return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "生成订单, 获取用户信息失败, %+v", getUidErr)
|
return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "生成订单, 获取用户信息失败, %+v", getUidErr)
|
||||||
@ -44,7 +42,8 @@ func (l *PaymentLogic) Payment(req *types.PaymentReq) (resp *types.PaymentResp,
|
|||||||
if !ok {
|
if !ok {
|
||||||
return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "生成订单, 获取平台失败, %+v", getUidErr)
|
return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "生成订单, 获取平台失败, %+v", getUidErr)
|
||||||
}
|
}
|
||||||
redisKey := fmt.Sprintf("%d:%s", userID, req.Id)
|
outTradeNo := req.Id
|
||||||
|
redisKey := fmt.Sprintf("%d:%s", userID, outTradeNo)
|
||||||
cache, cacheErr := l.svcCtx.Redis.GetCtx(l.ctx, redisKey)
|
cache, cacheErr := l.svcCtx.Redis.GetCtx(l.ctx, redisKey)
|
||||||
if cacheErr != nil {
|
if cacheErr != nil {
|
||||||
return nil, cacheErr
|
return nil, cacheErr
|
||||||
@ -59,21 +58,8 @@ func (l *PaymentLogic) Payment(req *types.PaymentReq) (resp *types.PaymentResp,
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "生成订单, 查找产品错误: %v", err)
|
return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "生成订单, 查找产品错误: %v", err)
|
||||||
}
|
}
|
||||||
secretKey := l.svcCtx.Config.Encrypt.SecretKey
|
|
||||||
key, decodeErr := hex.DecodeString(secretKey)
|
|
||||||
if decodeErr != nil {
|
|
||||||
return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "生成订单, 获取AES密钥失败: %+v", decodeErr)
|
|
||||||
}
|
|
||||||
params, marshalErr := json.Marshal(data.Params)
|
|
||||||
if marshalErr != nil {
|
|
||||||
return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "生成订单, 序列化参数失败: %+v", marshalErr)
|
|
||||||
}
|
|
||||||
encryptParams, aesEncryptErr := crypto.AesEncrypt(params, key)
|
|
||||||
if aesEncryptErr != nil {
|
|
||||||
return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "生成订单, 加密参数失败: %+v", aesEncryptErr)
|
|
||||||
}
|
|
||||||
var prepayData interface{}
|
var prepayData interface{}
|
||||||
var outTradeNo string
|
|
||||||
var amount float64
|
var amount float64
|
||||||
var orderAmount float64
|
var orderAmount float64
|
||||||
user, err := l.svcCtx.UserModel.FindOne(l.ctx, userID)
|
user, err := l.svcCtx.UserModel.FindOne(l.ctx, userID)
|
||||||
@ -99,13 +85,10 @@ func (l *PaymentLogic) Payment(req *types.PaymentReq) (resp *types.PaymentResp,
|
|||||||
|
|
||||||
var createOrderErr error
|
var createOrderErr error
|
||||||
if req.PayMethod == "wechat" {
|
if req.PayMethod == "wechat" {
|
||||||
outTradeNo = l.svcCtx.WechatPayService.GenerateOutTradeNo()
|
|
||||||
prepayData, createOrderErr = l.svcCtx.WechatPayService.CreateWechatOrder(l.ctx, amount, product.ProductName, outTradeNo)
|
prepayData, createOrderErr = l.svcCtx.WechatPayService.CreateWechatOrder(l.ctx, amount, product.ProductName, outTradeNo)
|
||||||
} else if req.PayMethod == "alipay" {
|
} else if req.PayMethod == "alipay" {
|
||||||
outTradeNo = l.svcCtx.AlipayService.GenerateOutTradeNo()
|
|
||||||
prepayData, createOrderErr = l.svcCtx.AlipayService.CreateAlipayOrder(l.ctx, amount, product.ProductName, outTradeNo, brand)
|
prepayData, createOrderErr = l.svcCtx.AlipayService.CreateAlipayOrder(l.ctx, amount, product.ProductName, outTradeNo, brand)
|
||||||
} else if req.PayMethod == "appleiap" {
|
} else if req.PayMethod == "appleiap" {
|
||||||
outTradeNo = l.svcCtx.ApplePayService.GenerateOutTradeNo()
|
|
||||||
prepayData = l.svcCtx.ApplePayService.GetIappayAppID(product.ProductEn)
|
prepayData = l.svcCtx.ApplePayService.GetIappayAppID(product.ProductEn)
|
||||||
}
|
}
|
||||||
if createOrderErr != nil {
|
if createOrderErr != nil {
|
||||||
@ -131,17 +114,7 @@ func (l *PaymentLogic) Payment(req *types.PaymentReq) (resp *types.PaymentResp,
|
|||||||
return errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "生成订单, 获取保存订单ID失败: %+v", lastInsertIdErr)
|
return errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "生成订单, 获取保存订单ID失败: %+v", lastInsertIdErr)
|
||||||
}
|
}
|
||||||
orderID = insertedOrderID
|
orderID = insertedOrderID
|
||||||
query := model.Query{
|
|
||||||
OrderId: orderID,
|
|
||||||
UserId: userID,
|
|
||||||
ProductId: product.Id,
|
|
||||||
QueryParams: encryptParams,
|
|
||||||
QueryState: "pending",
|
|
||||||
}
|
|
||||||
_, insertQueryErr := l.svcCtx.QueryModel.Insert(l.ctx, session, &query)
|
|
||||||
if insertQueryErr != nil {
|
|
||||||
return errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "生成订单, 保存查询失败: %+v", lastInsertIdErr)
|
|
||||||
}
|
|
||||||
if data.AgentIdentifier != "" {
|
if data.AgentIdentifier != "" {
|
||||||
agent, parsingErr := l.agentParsing(data.AgentIdentifier)
|
agent, parsingErr := l.agentParsing(data.AgentIdentifier)
|
||||||
if parsingErr != nil {
|
if parsingErr != nil {
|
||||||
|
@ -1353,8 +1353,21 @@ func (l *QueryServiceLogic) Verify(Name string, IDCard string, Mobile string) er
|
|||||||
// 缓存
|
// 缓存
|
||||||
func (l *QueryServiceLogic) CacheData(params map[string]interface{}, Product string, userID int64) (string, error) {
|
func (l *QueryServiceLogic) CacheData(params map[string]interface{}, Product string, userID int64) (string, error) {
|
||||||
agentIdentifier, _ := l.ctx.Value("agentIdentifier").(string)
|
agentIdentifier, _ := l.ctx.Value("agentIdentifier").(string)
|
||||||
|
secretKey := l.svcCtx.Config.Encrypt.SecretKey
|
||||||
|
key, decodeErr := hex.DecodeString(secretKey)
|
||||||
|
if decodeErr != nil {
|
||||||
|
return "", errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "查询服务, 获取AES密钥失败: %+v", decodeErr)
|
||||||
|
}
|
||||||
|
paramsMarshal, marshalErr := json.Marshal(params)
|
||||||
|
if marshalErr != nil {
|
||||||
|
return "", errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "查询服务, 序列化参数失败: %+v", marshalErr)
|
||||||
|
}
|
||||||
|
encryptParams, aesEncryptErr := crypto.AesEncrypt(paramsMarshal, key)
|
||||||
|
if aesEncryptErr != nil {
|
||||||
|
return "", errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "查询服务, 加密参数失败: %+v", aesEncryptErr)
|
||||||
|
}
|
||||||
queryCache := types.QueryCacheLoad{
|
queryCache := types.QueryCacheLoad{
|
||||||
Params: params,
|
Params: encryptParams,
|
||||||
Product: Product,
|
Product: Product,
|
||||||
AgentIdentifier: agentIdentifier,
|
AgentIdentifier: agentIdentifier,
|
||||||
}
|
}
|
||||||
@ -1362,7 +1375,7 @@ func (l *QueryServiceLogic) CacheData(params map[string]interface{}, Product str
|
|||||||
if marshalErr != nil {
|
if marshalErr != nil {
|
||||||
return "", errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "查询服务, 序列化参数失败: %+v", marshalErr)
|
return "", errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "查询服务, 序列化参数失败: %+v", marshalErr)
|
||||||
}
|
}
|
||||||
outTradeNo := l.svcCtx.WechatPayService.GenerateOutTradeNo()
|
outTradeNo := l.svcCtx.AlipayService.GenerateOutTradeNo()
|
||||||
redisKey := fmt.Sprintf("%d:%s", userID, outTradeNo)
|
redisKey := fmt.Sprintf("%d:%s", userID, outTradeNo)
|
||||||
cacheErr := l.svcCtx.Redis.SetexCtx(l.ctx, redisKey, string(jsonData), int(2*time.Hour))
|
cacheErr := l.svcCtx.Redis.SetexCtx(l.ctx, redisKey, string(jsonData), int(2*time.Hour))
|
||||||
if cacheErr != nil {
|
if cacheErr != nil {
|
||||||
|
@ -5,13 +5,17 @@ import (
|
|||||||
"encoding/hex"
|
"encoding/hex"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
"github.com/hibiken/asynq"
|
|
||||||
"github.com/zeromicro/go-zero/core/logx"
|
|
||||||
"os"
|
"os"
|
||||||
|
"regexp"
|
||||||
|
"strings"
|
||||||
"tydata-server/app/user/cmd/api/internal/svc"
|
"tydata-server/app/user/cmd/api/internal/svc"
|
||||||
|
"tydata-server/app/user/cmd/api/internal/types"
|
||||||
"tydata-server/app/user/model"
|
"tydata-server/app/user/model"
|
||||||
"tydata-server/pkg/lzkit/crypto"
|
"tydata-server/pkg/lzkit/crypto"
|
||||||
"tydata-server/pkg/lzkit/lzUtils"
|
"tydata-server/pkg/lzkit/lzUtils"
|
||||||
|
|
||||||
|
"github.com/hibiken/asynq"
|
||||||
|
"github.com/zeromicro/go-zero/core/logx"
|
||||||
)
|
)
|
||||||
|
|
||||||
type PaySuccessNotifyUserHandler struct {
|
type PaySuccessNotifyUserHandler struct {
|
||||||
@ -38,7 +42,6 @@ func (l *PaySuccessNotifyUserHandler) ProcessTask(ctx context.Context, t *asynq.
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("无效的订单ID: %d, %v", payload.OrderID, err)
|
return fmt.Errorf("无效的订单ID: %d, %v", payload.OrderID, err)
|
||||||
}
|
}
|
||||||
//
|
|
||||||
env := os.Getenv("ENV")
|
env := os.Getenv("ENV")
|
||||||
if order.Status != "paid" && env != "development" {
|
if order.Status != "paid" && env != "development" {
|
||||||
err = fmt.Errorf("无效的订单: %d", payload.OrderID)
|
err = fmt.Errorf("无效的订单: %d", payload.OrderID)
|
||||||
@ -49,30 +52,60 @@ func (l *PaySuccessNotifyUserHandler) ProcessTask(ctx context.Context, t *asynq.
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("找不到相关产品: orderID: %d, productID: %d", payload.OrderID, order.ProductId)
|
return fmt.Errorf("找不到相关产品: orderID: %d, productID: %d", payload.OrderID, order.ProductId)
|
||||||
}
|
}
|
||||||
|
redisKey := fmt.Sprintf("%d:%s", order.UserId, order.OrderNo)
|
||||||
query, findQueryErr := l.svcCtx.QueryModel.FindOneByOrderId(ctx, order.Id)
|
cache, cacheErr := l.svcCtx.Redis.GetCtx(ctx, redisKey)
|
||||||
if findQueryErr != nil {
|
if cacheErr != nil {
|
||||||
findQueryErr = fmt.Errorf("获取任务请求参数失败: %v", findQueryErr)
|
return fmt.Errorf("生成订单, 获取缓存内容失败: %+v", cacheErr)
|
||||||
logx.Errorf("处理任务失败,原因: %v", findQueryErr)
|
|
||||||
return asynq.SkipRetry
|
|
||||||
}
|
}
|
||||||
if query.QueryState != "pending" {
|
var data types.QueryCacheLoad
|
||||||
err = fmt.Errorf("查询已处理: %d", query.Id)
|
err = json.Unmarshal([]byte(cache), &data)
|
||||||
logx.Errorf("处理任务失败,原因: %v", err)
|
if err != nil {
|
||||||
return asynq.SkipRetry
|
return fmt.Errorf("生成订单, 解析缓存内容失败: %+v", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
secretKey := l.svcCtx.Config.Encrypt.SecretKey
|
secretKey := l.svcCtx.Config.Encrypt.SecretKey
|
||||||
key, decodeErr := hex.DecodeString(secretKey)
|
key, decodeErr := hex.DecodeString(secretKey)
|
||||||
if decodeErr != nil {
|
if decodeErr != nil {
|
||||||
err = fmt.Errorf("获取AES密钥失败: %v", decodeErr)
|
return fmt.Errorf("生成订单, 获取AES密钥失败: %+v", decodeErr)
|
||||||
return l.handleError(ctx, err, order, query)
|
}
|
||||||
|
decryptData, aesdecryptErr := crypto.AesDecrypt(data.Params, key)
|
||||||
|
if aesdecryptErr != nil {
|
||||||
|
return fmt.Errorf("生成订单, 解密参数失败: %+v", aesdecryptErr)
|
||||||
}
|
}
|
||||||
|
|
||||||
decryptData, aesdecryptErr := crypto.AesDecrypt(query.QueryParams, key)
|
// 敏感数据脱敏处理
|
||||||
if aesdecryptErr != nil {
|
desensitizedParams, err := l.desensitizeParams(decryptData)
|
||||||
aesdecryptErr = fmt.Errorf("解密响应信息失败: %v", aesdecryptErr)
|
if err != nil {
|
||||||
return l.handleError(ctx, aesdecryptErr, order, query)
|
return fmt.Errorf("脱敏处理失败: %+v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// 对脱敏后的数据进行AES加密
|
||||||
|
encryptedParams, encryptErr := crypto.AesEncrypt(desensitizedParams, key)
|
||||||
|
if encryptErr != nil {
|
||||||
|
return fmt.Errorf("加密脱敏数据失败: %+v", encryptErr)
|
||||||
|
}
|
||||||
|
|
||||||
|
query := &model.Query{
|
||||||
|
OrderId: order.Id,
|
||||||
|
UserId: order.UserId,
|
||||||
|
ProductId: product.Id,
|
||||||
|
QueryParams: encryptedParams,
|
||||||
|
QueryState: "pending",
|
||||||
|
}
|
||||||
|
result, insertQueryErr := l.svcCtx.QueryModel.Insert(ctx, nil, query)
|
||||||
|
if insertQueryErr != nil {
|
||||||
|
return fmt.Errorf("生成订单, 保存查询失败: %+v", insertQueryErr)
|
||||||
|
}
|
||||||
|
|
||||||
|
// 获取插入后的ID
|
||||||
|
queryId, err := result.LastInsertId()
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("获取插入的查询ID失败: %+v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// 从数据库中查询完整的查询记录
|
||||||
|
query, err = l.svcCtx.QueryModel.FindOne(ctx, queryId)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("获取插入后的查询记录失败: %+v", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
combinedResponse, err := l.svcCtx.ApiRequestService.ProcessRequests(decryptData, product.Id)
|
combinedResponse, err := l.svcCtx.ApiRequestService.ProcessRequests(decryptData, product.Id)
|
||||||
@ -83,13 +116,13 @@ func (l *PaySuccessNotifyUserHandler) ProcessTask(ctx context.Context, t *asynq.
|
|||||||
encryptData, aesEncryptErr := crypto.AesEncrypt(combinedResponse, key)
|
encryptData, aesEncryptErr := crypto.AesEncrypt(combinedResponse, key)
|
||||||
if aesEncryptErr != nil {
|
if aesEncryptErr != nil {
|
||||||
err = fmt.Errorf("加密响应信息失败: %v", aesEncryptErr)
|
err = fmt.Errorf("加密响应信息失败: %v", aesEncryptErr)
|
||||||
return l.handleError(ctx, aesEncryptErr, order, query)
|
return l.handleError(ctx, err, order, query)
|
||||||
}
|
}
|
||||||
query.QueryData = lzUtils.StringToNullString(encryptData)
|
query.QueryData = lzUtils.StringToNullString(encryptData)
|
||||||
updateErr := l.svcCtx.QueryModel.UpdateWithVersion(ctx, nil, query)
|
updateErr := l.svcCtx.QueryModel.UpdateWithVersion(ctx, nil, query)
|
||||||
if updateErr != nil {
|
if updateErr != nil {
|
||||||
err = fmt.Errorf("保存响应数据失败: %v", updateErr)
|
err = fmt.Errorf("保存响应数据失败: %v", updateErr)
|
||||||
return l.handleError(ctx, updateErr, order, query)
|
return l.handleError(ctx, err, order, query)
|
||||||
}
|
}
|
||||||
|
|
||||||
query.QueryState = "success"
|
query.QueryState = "success"
|
||||||
@ -104,6 +137,11 @@ func (l *PaySuccessNotifyUserHandler) ProcessTask(ctx context.Context, t *asynq.
|
|||||||
return l.handleError(ctx, err, order, query)
|
return l.handleError(ctx, err, order, query)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
_, delErr := l.svcCtx.Redis.DelCtx(ctx, redisKey)
|
||||||
|
if delErr != nil {
|
||||||
|
logx.Errorf("删除Redis缓存失败,但任务已成功处理,订单ID: %d, 错误: %v", order.Id, delErr)
|
||||||
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -111,6 +149,12 @@ func (l *PaySuccessNotifyUserHandler) ProcessTask(ctx context.Context, t *asynq.
|
|||||||
func (l *PaySuccessNotifyUserHandler) handleError(ctx context.Context, err error, order *model.Order, query *model.Query) error {
|
func (l *PaySuccessNotifyUserHandler) handleError(ctx context.Context, err error, order *model.Order, query *model.Query) error {
|
||||||
logx.Errorf("处理任务失败,原因: %v", err)
|
logx.Errorf("处理任务失败,原因: %v", err)
|
||||||
|
|
||||||
|
redisKey := fmt.Sprintf("%d:%s", order.UserId, order.OrderNo)
|
||||||
|
_, delErr := l.svcCtx.Redis.DelCtx(ctx, redisKey)
|
||||||
|
if delErr != nil {
|
||||||
|
logx.Errorf("删除Redis缓存失败,订单ID: %d, 错误: %v", order.Id, delErr)
|
||||||
|
}
|
||||||
|
|
||||||
if order.Status == "paid" && query.QueryState == "pending" {
|
if order.Status == "paid" && query.QueryState == "pending" {
|
||||||
// 更新查询状态为失败
|
// 更新查询状态为失败
|
||||||
query.QueryState = "failed"
|
query.QueryState = "failed"
|
||||||
@ -154,3 +198,168 @@ func (l *PaySuccessNotifyUserHandler) handleError(ctx context.Context, err error
|
|||||||
|
|
||||||
return asynq.SkipRetry
|
return asynq.SkipRetry
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// desensitizeParams 对敏感数据进行脱敏处理
|
||||||
|
func (l *PaySuccessNotifyUserHandler) desensitizeParams(data []byte) ([]byte, error) {
|
||||||
|
// 解析JSON数据到map
|
||||||
|
var paramsMap map[string]interface{}
|
||||||
|
if err := json.Unmarshal(data, ¶msMap); err != nil {
|
||||||
|
return nil, fmt.Errorf("解析JSON数据失败: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// 处理可能包含敏感信息的字段
|
||||||
|
for key, value := range paramsMap {
|
||||||
|
if strValue, ok := value.(string); ok {
|
||||||
|
// 根据字段名和内容判断并脱敏
|
||||||
|
if isNameField(key) && len(strValue) > 0 {
|
||||||
|
// 姓名脱敏
|
||||||
|
paramsMap[key] = maskName(strValue)
|
||||||
|
} else if isIDCardField(key) && len(strValue) > 10 {
|
||||||
|
// 身份证号脱敏
|
||||||
|
paramsMap[key] = maskIDCard(strValue)
|
||||||
|
} else if isPhoneField(key) && len(strValue) >= 8 {
|
||||||
|
// 手机号脱敏
|
||||||
|
paramsMap[key] = maskPhone(strValue)
|
||||||
|
} else if len(strValue) > 3 {
|
||||||
|
// 其他所有未匹配的字段都进行通用脱敏
|
||||||
|
paramsMap[key] = maskGeneral(strValue)
|
||||||
|
}
|
||||||
|
} else if mapValue, ok := value.(map[string]interface{}); ok {
|
||||||
|
// 递归处理嵌套的map
|
||||||
|
for subKey, subValue := range mapValue {
|
||||||
|
if subStrValue, ok := subValue.(string); ok {
|
||||||
|
if isNameField(subKey) && len(subStrValue) > 0 {
|
||||||
|
mapValue[subKey] = maskName(subStrValue)
|
||||||
|
} else if isIDCardField(subKey) && len(subStrValue) > 10 {
|
||||||
|
mapValue[subKey] = maskIDCard(subStrValue)
|
||||||
|
} else if isPhoneField(subKey) && len(subStrValue) >= 8 {
|
||||||
|
mapValue[subKey] = maskPhone(subStrValue)
|
||||||
|
} else if len(subStrValue) > 3 {
|
||||||
|
// 其他所有未匹配的字段都进行通用脱敏
|
||||||
|
mapValue[subKey] = maskGeneral(subStrValue)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 将处理后的map重新序列化为JSON
|
||||||
|
return json.Marshal(paramsMap)
|
||||||
|
}
|
||||||
|
|
||||||
|
// 判断是否为姓名字段
|
||||||
|
func isNameField(key string) bool {
|
||||||
|
key = strings.ToLower(key)
|
||||||
|
return strings.Contains(key, "name") || strings.Contains(key, "姓名") ||
|
||||||
|
strings.Contains(key, "owner") || strings.Contains(key, "user")
|
||||||
|
}
|
||||||
|
|
||||||
|
// 判断是否为身份证字段
|
||||||
|
func isIDCardField(key string) bool {
|
||||||
|
key = strings.ToLower(key)
|
||||||
|
return strings.Contains(key, "idcard") || strings.Contains(key, "id_card") ||
|
||||||
|
strings.Contains(key, "身份证") || strings.Contains(key, "证件号")
|
||||||
|
}
|
||||||
|
|
||||||
|
// 判断是否为手机号字段
|
||||||
|
func isPhoneField(key string) bool {
|
||||||
|
key = strings.ToLower(key)
|
||||||
|
return strings.Contains(key, "phone") || strings.Contains(key, "mobile") ||
|
||||||
|
strings.Contains(key, "手机") || strings.Contains(key, "电话")
|
||||||
|
}
|
||||||
|
|
||||||
|
// 判断是否包含敏感数据模式
|
||||||
|
func containsSensitivePattern(value string) bool {
|
||||||
|
// 检查是否包含连续的数字或字母模式
|
||||||
|
numPattern := regexp.MustCompile(`\d{6,}`)
|
||||||
|
return numPattern.MatchString(value)
|
||||||
|
}
|
||||||
|
|
||||||
|
// 姓名脱敏
|
||||||
|
func maskName(name string) string {
|
||||||
|
if len(name) <= 1 {
|
||||||
|
return name
|
||||||
|
}
|
||||||
|
if len(name) == 2 {
|
||||||
|
return string(name[0]) + "*"
|
||||||
|
}
|
||||||
|
// 中文姓名常见3-4个字,只显示第一个字
|
||||||
|
first := string(name[0])
|
||||||
|
mask := strings.Repeat("*", len(name)-1)
|
||||||
|
return first + mask
|
||||||
|
}
|
||||||
|
|
||||||
|
// 身份证号脱敏
|
||||||
|
func maskIDCard(idCard string) string {
|
||||||
|
length := len(idCard)
|
||||||
|
if length <= 10 {
|
||||||
|
return idCard // 如果长度太短,可能不是身份证,不处理
|
||||||
|
}
|
||||||
|
// 保留前3位和后4位
|
||||||
|
return idCard[:3] + strings.Repeat("*", length-7) + idCard[length-4:]
|
||||||
|
}
|
||||||
|
|
||||||
|
// 手机号脱敏
|
||||||
|
func maskPhone(phone string) string {
|
||||||
|
length := len(phone)
|
||||||
|
if length < 8 {
|
||||||
|
return phone // 如果长度太短,可能不是手机号,不处理
|
||||||
|
}
|
||||||
|
// 保留前3位和后4位
|
||||||
|
return phone[:3] + strings.Repeat("*", length-7) + phone[length-4:]
|
||||||
|
}
|
||||||
|
|
||||||
|
// 通用敏感信息脱敏 - 根据字符串长度比例进行脱敏
|
||||||
|
func maskGeneral(value string) string {
|
||||||
|
length := len(value)
|
||||||
|
|
||||||
|
// 小于3个字符的不脱敏
|
||||||
|
if length <= 3 {
|
||||||
|
return value
|
||||||
|
}
|
||||||
|
|
||||||
|
// 根据字符串长度计算保留字符数
|
||||||
|
var prefixLen, suffixLen int
|
||||||
|
|
||||||
|
switch {
|
||||||
|
case length <= 6: // 短字符串
|
||||||
|
// 保留首尾各1个字符
|
||||||
|
prefixLen, suffixLen = 1, 1
|
||||||
|
case length <= 10: // 中等长度字符串
|
||||||
|
// 保留首部30%和尾部20%的字符
|
||||||
|
prefixLen = int(float64(length) * 0.3)
|
||||||
|
suffixLen = int(float64(length) * 0.2)
|
||||||
|
case length <= 20: // 较长字符串
|
||||||
|
// 保留首部25%和尾部15%的字符
|
||||||
|
prefixLen = int(float64(length) * 0.25)
|
||||||
|
suffixLen = int(float64(length) * 0.15)
|
||||||
|
default: // 非常长的字符串
|
||||||
|
// 保留首部20%和尾部10%的字符
|
||||||
|
prefixLen = int(float64(length) * 0.2)
|
||||||
|
suffixLen = int(float64(length) * 0.1)
|
||||||
|
}
|
||||||
|
|
||||||
|
// 确保至少有一个字符被保留
|
||||||
|
if prefixLen < 1 {
|
||||||
|
prefixLen = 1
|
||||||
|
}
|
||||||
|
if suffixLen < 1 {
|
||||||
|
suffixLen = 1
|
||||||
|
}
|
||||||
|
|
||||||
|
// 确保前缀和后缀总长不超过总长度的80%
|
||||||
|
if prefixLen+suffixLen > int(float64(length)*0.8) {
|
||||||
|
// 调整为总长度的80%
|
||||||
|
totalVisible := int(float64(length) * 0.8)
|
||||||
|
// 前缀占60%,后缀占40%
|
||||||
|
prefixLen = int(float64(totalVisible) * 0.6)
|
||||||
|
suffixLen = totalVisible - prefixLen
|
||||||
|
}
|
||||||
|
|
||||||
|
// 创建脱敏后的字符串
|
||||||
|
prefix := value[:prefixLen]
|
||||||
|
suffix := value[length-suffixLen:]
|
||||||
|
masked := strings.Repeat("*", length-prefixLen-suffixLen)
|
||||||
|
|
||||||
|
return prefix + masked + suffix
|
||||||
|
}
|
||||||
|
@ -2,10 +2,12 @@ package service
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
|
"crypto/rand"
|
||||||
|
"encoding/hex"
|
||||||
"fmt"
|
"fmt"
|
||||||
mathrand "math/rand"
|
|
||||||
"net/http"
|
"net/http"
|
||||||
"strconv"
|
"strconv"
|
||||||
|
"sync/atomic"
|
||||||
"time"
|
"time"
|
||||||
"tydata-server/app/user/cmd/api/internal/config"
|
"tydata-server/app/user/cmd/api/internal/config"
|
||||||
"tydata-server/pkg/lzkit/lzUtils"
|
"tydata-server/pkg/lzkit/lzUtils"
|
||||||
@ -170,33 +172,37 @@ func (a *AliPayService) QueryOrderStatus(ctx context.Context, outTradeNo string)
|
|||||||
return nil, fmt.Errorf("查询支付宝订单失败: %v", resp.SubMsg)
|
return nil, fmt.Errorf("查询支付宝订单失败: %v", resp.SubMsg)
|
||||||
}
|
}
|
||||||
|
|
||||||
// GenerateOutTradeNo 生成唯一订单号的函数
|
// 添加全局原子计数器
|
||||||
func (a *AliPayService) GenerateOutTradeNo() string {
|
var alipayOrderCounter uint32 = 0
|
||||||
length := 16
|
|
||||||
// 获取当前时间戳
|
|
||||||
timestamp := time.Now().UnixNano()
|
|
||||||
|
|
||||||
// 转换为字符串
|
// GenerateOutTradeNo 生成唯一订单号的函数 - 优化版本
|
||||||
|
func (a *AliPayService) GenerateOutTradeNo() string {
|
||||||
|
|
||||||
|
// 获取当前时间戳(毫秒级)
|
||||||
|
timestamp := time.Now().UnixMilli()
|
||||||
timeStr := strconv.FormatInt(timestamp, 10)
|
timeStr := strconv.FormatInt(timestamp, 10)
|
||||||
|
|
||||||
// 生成随机数
|
// 原子递增计数器
|
||||||
mathrand.Seed(time.Now().UnixNano())
|
counter := atomic.AddUint32(&alipayOrderCounter, 1)
|
||||||
randomPart := strconv.Itoa(mathrand.Intn(1000000))
|
|
||||||
|
|
||||||
// 组合时间戳和随机数
|
// 生成4字节真随机数
|
||||||
combined := timeStr + randomPart
|
randomBytes := make([]byte, 4)
|
||||||
|
_, err := rand.Read(randomBytes)
|
||||||
|
if err != nil {
|
||||||
|
// 如果随机数生成失败,回退到使用时间纳秒数据
|
||||||
|
randomBytes = []byte(strconv.FormatInt(time.Now().UnixNano()%1000000, 16))
|
||||||
|
}
|
||||||
|
randomHex := hex.EncodeToString(randomBytes)
|
||||||
|
|
||||||
// 如果长度超出指定值,则截断;如果不够,则填充随机字符
|
// 组合所有部分: 前缀 + 时间戳 + 计数器 + 随机数
|
||||||
if len(combined) >= length {
|
orderNo := fmt.Sprintf("%s%06x%s", timeStr[:10], counter%0xFFFFFF, randomHex[:6])
|
||||||
return combined[:length]
|
|
||||||
|
// 确保长度不超过32字符(大多数支付平台的限制)
|
||||||
|
if len(orderNo) > 32 {
|
||||||
|
orderNo = orderNo[:32]
|
||||||
}
|
}
|
||||||
|
|
||||||
// 如果长度不够,填充0
|
return orderNo
|
||||||
for len(combined) < length {
|
|
||||||
combined += strconv.Itoa(mathrand.Intn(10)) // 填充随机数
|
|
||||||
}
|
|
||||||
|
|
||||||
return combined
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// AliTransfer 支付宝单笔转账到支付宝账户(提现功能)
|
// AliTransfer 支付宝单笔转账到支付宝账户(提现功能)
|
||||||
|
@ -8,6 +8,6 @@ type QueryCache struct {
|
|||||||
}
|
}
|
||||||
type QueryCacheLoad struct {
|
type QueryCacheLoad struct {
|
||||||
Product string `json:"product_en"`
|
Product string `json:"product_en"`
|
||||||
Params map[string]interface{} `json:"params"`
|
Params string `json:"params"`
|
||||||
AgentIdentifier string `json:"agent_dentifier"`
|
AgentIdentifier string `json:"agent_dentifier"`
|
||||||
}
|
}
|
||||||
|
@ -14,7 +14,6 @@ const DB_ERROR uint32 = 100005
|
|||||||
const DB_UPDATE_AFFECTED_ZERO_ERROR uint32 = 100006
|
const DB_UPDATE_AFFECTED_ZERO_ERROR uint32 = 100006
|
||||||
const PARAM_VERIFICATION_ERROR uint32 = 100007
|
const PARAM_VERIFICATION_ERROR uint32 = 100007
|
||||||
const CUSTOM_ERROR uint32 = 100008
|
const CUSTOM_ERROR uint32 = 100008
|
||||||
const AUTH_ERROR uint32 = 100009
|
|
||||||
|
|
||||||
const LOGIN_FAILED uint32 = 200001
|
const LOGIN_FAILED uint32 = 200001
|
||||||
const LOGIC_QUERY_WAIT uint32 = 200002
|
const LOGIC_QUERY_WAIT uint32 = 200002
|
||||||
|
@ -11,7 +11,6 @@ func init() {
|
|||||||
message[TOKEN_GENERATE_ERROR] = "生成token失败"
|
message[TOKEN_GENERATE_ERROR] = "生成token失败"
|
||||||
message[DB_ERROR] = "数据库繁忙,请稍后再试"
|
message[DB_ERROR] = "数据库繁忙,请稍后再试"
|
||||||
message[DB_UPDATE_AFFECTED_ZERO_ERROR] = "更新数据影响行数为0"
|
message[DB_UPDATE_AFFECTED_ZERO_ERROR] = "更新数据影响行数为0"
|
||||||
message[AUTH_ERROR] = "权限错误,无权访问"
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func MapErrMsg(errcode uint32) string {
|
func MapErrMsg(errcode uint32) string {
|
||||||
|
Loading…
Reference in New Issue
Block a user