diff --git a/evcs-modules/evcs-common/src/main/java/com/xhpc/evcs/encryption/Aes128Cbc.java b/evcs-modules/evcs-common/src/main/java/com/xhpc/evcs/encryption/Aes128Cbc.java index c7065568..e149850a 100644 --- a/evcs-modules/evcs-common/src/main/java/com/xhpc/evcs/encryption/Aes128Cbc.java +++ b/evcs-modules/evcs-common/src/main/java/com/xhpc/evcs/encryption/Aes128Cbc.java @@ -61,7 +61,7 @@ public class Aes128Cbc { NoSuchAlgorithmException, IllegalBlockSizeException, UnsupportedEncodingException, NoSuchPaddingException, InvalidKeyException { - System.out.println(decryptString("Fa09StzEtf3Qfmr/b91gfg==", + System.out.println(decryptString("jfhddz8ZpaNGaiwFYieY7w==", "8LpncubmWiPCzY3V", "av6A8QdnRaVRMXu6" )); //ujNoGsWRo5MyPKYOxeofKwgPEng3xF+yhM8DDjwtwHo= diff --git a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationEquipChargeStatusTask.java b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationEquipChargeStatusTask.java index d12463a1..b312325e 100644 --- a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationEquipChargeStatusTask.java +++ b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationEquipChargeStatusTask.java @@ -95,7 +95,7 @@ public class NotificationEquipChargeStatusTask extends CoreDispatcher { public static void calculateEm(EquipChargeStatus equipChargeStatus, CacheRateModel cacheRateModel) { - if (cacheRateModel != null) { + if (cacheRateModel == null) { equipChargeStatus.setChargeDetails(new ChargeDetails[0]); return; }