diff --git a/app/main/api/internal/logic/admin_agent/admingetagentlistlogic.go b/app/main/api/internal/logic/admin_agent/admingetagentlistlogic.go index 3a41e6d..08423c0 100644 --- a/app/main/api/internal/logic/admin_agent/admingetagentlistlogic.go +++ b/app/main/api/internal/logic/admin_agent/admingetagentlistlogic.go @@ -2,6 +2,7 @@ package admin_agent import ( "context" + "encoding/hex" "qnc-server/app/main/api/internal/svc" "qnc-server/app/main/api/internal/types" @@ -90,9 +91,12 @@ func (l *AdminGetAgentListLogic) AdminGetAgentList(req *types.AdminGetAgentListR } realName = realNameInfo.Name if realNameInfo.IdCard != "" { - decrypted, err := crypto.DecryptIDCard(realNameInfo.IdCard, []byte(l.svcCtx.Config.Encrypt.SecretKey)) - if err == nil { - idCardPlain = decrypted + key, keyErr := hex.DecodeString(l.svcCtx.Config.Encrypt.SecretKey) + if keyErr == nil { + decrypted, err := crypto.DecryptIDCard(realNameInfo.IdCard, key) + if err == nil { + idCardPlain = decrypted + } } } } diff --git a/app/main/api/internal/logic/admin_agent/admingetagentrealnamelistlogic.go b/app/main/api/internal/logic/admin_agent/admingetagentrealnamelistlogic.go index bdd7f03..9f6c988 100644 --- a/app/main/api/internal/logic/admin_agent/admingetagentrealnamelistlogic.go +++ b/app/main/api/internal/logic/admin_agent/admingetagentrealnamelistlogic.go @@ -2,15 +2,15 @@ package admin_agent import ( "context" + "encoding/hex" + + "qnc-server/app/main/api/internal/svc" + "qnc-server/app/main/api/internal/types" "qnc-server/common/globalkey" "qnc-server/common/xerr" "qnc-server/pkg/lzkit/crypto" "github.com/pkg/errors" - - "qnc-server/app/main/api/internal/svc" - "qnc-server/app/main/api/internal/types" - "github.com/zeromicro/go-zero/core/logx" ) @@ -72,16 +72,19 @@ func (l *AdminGetAgentRealNameListLogic) AdminGetAgentRealNameList(req *types.Ad } } - // 解密身份证号(仅显示部分) + // 解密身份证号(仅显示部分,密钥与实名认证写入时一致:hex 解码后使用) idCard := "" if realName.IdCard != "" { - decrypted, err := crypto.DecryptIDCard(realName.IdCard, []byte(l.svcCtx.Config.Encrypt.SecretKey)) - if err == nil { - // 脱敏显示 - if len(decrypted) > 10 { - idCard = decrypted[:3] + "***********" + decrypted[len(decrypted)-4:] - } else { - idCard = decrypted + key, keyErr := hex.DecodeString(l.svcCtx.Config.Encrypt.SecretKey) + if keyErr == nil { + decrypted, err := crypto.DecryptIDCard(realName.IdCard, key) + if err == nil { + // 脱敏显示 + if len(decrypted) > 10 { + idCard = decrypted[:3] + "***********" + decrypted[len(decrypted)-4:] + } else { + idCard = decrypted + } } } }