diff --git a/apps/api/etc/api-api.dev.yaml b/apps/api/etc/api-api.dev.yaml index bb27c63..62478cc 100644 --- a/apps/api/etc/api-api.dev.yaml +++ b/apps/api/etc/api-api.dev.yaml @@ -19,6 +19,7 @@ WestConfig: Url: "http://proxy.tianyuanapi.com/api/invoke" Key: "121a1e41fc1690dd6b90afbcacd80cf4" SecretId: "449159" + SecretSecondId: "296804" UserRpc: Etcd: Hosts: diff --git a/apps/api/etc/api-api.yaml b/apps/api/etc/api-api.yaml index 8a4746c..3796cb5 100644 --- a/apps/api/etc/api-api.yaml +++ b/apps/api/etc/api-api.yaml @@ -22,5 +22,6 @@ KqPusherConf: Topic: apirequest WestConfig: Url: "https://apimaster.westdex.com.cn/api/invoke" - key: "121a1e41fc1690dd6b90afbcacd80cf4" - secretId: "449159" \ No newline at end of file + Key: "121a1e41fc1690dd6b90afbcacd80cf4" + SecretId: "449159" + SecretSecondId: "296804" \ No newline at end of file diff --git a/apps/api/internal/config/config.go b/apps/api/internal/config/config.go index ffa833b..fa2b9a3 100644 --- a/apps/api/internal/config/config.go +++ b/apps/api/internal/config/config.go @@ -20,7 +20,8 @@ type KqPusherConf struct { Topic string } type WestConfig struct { - Url string - Key string - SecretId string + Url string + Key string + SecretId string + SecretSecondId string } diff --git a/apps/api/internal/logic/FLXG/flxg162alogic.go b/apps/api/internal/logic/FLXG/flxg162alogic.go index 5c2673a..64b1d31 100644 --- a/apps/api/internal/logic/FLXG/flxg162alogic.go +++ b/apps/api/internal/logic/FLXG/flxg162alogic.go @@ -90,7 +90,7 @@ func (l *FLXG162ALogic) FLXG162A(req *types.Request) (resp string, err *errs.App logx.Infof("交易号：%s", transactionID) apiRequest := common.MapStructToAPIRequest(encryptedFields, westmodel.FLXG162AFieldMapping, "data") - westResp, callAPIErr := l.svcCtx.WestDexService.CallAPI("G32BJ05", apiRequest) + westResp, callAPIErr := l.svcCtx.WestDexService.CallAPI("G32BJ05", apiRequest, l.svcCtx.Config.WestConfig.SecretId) if callAPIErr != nil { if callAPIErr.Code == errs.ErrDataSource.Code { encryptData, aesEncrypt := crypto.AesEncrypt(westResp, key) diff --git a/apps/api/internal/logic/FLXG/flxg3d56logic.go b/apps/api/internal/logic/FLXG/flxg3d56logic.go index 5e4bbfc..6ab1b05 100644 --- a/apps/api/internal/logic/FLXG/flxg3d56logic.go +++ b/apps/api/internal/logic/FLXG/flxg3d56logic.go @@ -92,7 +92,7 @@ func (l *FLXG3D56Logic) FLXG3D56(req *types.Request) (resp string, err *errs.App logx.Infof("交易号：%s", transactionID) apiRequest := common.MapStructToAPIRequest(encryptedFields, westmodel.FLXG3D56FieldMapping, "data") - westResp, callAPIErr := l.svcCtx.WestDexService.CallAPI("G26BJ05", apiRequest) + westResp, callAPIErr := l.svcCtx.WestDexService.CallAPI("G26BJ05", apiRequest, l.svcCtx.Config.WestConfig.SecretId) if callAPIErr != nil { if callAPIErr.Code == errs.ErrDataSource.Code { encryptData, aesEncrypt := crypto.AesEncrypt(westResp, key) diff --git a/apps/api/internal/logic/FLXG/flxg54f5logic.go b/apps/api/internal/logic/FLXG/flxg54f5logic.go index 6736aa2..333ca6d 100644 --- a/apps/api/internal/logic/FLXG/flxg54f5logic.go +++ b/apps/api/internal/logic/FLXG/flxg54f5logic.go @@ -90,7 +90,7 @@ func (l *FLXG54F5Logic) FLXG54F5(req *types.Request) (resp string, err *errs.App logx.Infof("交易号：%s", transactionID) apiRequest := common.MapStructToAPIRequest(encryptedFields, westmodel.FLXG54F5FieldMapping, "data") - westResp, callAPIErr := l.svcCtx.WestDexService.CallAPI("G03HZ01", apiRequest) + westResp, callAPIErr := l.svcCtx.WestDexService.CallAPI("G03HZ01", apiRequest, l.svcCtx.Config.WestConfig.SecretId) if callAPIErr != nil { if callAPIErr.Code == errs.ErrDataSource.Code { encryptData, aesEncrypt := crypto.AesEncrypt(westResp, key) diff --git a/apps/api/internal/logic/FLXG/flxg5876logic.go b/apps/api/internal/logic/FLXG/flxg5876logic.go index 30a9da1..8ef633a 100644 --- a/apps/api/internal/logic/FLXG/flxg5876logic.go +++ b/apps/api/internal/logic/FLXG/flxg5876logic.go @@ -90,7 +90,7 @@ func (l *FLXG5876Logic) FLXG5876(req *types.Request) (resp string, err *errs.App logx.Infof("交易号：%s", transactionID) apiRequest := common.MapStructToAPIRequest(encryptedFields, westmodel.FLXG5876FieldMapping, "") - westResp, callAPIErr := l.svcCtx.WestDexService.CallAPI("G03XM02", apiRequest) + westResp, callAPIErr := l.svcCtx.WestDexService.CallAPI("G03XM02", apiRequest, l.svcCtx.Config.WestConfig.SecretId) if callAPIErr != nil { if callAPIErr.Code == errs.ErrDataSource.Code { encryptData, aesEncrypt := crypto.AesEncrypt(westResp, key) diff --git a/apps/api/internal/logic/FLXG/flxg9687logic.go b/apps/api/internal/logic/FLXG/flxg9687logic.go index 758fc24..84a01de 100644 --- a/apps/api/internal/logic/FLXG/flxg9687logic.go +++ b/apps/api/internal/logic/FLXG/flxg9687logic.go @@ -90,7 +90,7 @@ func (l *FLXG9687Logic) FLXG9687(req *types.Request) (resp string, err *errs.App logx.Infof("交易号：%s", transactionID) apiRequest := common.MapStructToAPIRequest(encryptedFields, westmodel.FLXG9687FieldMapping, "data") - westResp, callAPIErr := l.svcCtx.WestDexService.CallAPI("G31BJ05", apiRequest) + westResp, callAPIErr := l.svcCtx.WestDexService.CallAPI("G31BJ05", apiRequest, l.svcCtx.Config.WestConfig.SecretId) if callAPIErr != nil { if callAPIErr.Code == errs.ErrDataSource.Code { encryptData, aesEncrypt := crypto.AesEncrypt(westResp, key) diff --git a/apps/api/internal/logic/FLXG/flxg970flogic.go b/apps/api/internal/logic/FLXG/flxg970flogic.go index c99f67f..a9a9d54 100644 --- a/apps/api/internal/logic/FLXG/flxg970flogic.go +++ b/apps/api/internal/logic/FLXG/flxg970flogic.go @@ -90,7 +90,7 @@ func (l *FLXG970FLogic) FLXG970F(req *types.Request) (resp string, err *errs.App logx.Infof("交易号：%s", transactionID) apiRequest := common.MapStructToAPIRequest(encryptedFields, westmodel.FLXG970FFieldMapping, "data") - westResp, callAPIErr := l.svcCtx.WestDexService.CallAPI("WEST00028", apiRequest) + westResp, callAPIErr := l.svcCtx.WestDexService.CallAPI("WEST00028", apiRequest, l.svcCtx.Config.WestConfig.SecretId) if callAPIErr != nil { if callAPIErr.Code == errs.ErrDataSource.Code { encryptData, aesEncrypt := crypto.AesEncrypt(westResp, key) diff --git a/apps/api/internal/logic/FLXG/flxgc9d1logic.go b/apps/api/internal/logic/FLXG/flxgc9d1logic.go index fa82311..64e34f6 100644 --- a/apps/api/internal/logic/FLXG/flxgc9d1logic.go +++ b/apps/api/internal/logic/FLXG/flxgc9d1logic.go @@ -90,7 +90,7 @@ func (l *FLXGC9D1Logic) FLXGC9D1(req *types.Request) (resp string, err *errs.App logx.Infof("交易号：%s", transactionID) apiRequest := common.MapStructToAPIRequest(encryptedFields, westmodel.FLXGC9D1FieldMapping, "data") - westResp, callAPIErr := l.svcCtx.WestDexService.CallAPI("G30BJ05", apiRequest) + westResp, callAPIErr := l.svcCtx.WestDexService.CallAPI("G30BJ05", apiRequest, l.svcCtx.Config.WestConfig.SecretId) if callAPIErr != nil { if callAPIErr.Code == errs.ErrDataSource.Code { encryptData, aesEncrypt := crypto.AesEncrypt(westResp, key) diff --git a/apps/api/internal/logic/FLXG/flxgca3dlogic.go b/apps/api/internal/logic/FLXG/flxgca3dlogic.go index 4fa5d29..5f47f11 100644 --- a/apps/api/internal/logic/FLXG/flxgca3dlogic.go +++ b/apps/api/internal/logic/FLXG/flxgca3dlogic.go @@ -90,7 +90,7 @@ func (l *FLXGCA3DLogic) FLXGCA3D(req *types.Request) (resp string, err *errs.App logx.Infof("交易号：%s", transactionID) apiRequest := common.MapStructToAPIRequest(encryptedFields, westmodel.FLXGCA3DFieldMapping, "data") - westResp, callAPIErr := l.svcCtx.WestDexService.CallAPI("G22BJ03", apiRequest) + westResp, callAPIErr := l.svcCtx.WestDexService.CallAPI("G22BJ03", apiRequest, l.svcCtx.Config.WestConfig.SecretId) if callAPIErr != nil { if callAPIErr.Code == errs.ErrDataSource.Code { encryptData, aesEncrypt := crypto.AesEncrypt(westResp, key) diff --git a/apps/api/internal/logic/FLXG/flxgdec7logic.go b/apps/api/internal/logic/FLXG/flxgdec7logic.go index c728414..56fe349 100644 --- a/apps/api/internal/logic/FLXG/flxgdec7logic.go +++ b/apps/api/internal/logic/FLXG/flxgdec7logic.go @@ -90,7 +90,7 @@ func (l *FLXGDEC7Logic) FLXGDEC7(req *types.Request) (resp string, err *errs.App logx.Infof("交易号：%s", transactionID) apiRequest := common.MapStructToAPIRequest(encryptedFields, westmodel.FLXGDEC7FieldMapping, "data") - westResp, callAPIErr := l.svcCtx.WestDexService.CallAPI("G23BJ03", apiRequest) + westResp, callAPIErr := l.svcCtx.WestDexService.CallAPI("G23BJ03", apiRequest, l.svcCtx.Config.WestConfig.SecretId) if callAPIErr != nil { if callAPIErr.Code == errs.ErrDataSource.Code { encryptData, aesEncrypt := crypto.AesEncrypt(westResp, key) diff --git a/apps/api/internal/logic/IVYZ/ivyz0b03logic.go b/apps/api/internal/logic/IVYZ/ivyz0b03logic.go index 1131e7c..b46cab9 100644 --- a/apps/api/internal/logic/IVYZ/ivyz0b03logic.go +++ b/apps/api/internal/logic/IVYZ/ivyz0b03logic.go @@ -86,7 +86,7 @@ func (l *IVYZ0B03Logic) IVYZ0B03(req *types.Request) (resp string, err *errs.App //logx.Infof("交易号：%s", transactionID) //apiRequest := common.MapStructToAPIRequest(encryptedFields, westmodel.FLXGDEC7FieldMapping, "data") // - //westResp, callAPIErr := l.svcCtx.WestDexService.CallAPI("G23BJ03", apiRequest) + //westResp, callAPIErr := l.svcCtx.WestDexService.CallAPI("G23BJ03", apiRequest, l.svcCtx.Config.WestConfig.SecretId) //if callAPIErr != nil { // return "", errs.ErrSystem //} diff --git a/apps/api/internal/logic/IVYZ/ivyz2125logic.go b/apps/api/internal/logic/IVYZ/ivyz2125logic.go index a1c63a5..5a5f792 100644 --- a/apps/api/internal/logic/IVYZ/ivyz2125logic.go +++ b/apps/api/internal/logic/IVYZ/ivyz2125logic.go @@ -87,7 +87,7 @@ func (l *IVYZ2125Logic) IVYZ2125(req *types.Request) (resp string, err *errs.App //logx.Infof("交易号：%s", transactionID) //apiRequest := common.MapStructToAPIRequest(encryptedFields, westmodel.FLXGDEC7FieldMapping, "data") // - //westResp, callAPIErr := l.svcCtx.WestDexService.CallAPI("G23BJ03", apiRequest) + //westResp, callAPIErr := l.svcCtx.WestDexService.CallAPI("G23BJ03", apiRequest, l.svcCtx.Config.WestConfig.SecretId) //if callAPIErr != nil { // return "", errs.ErrSystem //} diff --git a/apps/api/internal/logic/IVYZ/ivyz385elogic.go b/apps/api/internal/logic/IVYZ/ivyz385elogic.go index b77c5a2..ec895bb 100644 --- a/apps/api/internal/logic/IVYZ/ivyz385elogic.go +++ b/apps/api/internal/logic/IVYZ/ivyz385elogic.go @@ -90,7 +90,7 @@ func (l *IVYZ385ELogic) IVYZ385E(req *types.Request) (resp string, err *errs.App logx.Infof("交易号：%s", transactionID) apiRequest := common.MapStructToAPIRequest(encryptedFields, westmodel.IVYZ385EFieldMapping, "") - westResp, callAPIErr := l.svcCtx.WestDexService.CallAPI("WEST00020", apiRequest) + westResp, callAPIErr := l.svcCtx.WestDexService.CallAPI("WEST00020", apiRequest, l.svcCtx.Config.WestConfig.SecretId) if callAPIErr != nil { if callAPIErr.Code == errs.ErrDataSource.Code { encryptData, aesEncrypt := crypto.AesEncrypt(westResp, key) diff --git a/apps/api/internal/logic/IVYZ/ivyz5733logic.go b/apps/api/internal/logic/IVYZ/ivyz5733logic.go index 4882abb..2dc8967 100644 --- a/apps/api/internal/logic/IVYZ/ivyz5733logic.go +++ b/apps/api/internal/logic/IVYZ/ivyz5733logic.go @@ -89,7 +89,7 @@ func (l *IVYZ5733Logic) IVYZ5733(req *types.Request) (resp string, err *errs.App logx.Infof("交易号：%s", transactionID) apiRequest := common.MapStructToAPIRequest(encryptedFields, westmodel.IVYZ5733FieldMapping, "data") - westResp, callAPIErr := l.svcCtx.WestDexService.CallAPI("G09GX01", apiRequest) + westResp, callAPIErr := l.svcCtx.WestDexService.CallAPI("G09GX01", apiRequest, l.svcCtx.Config.WestConfig.SecretId) if callAPIErr != nil { if callAPIErr.Code == errs.ErrDataSource.Code { encryptData, aesEncrypt := crypto.AesEncrypt(westResp, key) diff --git a/apps/api/internal/logic/IVYZ/ivyz9363logic.go b/apps/api/internal/logic/IVYZ/ivyz9363logic.go index e356f59..b98315c 100644 --- a/apps/api/internal/logic/IVYZ/ivyz9363logic.go +++ b/apps/api/internal/logic/IVYZ/ivyz9363logic.go @@ -90,7 +90,7 @@ func (l *IVYZ9363Logic) IVYZ9363(req *types.Request) (resp string, err *errs.App logx.Infof("交易号：%s", transactionID) apiRequest := common.MapStructToAPIRequest(encryptedFields, westmodel.IVYZ9363FieldMapping, "data") - westResp, callAPIErr := l.svcCtx.WestDexService.CallAPI("G10GX01", apiRequest) + westResp, callAPIErr := l.svcCtx.WestDexService.CallAPI("G10GX01", apiRequest, l.svcCtx.Config.WestConfig.SecretId) if callAPIErr != nil { if callAPIErr.Code == errs.ErrDataSource.Code { encryptData, aesEncrypt := crypto.AesEncrypt(westResp, key) diff --git a/apps/api/internal/logic/IVYZ/ivyzadeelogic.go b/apps/api/internal/logic/IVYZ/ivyzadeelogic.go index c9e8766..ae86760 100644 --- a/apps/api/internal/logic/IVYZ/ivyzadeelogic.go +++ b/apps/api/internal/logic/IVYZ/ivyzadeelogic.go @@ -86,7 +86,7 @@ func (l *IVYZADEELogic) IVYZADEE(req *types.Request) (resp string, err *errs.App //logx.Infof("交易号：%s", transactionID) //apiRequest := common.MapStructToAPIRequest(encryptedFields, westmodel.FLXGDEC7FieldMapping, "data") // - //westResp, callAPIErr := l.svcCtx.WestDexService.CallAPI("idCardThreeElements", apiRequest) + //westResp, callAPIErr := l.svcCtx.WestDexService.CallAPI("idCardThreeElements", apiRequest, l.svcCtx.Config.WestConfig.SecretId) //if callAPIErr != nil { // return "", errs.ErrSystem //} diff --git a/apps/api/internal/logic/JRZQ/jrzq0a03logic.go b/apps/api/internal/logic/JRZQ/jrzq0a03logic.go index b56e6e5..7315afb 100644 --- a/apps/api/internal/logic/JRZQ/jrzq0a03logic.go +++ b/apps/api/internal/logic/JRZQ/jrzq0a03logic.go @@ -90,7 +90,7 @@ func (l *JRZQ0A03Logic) JRZQ0A03(req *types.Request) (resp string, err *errs.App logx.Infof("交易号：%s", transactionID) apiRequest := common.MapStructToAPIRequest(encryptedFields, westmodel.JRZQ0A03FieldMapping, "data") - westResp, callAPIErr := l.svcCtx.WestDexService.CallAPI("G27BJ05", apiRequest) + westResp, callAPIErr := l.svcCtx.WestDexService.CallAPI("G27BJ05", apiRequest, l.svcCtx.Config.WestConfig.SecretId) if callAPIErr != nil { if callAPIErr.Code == errs.ErrDataSource.Code { encryptData, aesEncrypt := crypto.AesEncrypt(westResp, key) diff --git a/apps/api/internal/logic/JRZQ/jrzq4aa8logic.go b/apps/api/internal/logic/JRZQ/jrzq4aa8logic.go index 5c8fc9f..d995606 100644 --- a/apps/api/internal/logic/JRZQ/jrzq4aa8logic.go +++ b/apps/api/internal/logic/JRZQ/jrzq4aa8logic.go @@ -90,7 +90,7 @@ func (l *JRZQ4AA8Logic) JRZQ4AA8(req *types.Request) (resp string, err *errs.App logx.Infof("交易号：%s", transactionID) apiRequest := common.MapStructToAPIRequest(encryptedFields, westmodel.JRZQ4AA8FieldMapping, "data") - westResp, callAPIErr := l.svcCtx.WestDexService.CallAPI("G29BJ05", apiRequest) + westResp, callAPIErr := l.svcCtx.WestDexService.CallAPI("G29BJ05", apiRequest, l.svcCtx.Config.WestConfig.SecretId) if callAPIErr != nil { if callAPIErr.Code == errs.ErrDataSource.Code { encryptData, aesEncrypt := crypto.AesEncrypt(westResp, key) diff --git a/apps/api/internal/logic/JRZQ/jrzq8203logic.go b/apps/api/internal/logic/JRZQ/jrzq8203logic.go index 5a09db3..fc92863 100644 --- a/apps/api/internal/logic/JRZQ/jrzq8203logic.go +++ b/apps/api/internal/logic/JRZQ/jrzq8203logic.go @@ -90,7 +90,7 @@ func (l *JRZQ8203Logic) JRZQ8203(req *types.Request) (resp string, err *errs.App logx.Infof("交易号：%s", transactionID) apiRequest := common.MapStructToAPIRequest(encryptedFields, westmodel.JRZQ8203FieldMapping, "data") - westResp, callAPIErr := l.svcCtx.WestDexService.CallAPI("G28BJ05", apiRequest) + westResp, callAPIErr := l.svcCtx.WestDexService.CallAPI("G28BJ05", apiRequest, l.svcCtx.Config.WestConfig.SecretId) if callAPIErr != nil { if callAPIErr.Code == errs.ErrDataSource.Code { encryptData, aesEncrypt := crypto.AesEncrypt(westResp, key) diff --git a/apps/api/internal/logic/JRZQ/jrzqdcbelogic.go b/apps/api/internal/logic/JRZQ/jrzqdcbelogic.go index b18dacc..3b9d435 100644 --- a/apps/api/internal/logic/JRZQ/jrzqdcbelogic.go +++ b/apps/api/internal/logic/JRZQ/jrzqdcbelogic.go @@ -90,7 +90,7 @@ func (l *JRZQDCBELogic) JRZQDCBE(req *types.Request) (resp string, err *errs.App logx.Infof("交易号：%s", transactionID) apiRequest := common.MapStructToAPIRequest(encryptedFields, westmodel.JRZQDBCEFieldMapping, "data") - westResp, callAPIErr := l.svcCtx.WestDexService.CallAPI("G20GZ01", apiRequest) + westResp, callAPIErr := l.svcCtx.WestDexService.CallAPI("G20GZ01", apiRequest, l.svcCtx.Config.WestConfig.SecretId) if callAPIErr != nil { if callAPIErr.Code == errs.ErrDataSource.Code { encryptData, aesEncrypt := crypto.AesEncrypt(westResp, key) diff --git a/apps/api/internal/logic/QYGL/qygl2acdlogic.go b/apps/api/internal/logic/QYGL/qygl2acdlogic.go index 87f8900..dcc0e5d 100644 --- a/apps/api/internal/logic/QYGL/qygl2acdlogic.go +++ b/apps/api/internal/logic/QYGL/qygl2acdlogic.go @@ -90,7 +90,7 @@ func (l *QYGL2ACDLogic) QYGL2ACD(req *types.Request) (resp string, err *errs.App logx.Infof("交易号：%s", transactionID) apiRequest := common.MapStructToAPIRequest(encryptedFields, westmodel.QYGL2ACDFieldMapping, "data") - westResp, callAPIErr := l.svcCtx.WestDexService.CallAPI("WEST00022", apiRequest) + westResp, callAPIErr := l.svcCtx.WestDexService.CallAPI("WEST00022", apiRequest, l.svcCtx.Config.WestConfig.SecretId) if callAPIErr != nil { if callAPIErr.Code == errs.ErrDataSource.Code { encryptData, aesEncrypt := crypto.AesEncrypt(westResp, key) diff --git a/apps/api/internal/logic/QYGL/qygl45bdlogic.go b/apps/api/internal/logic/QYGL/qygl45bdlogic.go index 5e69902..e762627 100644 --- a/apps/api/internal/logic/QYGL/qygl45bdlogic.go +++ b/apps/api/internal/logic/QYGL/qygl45bdlogic.go @@ -90,7 +90,7 @@ func (l *QYGL45BDLogic) QYGL45BD(req *types.Request) (resp string, err *errs.App logx.Infof("交易号：%s", transactionID) apiRequest := common.MapStructToAPIRequest(encryptedFields, westmodel.QYGL45BDFieldMapping, "data") - westResp, callAPIErr := l.svcCtx.WestDexService.CallAPI("WEST00021", apiRequest) + westResp, callAPIErr := l.svcCtx.WestDexService.CallAPI("WEST00021", apiRequest, l.svcCtx.Config.WestConfig.SecretId) if callAPIErr != nil { if callAPIErr.Code == errs.ErrDataSource.Code { encryptData, aesEncrypt := crypto.AesEncrypt(westResp, key) diff --git a/apps/api/internal/logic/QYGL/qygl6f2dlogic.go b/apps/api/internal/logic/QYGL/qygl6f2dlogic.go index c004dfa..3be9ab0 100644 --- a/apps/api/internal/logic/QYGL/qygl6f2dlogic.go +++ b/apps/api/internal/logic/QYGL/qygl6f2dlogic.go @@ -90,7 +90,7 @@ func (l *QYGL6F2DLogic) QYGL6F2D(req *types.Request) (resp string, err *errs.App logx.Infof("交易号：%s", transactionID) apiRequest := common.MapStructToAPIRequest(encryptedFields, westmodel.QYGL6F2DFieldMapping, "data") - westResp, callAPIErr := l.svcCtx.WestDexService.CallAPI("G05XM02", apiRequest) + westResp, callAPIErr := l.svcCtx.WestDexService.CallAPI("G05XM02", apiRequest, l.svcCtx.Config.WestConfig.SecretId) if callAPIErr != nil { if callAPIErr.Code == errs.ErrDataSource.Code { encryptData, aesEncrypt := crypto.AesEncrypt(westResp, key) diff --git a/apps/api/internal/logic/QYGL/qygl8261logic.go b/apps/api/internal/logic/QYGL/qygl8261logic.go index 3fff1e9..4d27030 100644 --- a/apps/api/internal/logic/QYGL/qygl8261logic.go +++ b/apps/api/internal/logic/QYGL/qygl8261logic.go @@ -90,7 +90,7 @@ func (l *QYGL8261Logic) QYGL8261(req *types.Request) (resp string, err *errs.App logx.Infof("交易号：%s", transactionID) apiRequest := common.MapStructToAPIRequest(encryptedFields, westmodel.QYGL8261FieldMapping, "data") - westResp, callAPIErr := l.svcCtx.WestDexService.CallAPI("Q03BJ03", apiRequest) + westResp, callAPIErr := l.svcCtx.WestDexService.CallAPI("Q03BJ03", apiRequest, l.svcCtx.Config.WestConfig.SecretId) if callAPIErr != nil { if callAPIErr.Code == errs.ErrDataSource.Code { encryptData, aesEncrypt := crypto.AesEncrypt(westResp, key) diff --git a/apps/api/internal/logic/QYGL/qyglb4c0logic.go b/apps/api/internal/logic/QYGL/qyglb4c0logic.go index b7928cd..546e71f 100644 --- a/apps/api/internal/logic/QYGL/qyglb4c0logic.go +++ b/apps/api/internal/logic/QYGL/qyglb4c0logic.go @@ -79,18 +79,22 @@ func (l *QYGLB4C0Logic) QYGLB4C0(req *types.Request) (resp string, err *errs.App } // 3、西部加密 - westConfig := l.svcCtx.Config.WestConfig - encryptedFields, encryptStructFieldsErr := common.EncryptStructFields(data, westConfig.Key) - if encryptStructFieldsErr != nil { - logx.Errorf("西部加密错误：%v", encryptStructFieldsErr) - return "", errs.ErrSystem + //westConfig := l.svcCtx.Config.WestConfig + //encryptedFields, encryptStructFieldsErr := common.EncryptStructFields(data, westConfig.Key) + //if encryptStructFieldsErr != nil { + // logx.Errorf("西部加密错误：%v", encryptStructFieldsErr) + // return "", errs.ErrSystem + //} + IDCard := crypto.Md5Encrypt(data.IDCard) + encryptedFields := map[string]interface{}{ + "IDCard": IDCard, } // 4、发送请求到西部 logx.Infof("交易号：%s", transactionID) - apiRequest := common.MapStructToAPIRequest(encryptedFields, westmodel.QYGLB4C0FieldMapping, "data") + apiRequest := common.MapStructToAPIRequest(encryptedFields, westmodel.QYGLB4C0FieldMapping, "") - westResp, callAPIErr := l.svcCtx.WestDexService.CallAPI("G05HZ01", apiRequest) + westResp, callAPIErr := l.svcCtx.WestDexService.CallAPI("G05HZ01", apiRequest, l.svcCtx.Config.WestConfig.SecretSecondId) if callAPIErr != nil { if callAPIErr.Code == errs.ErrDataSource.Code { encryptData, aesEncrypt := crypto.AesEncrypt(westResp, key) diff --git a/apps/api/internal/logic/YYSY/yysy09cdlogic.go b/apps/api/internal/logic/YYSY/yysy09cdlogic.go index 7713a63..e1bb754 100644 --- a/apps/api/internal/logic/YYSY/yysy09cdlogic.go +++ b/apps/api/internal/logic/YYSY/yysy09cdlogic.go @@ -91,7 +91,7 @@ func (l *YYSY09CDLogic) YYSY09CD(req *types.Request) (resp string, err *errs.App logx.Infof("交易号：%s", transactionID) apiRequest := common.MapStructToAPIRequest(encryptedFields, westmodel.YYSY09CDFieldMapping, "data") - westResp, callAPIErr := l.svcCtx.WestDexService.CallAPI("G16BJ02", apiRequest) + westResp, callAPIErr := l.svcCtx.WestDexService.CallAPI("G16BJ02", apiRequest, l.svcCtx.Config.WestConfig.SecretId) if callAPIErr != nil { if callAPIErr.Code == errs.ErrDataSource.Code { encryptData, aesEncrypt := crypto.AesEncrypt(westResp, key) diff --git a/apps/api/internal/logic/YYSY/yysy4b21logic.go b/apps/api/internal/logic/YYSY/yysy4b21logic.go index 353b9d5..ca364dc 100644 --- a/apps/api/internal/logic/YYSY/yysy4b21logic.go +++ b/apps/api/internal/logic/YYSY/yysy4b21logic.go @@ -90,7 +90,7 @@ func (l *YYSY4B21Logic) YYSY4B21(req *types.Request) (resp string, err *errs.App logx.Infof("交易号：%s", transactionID) apiRequest := common.MapStructToAPIRequest(encryptedFields, westmodel.YYSY4B21FieldMapping, "data") - westResp, callAPIErr := l.svcCtx.WestDexService.CallAPI("G25BJ02", apiRequest) + westResp, callAPIErr := l.svcCtx.WestDexService.CallAPI("G25BJ02", apiRequest, l.svcCtx.Config.WestConfig.SecretId) if callAPIErr != nil { if callAPIErr.Code == errs.ErrDataSource.Code { encryptData, aesEncrypt := crypto.AesEncrypt(westResp, key) diff --git a/apps/api/internal/logic/YYSY/yysy4b37logic.go b/apps/api/internal/logic/YYSY/yysy4b37logic.go index 60fd4d1..e68eeea 100644 --- a/apps/api/internal/logic/YYSY/yysy4b37logic.go +++ b/apps/api/internal/logic/YYSY/yysy4b37logic.go @@ -90,7 +90,7 @@ func (l *YYSY4B37Logic) YYSY4B37(req *types.Request) (resp string, err *errs.App logx.Infof("交易号：%s", transactionID) apiRequest := common.MapStructToAPIRequest(encryptedFields, westmodel.YYSY4B37FieldMapping, "data") - westResp, callAPIErr := l.svcCtx.WestDexService.CallAPI("G02BJ02", apiRequest) + westResp, callAPIErr := l.svcCtx.WestDexService.CallAPI("G02BJ02", apiRequest, l.svcCtx.Config.WestConfig.SecretId) if callAPIErr != nil { if callAPIErr.Code == errs.ErrDataSource.Code { encryptData, aesEncrypt := crypto.AesEncrypt(westResp, key) diff --git a/apps/api/internal/logic/YYSY/yysy6f2elogic.go b/apps/api/internal/logic/YYSY/yysy6f2elogic.go index 8832431..39121ae 100644 --- a/apps/api/internal/logic/YYSY/yysy6f2elogic.go +++ b/apps/api/internal/logic/YYSY/yysy6f2elogic.go @@ -91,7 +91,7 @@ func (l *YYSY6F2ELogic) YYSY6F2E(req *types.Request) (resp string, err *errs.App logx.Infof("交易号：%s", transactionID) apiRequest := common.MapStructToAPIRequest(encryptedFields, westmodel.YYSY6F2EFieldMapping, "data") - westResp, callAPIErr := l.svcCtx.WestDexService.CallAPI("G15BJ02", apiRequest) + westResp, callAPIErr := l.svcCtx.WestDexService.CallAPI("G15BJ02", apiRequest, l.svcCtx.Config.WestConfig.SecretId) if callAPIErr != nil { if callAPIErr.Code == errs.ErrDataSource.Code { encryptData, aesEncrypt := crypto.AesEncrypt(westResp, key) diff --git a/apps/api/internal/logic/YYSY/yysybe08logic.go b/apps/api/internal/logic/YYSY/yysybe08logic.go index 683a88c..4352b6f 100644 --- a/apps/api/internal/logic/YYSY/yysybe08logic.go +++ b/apps/api/internal/logic/YYSY/yysybe08logic.go @@ -90,7 +90,7 @@ func (l *YYSYBE08Logic) YYSYBE08(req *types.Request) (resp string, err *errs.App logx.Infof("交易号：%s", transactionID) apiRequest := common.MapStructToAPIRequest(encryptedFields, westmodel.YYSYBE08FieldMapping, "data") - westResp, callAPIErr := l.svcCtx.WestDexService.CallAPI("G17BJ02", apiRequest) + westResp, callAPIErr := l.svcCtx.WestDexService.CallAPI("G17BJ02", apiRequest, l.svcCtx.Config.WestConfig.SecretId) if callAPIErr != nil { if callAPIErr.Code == errs.ErrDataSource.Code { encryptData, aesEncrypt := crypto.AesEncrypt(westResp, key) diff --git a/apps/api/internal/logic/YYSY/yysyd50flogic.go b/apps/api/internal/logic/YYSY/yysyd50flogic.go index c21142f..3be2e29 100644 --- a/apps/api/internal/logic/YYSY/yysyd50flogic.go +++ b/apps/api/internal/logic/YYSY/yysyd50flogic.go @@ -90,7 +90,7 @@ func (l *YYSYD50FLogic) YYSYD50F(req *types.Request) (resp string, err *errs.App logx.Infof("交易号：%s", transactionID) apiRequest := common.MapStructToAPIRequest(encryptedFields, westmodel.YYSYD50FFieldMapping, "data") - westResp, callAPIErr := l.svcCtx.WestDexService.CallAPI("G18BJ02", apiRequest) + westResp, callAPIErr := l.svcCtx.WestDexService.CallAPI("G18BJ02", apiRequest, l.svcCtx.Config.WestConfig.SecretId) if callAPIErr != nil { if callAPIErr.Code == errs.ErrDataSource.Code { encryptData, aesEncrypt := crypto.AesEncrypt(westResp, key) diff --git a/apps/api/internal/logic/YYSY/yysyf7dblogic.go b/apps/api/internal/logic/YYSY/yysyf7dblogic.go index 6646ea5..c9adef6 100644 --- a/apps/api/internal/logic/YYSY/yysyf7dblogic.go +++ b/apps/api/internal/logic/YYSY/yysyf7dblogic.go @@ -88,7 +88,7 @@ func (l *YYSYF7DBLogic) YYSYF7DB(req *types.Request) (resp string, err *errs.App logx.Infof("交易号：%s", transactionID) apiRequest := common.MapStructToAPIRequest(encryptedFields, westmodel.YYSYF7DBFieldMapping, "data") - westResp, callAPIErr := l.svcCtx.WestDexService.CallAPI("G19BJ02", apiRequest) + westResp, callAPIErr := l.svcCtx.WestDexService.CallAPI("G19BJ02", apiRequest, l.svcCtx.Config.WestConfig.SecretId) if callAPIErr != nil { if callAPIErr.Code == errs.ErrDataSource.Code { encryptData, aesEncrypt := crypto.AesEncrypt(westResp, key) diff --git a/apps/api/internal/service/west_dex_service.go b/apps/api/internal/service/west_dex_service.go index b27b3c7..a276dad 100644 --- a/apps/api/internal/service/west_dex_service.go +++ b/apps/api/internal/service/west_dex_service.go @@ -37,13 +37,13 @@ func NewWestDexService(config config.WestConfig) *WestDexService { } // CallAPI 调用西部数据的 API -func (w *WestDexService) CallAPI(code string, reqData map[string]interface{}) (resp []byte, err *errs.AppError) { +func (w *WestDexService) CallAPI(code string, reqData map[string]interface{}, secretId string) (resp []byte, err *errs.AppError) { logx.Infof("西部请求传入%v", reqData) // 生成当前的13位时间戳 timestamp := strconv.FormatInt(time.Now().UnixNano()/int64(time.Millisecond), 10) // 构造请求URL - reqUrl := fmt.Sprintf("%s/%s/%s?timestamp=%s", w.config.Url, w.config.SecretId, code, timestamp) + reqUrl := fmt.Sprintf("%s/%s/%s?timestamp=%s", w.config.Url, secretId, code, timestamp) jsonData, marshalErr := json.Marshal(reqData) if marshalErr != nil { diff --git a/pkg/crypto/crypto.go b/pkg/crypto/crypto.go index c994cd6..65c840d 100644 --- a/pkg/crypto/crypto.go +++ b/pkg/crypto/crypto.go @@ -4,8 +4,10 @@ import ( "bytes" "crypto/aes" "crypto/cipher" + "crypto/md5" "crypto/rand" "encoding/base64" + "encoding/hex" "errors" "io" ) @@ -94,3 +96,10 @@ func AesDecrypt(cipherTextBase64 string, key []byte) ([]byte, error) { return plainText, nil } + +// Md5Encrypt 用于对传入的message进行MD5加密 +func Md5Encrypt(message string) string { + hash := md5.New() + hash.Write([]byte(message)) // 将字符串转换为字节切片并写入 + return hex.EncodeToString(hash.Sum(nil)) // 将哈希值转换为16进制字符串并返回 +}