From 31565393196b6c098183f9772cef89066295e9a5 Mon Sep 17 00:00:00 2001 From: Mrx <18278715334@163.com> Date: Tue, 21 Apr 2026 17:03:03 +0800 Subject: [PATCH] f --- .../processors/ivyz/ivyzrax1_processor.go | 37 +++++++++++-------- .../processors/ivyz/ivyzrax2_processor.go | 37 +++++++++++-------- .../infrastructure/external/zhicha/crypto.go | 9 +++++ .../external/zhicha/zhicha_service.go | 6 +++ 4 files changed, 59 insertions(+), 30 deletions(-) diff --git a/internal/domains/api/services/processors/ivyz/ivyzrax1_processor.go b/internal/domains/api/services/processors/ivyz/ivyzrax1_processor.go index a2122d0..c028c10 100644 --- a/internal/domains/api/services/processors/ivyz/ivyzrax1_processor.go +++ b/internal/domains/api/services/processors/ivyz/ivyzrax1_processor.go @@ -21,25 +21,32 @@ func ProcessIVYZRAX1Request(ctx context.Context, params []byte, deps *processors return nil, errors.Join(processors.ErrInvalidParam, err) } - encryptedName, err := deps.ZhichaService.Encrypt(paramsDto.Name) - if err != nil { - return nil, errors.Join(processors.ErrSystem, err) - } + // encryptedName, err := deps.ZhichaService.Encrypt(paramsDto.Name) + // if err != nil { + // return nil, errors.Join(processors.ErrSystem, err) + // } - encryptedIDCard, err := deps.ZhichaService.Encrypt(paramsDto.IDCard) - if err != nil { - return nil, errors.Join(processors.ErrSystem, err) - } - encryptedMoblie, err := deps.ZhichaService.Encrypt(paramsDto.MobileNo) - if err != nil { - return nil, errors.Join(processors.ErrSystem, err) - } + // encryptedIDCard, err := deps.ZhichaService.Encrypt(paramsDto.IDCard) + // if err != nil { + // return nil, errors.Join(processors.ErrSystem, err) + // } + // encryptedMoblie, err := deps.ZhichaService.Encrypt(paramsDto.MobileNo) + // if err != nil { + // return nil, errors.Join(processors.ErrSystem, err) + // } + + md5Name := deps.ZhichaService.MD5(paramsDto.Name) + md5IDCard := deps.ZhichaService.MD5(paramsDto.IDCard) + md5Mobile := deps.ZhichaService.MD5(paramsDto.MobileNo) reqData := map[string]interface{}{ - "name": encryptedName, - "idCard": encryptedIDCard, - "phone": encryptedMoblie, + // "name": encryptedName, + // "idCard": encryptedIDCard, + // "phone": encryptedMoblie, "authorized": paramsDto.Authorized, + "name": md5Name, + "idCard": md5IDCard, + "phone": md5Mobile, } respData, err := deps.ZhichaService.CallAPI(ctx, "ZCI084", reqData) diff --git a/internal/domains/api/services/processors/ivyz/ivyzrax2_processor.go b/internal/domains/api/services/processors/ivyz/ivyzrax2_processor.go index 1dbd31b..48cddae 100644 --- a/internal/domains/api/services/processors/ivyz/ivyzrax2_processor.go +++ b/internal/domains/api/services/processors/ivyz/ivyzrax2_processor.go @@ -21,25 +21,32 @@ func ProcessIVYZRAX2Request(ctx context.Context, params []byte, deps *processors return nil, errors.Join(processors.ErrInvalidParam, err) } - encryptedName, err := deps.ZhichaService.Encrypt(paramsDto.Name) - if err != nil { - return nil, errors.Join(processors.ErrSystem, err) - } + // encryptedName, err := deps.ZhichaService.Encrypt(paramsDto.Name) + // if err != nil { + // return nil, errors.Join(processors.ErrSystem, err) + // } - encryptedIDCard, err := deps.ZhichaService.Encrypt(paramsDto.IDCard) - if err != nil { - return nil, errors.Join(processors.ErrSystem, err) - } - encryptedMoblie, err := deps.ZhichaService.Encrypt(paramsDto.MobileNo) - if err != nil { - return nil, errors.Join(processors.ErrSystem, err) - } + // encryptedIDCard, err := deps.ZhichaService.Encrypt(paramsDto.IDCard) + // if err != nil { + // return nil, errors.Join(processors.ErrSystem, err) + // } + // encryptedMoblie, err := deps.ZhichaService.Encrypt(paramsDto.MobileNo) + // if err != nil { + // return nil, errors.Join(processors.ErrSystem, err) + // } + + md5Name := deps.ZhichaService.MD5(paramsDto.Name) + md5IDCard := deps.ZhichaService.MD5(paramsDto.IDCard) + md5Mobile := deps.ZhichaService.MD5(paramsDto.MobileNo) reqData := map[string]interface{}{ - "name": encryptedName, - "idCard": encryptedIDCard, - "phone": encryptedMoblie, + // "name": encryptedName, + // "idCard": encryptedIDCard, + // "phone": encryptedMoblie, "authorized": paramsDto.Authorized, + "name": md5Name, + "idCard": md5IDCard, + "phone": md5Mobile, } respData, err := deps.ZhichaService.CallAPI(ctx, "ZCI083", reqData) diff --git a/internal/infrastructure/external/zhicha/crypto.go b/internal/infrastructure/external/zhicha/crypto.go index 13bd170..28e9da9 100644 --- a/internal/infrastructure/external/zhicha/crypto.go +++ b/internal/infrastructure/external/zhicha/crypto.go @@ -4,9 +4,11 @@ import ( "bytes" "crypto/aes" "crypto/cipher" + "crypto/md5" "encoding/base64" "encoding/hex" "fmt" + "io" ) const ( @@ -119,3 +121,10 @@ func pkcs7Unpadding(src []byte) ([]byte, error) { return src[:length-unpadding], nil } + +// MD5 使用MD5加密数据,返回十六进制字符串 +func MD5(data string) string { + h := md5.New() + io.WriteString(h, data) + return hex.EncodeToString(h.Sum(nil)) +} diff --git a/internal/infrastructure/external/zhicha/zhicha_service.go b/internal/infrastructure/external/zhicha/zhicha_service.go index 5ce6045..a8bb200 100644 --- a/internal/infrastructure/external/zhicha/zhicha_service.go +++ b/internal/infrastructure/external/zhicha/zhicha_service.go @@ -315,6 +315,12 @@ func (z *ZhichaService) Decrypt(encryptedData string) (string, error) { return string(unpadded), nil } +// MD5 对字符串进行MD5加密并返回32位小写十六进制字符串 +func (z *ZhichaService) MD5(data string) string { + hash := md5.Sum([]byte(data)) + return hex.EncodeToString(hash[:]) +} + // pkcs7Padding 使用PKCS7填充数据 func (z *ZhichaService) pkcs7Padding(src []byte, blockSize int) []byte { padding := blockSize - len(src)%blockSize