diff --git a/evcs-modules/evcs-common/src/main/java/com/xhpc/evcs/dto/EquipBizRequest.java b/evcs-modules/evcs-common/src/main/java/com/xhpc/evcs/dto/EquipBizRequest.java index 33d195bc..486744d7 100644 --- a/evcs-modules/evcs-common/src/main/java/com/xhpc/evcs/dto/EquipBizRequest.java +++ b/evcs-modules/evcs-common/src/main/java/com/xhpc/evcs/dto/EquipBizRequest.java @@ -12,9 +12,9 @@ import lombok.Setter; public class EquipBizRequest { //将json当中的键值对为equipBizSeq的数据,封装到该属性中 - @JsonProperty("equipBizSeq") + @JsonProperty("EquipBizSeq") String equipBizSeq; - @JsonProperty("connectorId") + @JsonProperty("ConnectorID") String connectorId; } diff --git a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryEquipBusinessPolicyController.java b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryEquipBusinessPolicyController.java index 14faa95f..d2ed29aa 100644 --- a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryEquipBusinessPolicyController.java +++ b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryEquipBusinessPolicyController.java @@ -1,11 +1,7 @@ package com.xhpc.evcs.api; -import com.fasterxml.jackson.core.JsonProcessingException; import com.xhpc.common.data.redis.CacheRateModel; -import com.xhpc.evcs.dto.CommonResponse; -import com.xhpc.evcs.dto.EquipBizRequest; -import com.xhpc.evcs.dto.EquipBizResponse; -import com.xhpc.evcs.dto.PolicyInfos; +import com.xhpc.evcs.dto.*; import com.xhpc.evcs.jpa.XhpcTerminalRepository; import com.xhpc.evcs.utils.JSONUtil; import lombok.extern.slf4j.Slf4j; @@ -14,6 +10,7 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; +import java.io.IOException; import java.math.BigDecimal; import java.util.ArrayList; import java.util.HashMap; @@ -29,8 +26,9 @@ public class QueryEquipBusinessPolicyController { private XhpcTerminalRepository xhpcTerminalRepository; @PostMapping("/v1/query_equip_business_policy") - public CommonResponse queryEquipBusinessPolicy(@RequestBody EquipBizRequest equipBizRequest) throws JsonProcessingException { + public CommonResponse queryEquipBusinessPolicy(@RequestBody CommonRequest commonRequest) throws IOException { //获取充电设备接口编码(枪编码) + EquipBizRequest equipBizRequest = JSONUtil.readParams(commonRequest.getData(), EquipBizRequest.class); String connectorId = equipBizRequest.getConnectorId(); //获取枪所对应的桩编码 String bySerialNumber = xhpcTerminalRepository.selectBySql(connectorId); diff --git a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/config/EvcsFilter.java b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/config/EvcsFilter.java index 9ef88bca..ed73f982 100644 --- a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/config/EvcsFilter.java +++ b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/config/EvcsFilter.java @@ -267,6 +267,7 @@ public class EvcsFilter extends OncePerRequestFilter { InvalidKeyException { byte[] buf = new byte[]{}; + final String encin = request.getHeader("enc.in"); if ("POST".equalsIgnoreCase(request.getMethod())) { if (request.getServletPath().endsWith("/query_token")) { String encryptedMsg = commonRequest.getData(); @@ -289,7 +290,7 @@ public class EvcsFilter extends OncePerRequestFilter { String computedSig = HMAC.hmacDigest( operatorIDNode.asText().concat(dataNode.asText()).concat(timestampNode.asText()).concat(seqNode.asText()), authSecretToken.getSigSecret()); - if (!computedSig.equals(sigNode.asText())) { + if (encin == null || encin.equals("true") && !computedSig.equals(sigNode.asText())) { throw new InvalidAlgorithmParameterException("Illegal Sig, computed: ".concat(computedSig)); } if (!dataNode.isNull()) {