From 964869b72161052775c3cc66122b4ee9f5b9847b Mon Sep 17 00:00:00 2001 From: ZZ Date: Tue, 23 Nov 2021 15:39:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/xhpc/evcs/config/EvcsFilter.java | 1 - .../main/java/com/xhpc/evcs/notification/CoreDispatcher.java | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) 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 176b9fb8..5d56823b 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 @@ -257,7 +257,6 @@ public class EvcsFilter extends OncePerRequestFilter { } JsonNode dataNode = rootNode.path("Data"); String rawData = dataNode.toString(); - log.debug("out data: " + rawData); data = Aes128Cbc.encrypt(rawData, dataSecret, dataSecretIV); ((ObjectNode) rootNode).put("Data", data); } catch (Exception e) { diff --git a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/CoreDispatcher.java b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/CoreDispatcher.java index 9f01e940..3fe0649e 100644 --- a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/CoreDispatcher.java +++ b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/CoreDispatcher.java @@ -70,6 +70,7 @@ public class CoreDispatcher { String originalData = commonRequest.getData(); String tData; if (tokenExpiry == null || tokenExpiry.before(cal.getTime())) { + log.debug("query notify token opid3rdpt [{}]", authSecretTokenOut.getOperatorId3irdpty()); TokenRequest tokenRequest = new TokenRequest(); tokenRequest.setOperatorId(authSecretTokenOut.getOperatorId()); tokenRequest.setOperatorSecret(authSecretTokenOut.getOperatorSecret()); @@ -97,9 +98,11 @@ public class CoreDispatcher { bearerToken = authSecretTokenOut.getToken(); commonRequest.setData(originalData); tData = JSONUtil.toJSONString(commonRequest); + log.debug("to [{}] {} out encrypt data:\n{}", authSecretTokenOut.getOperatorId3irdpty(), url, tData); if (authSecretTokenOut.isEncrypt()) { tData = encryptReqOut(authSecretTokenOut.getDataSecret(), authSecretTokenOut.getDataSecretIV(), authSecretTokenOut.getSigSecret(), commonRequest); + log.debug("notify out encrypt data:\n{}", tData); } body = okhttp3.RequestBody.create(JSON, tData); }