This commit is contained in:
2024-10-13 22:17:25 +08:00
parent c35864c47b
commit 641d7f948c
35 changed files with 489 additions and 543 deletions

View File

@@ -29,25 +29,25 @@ func NewJRZQ0A03Logic(ctx context.Context, svcCtx *svc.ServiceContext) *JRZQ0A03
}
}
func (l *JRZQ0A03Logic) JRZQ0A03(req *types.Request) (resp *types.Response, err *errs.AppError) {
func (l *JRZQ0A03Logic) JRZQ0A03(req *types.Request) (resp string, err *errs.AppError) {
var status string
var charges bool
var remark = ""
secretKey, ok := l.ctx.Value("secretKey").(string)
if !ok {
return &types.Response{}, errs.ErrSystem
return "", errs.ErrSystem
}
transactionID, ok := l.ctx.Value("transactionID").(string)
if !ok {
return &types.Response{}, errs.ErrSystem
return "", errs.ErrSystem
}
userId, userIdOk := l.ctx.Value("userId").(int64)
if !userIdOk {
return &types.Response{}, errs.ErrSystem
return "", errs.ErrSystem
}
productCode, productCodeOk := l.ctx.Value("productCode").(string)
if !productCodeOk || productCode == "" {
return &types.Response{}, errs.ErrSystem
return "", errs.ErrSystem
}
defer func() {
if err != nil {
@@ -65,17 +65,17 @@ func (l *JRZQ0A03Logic) JRZQ0A03(req *types.Request) (resp *types.Response, err
// 1、解密
key, decodeErr := hex.DecodeString(secretKey)
if decodeErr != nil {
return nil, errs.ErrSystem
return "", errs.ErrSystem
}
decryptData, aesDecryptErr := crypto.AesDecrypt(req.Data, key)
if aesDecryptErr != nil || len(decryptData) == 0 {
return nil, errs.ErrParamDecryption
return "", errs.ErrParamDecryption
}
// 2、校验
var data validator.JRZQ0A03Request
if validatorErr := validator.ValidateAndParse(decryptData, &data); validatorErr != nil {
return nil, errs.ErrParamValidation
return "", errs.ErrParamValidation
}
// 3、西部加密
@@ -83,7 +83,7 @@ func (l *JRZQ0A03Logic) JRZQ0A03(req *types.Request) (resp *types.Response, err
encryptedFields, encryptStructFieldsErr := common.EncryptStructFields(data, westConfig.Key)
if encryptStructFieldsErr != nil {
logx.Errorf("西部加密错误:%v", encryptStructFieldsErr)
return nil, errs.ErrSystem
return "", errs.ErrSystem
}
// 4、发送请求到西部
@@ -92,26 +92,24 @@ func (l *JRZQ0A03Logic) JRZQ0A03(req *types.Request) (resp *types.Response, err
westResp, callAPIErr := l.svcCtx.WestDexService.CallAPI("G27BJ05", apiRequest)
if callAPIErr != nil {
return nil, errs.ErrSystem
return "", errs.ErrSystem
}
// 5、响应解析
//var respData westmodel.G32BJ05Response
//unmarshalErr := json.Unmarshal(westResp, &respData)
//if unmarshalErr != nil {
// return nil, errs.ErrSystem
// return "", errs.ErrSystem
//}
//
//if respData.Data.Code == "00" || respData.Data.Code == "100002" {
// l.ctx = context.WithValue(l.ctx, "Charges", true)
//} else {
// return nil, errs.ErrSystem
// return "", errs.ErrSystem
//}
//encryptData, aesEncrypt := crypto.AesEncrypt(westResp, key)
//if aesEncrypt != nil {
// return nil, errs.ErrSystem
// return "", errs.ErrSystem
//}
return &types.Response{
Data: string(westResp),
}, nil
return string(westResp), nil
}

View File

@@ -29,25 +29,25 @@ func NewJRZQ4AA8Logic(ctx context.Context, svcCtx *svc.ServiceContext) *JRZQ4AA8
}
}
func (l *JRZQ4AA8Logic) JRZQ4AA8(req *types.Request) (resp *types.Response, err *errs.AppError) {
func (l *JRZQ4AA8Logic) JRZQ4AA8(req *types.Request) (resp string, err *errs.AppError) {
var status string
var charges bool
var remark = ""
secretKey, ok := l.ctx.Value("secretKey").(string)
if !ok {
return &types.Response{}, errs.ErrSystem
return "", errs.ErrSystem
}
transactionID, ok := l.ctx.Value("transactionID").(string)
if !ok {
return &types.Response{}, errs.ErrSystem
return "", errs.ErrSystem
}
userId, userIdOk := l.ctx.Value("userId").(int64)
if !userIdOk {
return &types.Response{}, errs.ErrSystem
return "", errs.ErrSystem
}
productCode, productCodeOk := l.ctx.Value("productCode").(string)
if !productCodeOk || productCode == "" {
return &types.Response{}, errs.ErrSystem
return "", errs.ErrSystem
}
defer func() {
if err != nil {
@@ -65,17 +65,17 @@ func (l *JRZQ4AA8Logic) JRZQ4AA8(req *types.Request) (resp *types.Response, err
// 1、解密
key, decodeErr := hex.DecodeString(secretKey)
if decodeErr != nil {
return nil, errs.ErrSystem
return "", errs.ErrSystem
}
decryptData, aesDecryptErr := crypto.AesDecrypt(req.Data, key)
if aesDecryptErr != nil || len(decryptData) == 0 {
return nil, errs.ErrParamDecryption
return "", errs.ErrParamDecryption
}
// 2、校验
var data validator.JRZQ4AA8Request
if validatorErr := validator.ValidateAndParse(decryptData, &data); validatorErr != nil {
return nil, errs.ErrParamValidation
return "", errs.ErrParamValidation
}
// 3、西部加密
@@ -83,7 +83,7 @@ func (l *JRZQ4AA8Logic) JRZQ4AA8(req *types.Request) (resp *types.Response, err
encryptedFields, encryptStructFieldsErr := common.EncryptStructFields(data, westConfig.Key)
if encryptStructFieldsErr != nil {
logx.Errorf("西部加密错误:%v", encryptStructFieldsErr)
return nil, errs.ErrSystem
return "", errs.ErrSystem
}
// 4、发送请求到西部
@@ -92,26 +92,24 @@ func (l *JRZQ4AA8Logic) JRZQ4AA8(req *types.Request) (resp *types.Response, err
westResp, callAPIErr := l.svcCtx.WestDexService.CallAPI("G29BJ05", apiRequest)
if callAPIErr != nil {
return nil, errs.ErrSystem
return "", errs.ErrSystem
}
// 5、响应解析
//var respData westmodel.G32BJ05Response
//unmarshalErr := json.Unmarshal(westResp, &respData)
//if unmarshalErr != nil {
// return nil, errs.ErrSystem
// return "", errs.ErrSystem
//}
//
//if respData.Data.Code == "00" || respData.Data.Code == "100002" {
// l.ctx = context.WithValue(l.ctx, "Charges", true)
//} else {
// return nil, errs.ErrSystem
// return "", errs.ErrSystem
//}
//encryptData, aesEncrypt := crypto.AesEncrypt(westResp, key)
//if aesEncrypt != nil {
// return nil, errs.ErrSystem
// return "", errs.ErrSystem
//}
return &types.Response{
Data: string(westResp),
}, nil
return string(westResp), nil
}

View File

@@ -29,25 +29,25 @@ func NewJRZQ8203Logic(ctx context.Context, svcCtx *svc.ServiceContext) *JRZQ8203
}
}
func (l *JRZQ8203Logic) JRZQ8203(req *types.Request) (resp *types.Response, err *errs.AppError) {
func (l *JRZQ8203Logic) JRZQ8203(req *types.Request) (resp string, err *errs.AppError) {
var status string
var charges bool
var remark = ""
secretKey, ok := l.ctx.Value("secretKey").(string)
if !ok {
return &types.Response{}, errs.ErrSystem
return "", errs.ErrSystem
}
transactionID, ok := l.ctx.Value("transactionID").(string)
if !ok {
return &types.Response{}, errs.ErrSystem
return "", errs.ErrSystem
}
userId, userIdOk := l.ctx.Value("userId").(int64)
if !userIdOk {
return &types.Response{}, errs.ErrSystem
return "", errs.ErrSystem
}
productCode, productCodeOk := l.ctx.Value("productCode").(string)
if !productCodeOk || productCode == "" {
return &types.Response{}, errs.ErrSystem
return "", errs.ErrSystem
}
defer func() {
if err != nil {
@@ -65,17 +65,17 @@ func (l *JRZQ8203Logic) JRZQ8203(req *types.Request) (resp *types.Response, err
// 1、解密
key, decodeErr := hex.DecodeString(secretKey)
if decodeErr != nil {
return nil, errs.ErrSystem
return "", errs.ErrSystem
}
decryptData, aesDecryptErr := crypto.AesDecrypt(req.Data, key)
if aesDecryptErr != nil || len(decryptData) == 0 {
return nil, errs.ErrParamDecryption
return "", errs.ErrParamDecryption
}
// 2、校验
var data validator.JRZQ8203Request
if validatorErr := validator.ValidateAndParse(decryptData, &data); validatorErr != nil {
return nil, errs.ErrParamValidation
return "", errs.ErrParamValidation
}
// 3、西部加密
@@ -83,7 +83,7 @@ func (l *JRZQ8203Logic) JRZQ8203(req *types.Request) (resp *types.Response, err
encryptedFields, encryptStructFieldsErr := common.EncryptStructFields(data, westConfig.Key)
if encryptStructFieldsErr != nil {
logx.Errorf("西部加密错误:%v", encryptStructFieldsErr)
return nil, errs.ErrSystem
return "", errs.ErrSystem
}
// 4、发送请求到西部
@@ -92,26 +92,24 @@ func (l *JRZQ8203Logic) JRZQ8203(req *types.Request) (resp *types.Response, err
westResp, callAPIErr := l.svcCtx.WestDexService.CallAPI("G28BJ05", apiRequest)
if callAPIErr != nil {
return nil, errs.ErrSystem
return "", errs.ErrSystem
}
// 5、响应解析
//var respData westmodel.G32BJ05Response
//unmarshalErr := json.Unmarshal(westResp, &respData)
//if unmarshalErr != nil {
// return nil, errs.ErrSystem
// return "", errs.ErrSystem
//}
//
//if respData.Data.Code == "00" || respData.Data.Code == "100002" {
// l.ctx = context.WithValue(l.ctx, "Charges", true)
//} else {
// return nil, errs.ErrSystem
// return "", errs.ErrSystem
//}
//encryptData, aesEncrypt := crypto.AesEncrypt(westResp, key)
//if aesEncrypt != nil {
// return nil, errs.ErrSystem
// return "", errs.ErrSystem
//}
return &types.Response{
Data: string(westResp),
}, nil
return string(westResp), nil
}

View File

@@ -29,25 +29,25 @@ func NewJRZQDCBELogic(ctx context.Context, svcCtx *svc.ServiceContext) *JRZQDCBE
}
}
func (l *JRZQDCBELogic) JRZQDCBE(req *types.Request) (resp *types.Response, err *errs.AppError) {
func (l *JRZQDCBELogic) JRZQDCBE(req *types.Request) (resp string, err *errs.AppError) {
var status string
var charges bool
var remark = ""
secretKey, ok := l.ctx.Value("secretKey").(string)
if !ok {
return &types.Response{}, errs.ErrSystem
return "", errs.ErrSystem
}
transactionID, ok := l.ctx.Value("transactionID").(string)
if !ok {
return &types.Response{}, errs.ErrSystem
return "", errs.ErrSystem
}
userId, userIdOk := l.ctx.Value("userId").(int64)
if !userIdOk {
return &types.Response{}, errs.ErrSystem
return "", errs.ErrSystem
}
productCode, productCodeOk := l.ctx.Value("productCode").(string)
if !productCodeOk || productCode == "" {
return &types.Response{}, errs.ErrSystem
return "", errs.ErrSystem
}
defer func() {
if err != nil {
@@ -65,17 +65,17 @@ func (l *JRZQDCBELogic) JRZQDCBE(req *types.Request) (resp *types.Response, err
// 1、解密
key, decodeErr := hex.DecodeString(secretKey)
if decodeErr != nil {
return nil, errs.ErrSystem
return "", errs.ErrSystem
}
decryptData, aesDecryptErr := crypto.AesDecrypt(req.Data, key)
if aesDecryptErr != nil || len(decryptData) == 0 {
return nil, errs.ErrParamDecryption
return "", errs.ErrParamDecryption
}
// 2、校验
var data validator.JRZQDBCERequest
if validatorErr := validator.ValidateAndParse(decryptData, &data); validatorErr != nil {
return nil, errs.ErrParamValidation
return "", errs.ErrParamValidation
}
// 3、西部加密
@@ -83,7 +83,7 @@ func (l *JRZQDCBELogic) JRZQDCBE(req *types.Request) (resp *types.Response, err
encryptedFields, encryptStructFieldsErr := common.EncryptStructFields(data, westConfig.Key)
if encryptStructFieldsErr != nil {
logx.Errorf("西部加密错误:%v", encryptStructFieldsErr)
return nil, errs.ErrSystem
return "", errs.ErrSystem
}
// 4、发送请求到西部
@@ -92,26 +92,24 @@ func (l *JRZQDCBELogic) JRZQDCBE(req *types.Request) (resp *types.Response, err
westResp, callAPIErr := l.svcCtx.WestDexService.CallAPI("G20GZ01", apiRequest)
if callAPIErr != nil {
return nil, errs.ErrSystem
return "", errs.ErrSystem
}
// 5、响应解析
//var respData westmodel.G32BJ05Response
//unmarshalErr := json.Unmarshal(westResp, &respData)
//if unmarshalErr != nil {
// return nil, errs.ErrSystem
// return "", errs.ErrSystem
//}
//
//if respData.Data.Code == "00" || respData.Data.Code == "100002" {
// l.ctx = context.WithValue(l.ctx, "Charges", true)
//} else {
// return nil, errs.ErrSystem
// return "", errs.ErrSystem
//}
//encryptData, aesEncrypt := crypto.AesEncrypt(westResp, key)
//if aesEncrypt != nil {
// return nil, errs.ErrSystem
// return "", errs.ErrSystem
//}
return &types.Response{
Data: string(westResp),
}, nil
return string(westResp), nil
}