autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-05-16 07:48:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

Browse Source
This commit is contained in:
Guoqs
2024-05-30 14:28:00 +08:00
parent 19b7113210 3c0404c8b4
commit f8c06c28b7
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/NinaXiaPlatformServiceImpl.java vendored
View File

@@ -589,10 +589,8 @@ public class NinaXiaPlatformServiceImpl implements ThirdPartyPlatformService {
} }
String data = map.get("Data"); String data = map.get("Data");
// 解密data (此处解密需用 thirdparty_platform_config 的密钥配置) // 解密data (此处解密需用 thirdparty_platform_config 的密钥配置)
ThirdPartyPlatformConfig configInfo = thirdPartyPlatformConfigService.getInfoByOperatorId(operatorIdByType);
ThirdPartySecretInfoVO thirdPartySecretInfoVO = thirdpartySecretInfoService.queryByThirdPlatformType(thirdPlatformType);
byte[] plainText = Cryptos.aesDecrypt(Encodes.decodeBase64(data), byte[] plainText = Cryptos.aesDecrypt(Encodes.decodeBase64(data),
configInfo.getDataSecret().getBytes(), configInfo.getDataSecretIv().getBytes()); ningXiaSecretInfo.getOurDataSecret().getBytes(), ningXiaSecretInfo.getOurDataSecretIv().getBytes());
String dataStr = new String(plainText, StandardCharsets.UTF_8); String dataStr = new String(plainText, StandardCharsets.UTF_8);
// 转成对应的对象 // 转成对应的对象
QueryChargingStatusVO vo = JSONObject.parseObject(dataStr, QueryChargingStatusVO.class); QueryChargingStatusVO vo = JSONObject.parseObject(dataStr, QueryChargingStatusVO.class);
@@ -637,7 +635,7 @@ public class NinaXiaPlatformServiceImpl implements ThirdPartyPlatformService {
String dataSecret = ningXiaSecretInfo.getTheirDataSecret(); String dataSecret = ningXiaSecretInfo.getTheirDataSecret();
String dataSecretIv = ningXiaSecretInfo.getTheirDataSecretIv(); String dataSecretIv = ningXiaSecretInfo.getTheirDataSecretIv();
String urlAddress = ningXiaSecretInfo.getTheirUrlPrefix(); String urlAddress = ningXiaSecretInfo.getTheirUrlPrefix();
OrderDetail orderDetail = orderBasicInfoService.getOrderDetailByOrderCode(orderCode); OrderDetail orderDetail = orderBasicInfoService.getOrderDetailByOrderCode(orderCode);
String url = urlAddress + "supervise_notification_charge_order_info_history"; String url = urlAddress + "supervise_notification_charge_order_info_history";