From 7d39894ff23d95ce9779c473341e0afa9e660c75 Mon Sep 17 00:00:00 2001
From: ZZ <coml_aaron@163.com>
Date: Fri, 8 Oct 2021 16:35:21 +0800
Subject: [PATCH] opt-code

---
 .../main/java/com/xhpc/evcs/api/CoreDispatcher.java  |  7 +++----
 .../java/com/xhpc/evcs/api/QueryTokenController.java | 12 ------------
 2 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/CoreDispatcher.java b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/CoreDispatcher.java
index 06d0390b..1a518595 100644
--- a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/CoreDispatcher.java
+++ b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/CoreDispatcher.java
@@ -65,13 +65,12 @@ public class CoreDispatcher {
                 .writeTimeout(10, TimeUnit.SECONDS);
         Calendar cal = Calendar.getInstance();
         String bearer = null;
-        AuthSecretToken authSecretTokenOut;
+        AuthSecretToken authSecretTokenOut = getAuthSecretTokenOut(operatorId3irdpty, operatorID);
         try {
             if (object.getClass().getSimpleName().equals("CommonRequest")) {
                 CommonRequest commonRequest = (CommonRequest) object;
                 if (operatorId3irdpty == null)
                     operatorId3irdpty = commonRequest.getOperatorId();
-                authSecretTokenOut = getAuthSecretTokenOut(operatorId3irdpty, operatorID);
                 Date tokenExpiry = authSecretTokenOut.getTokenExpiry();
                 String oData = commonRequest.getData();
                 String tData;
@@ -87,7 +86,7 @@ public class CoreDispatcher {
                                 authSecretTokenOut.getSigSecret(), commonRequest);
                     }
                     Request request = new Request.Builder()
-                            .url(evcsSrvUrl + "/query_token")
+                            .url(authSecretTokenOut.getUrlPrefix() + "/query_token")
                             .post(okhttp3.RequestBody.create(JSON, tData))
                             .build();
                     OkHttpClient client = builder.build();
@@ -116,7 +115,7 @@ public class CoreDispatcher {
             throw new ServerInternalException(msg);
         }
         final Request.Builder req = new Request.Builder()
-                .url(evcsSrvUrl + url)
+                .url(authSecretTokenOut.getUrlPrefix() + url)
                 .header("Authorization", "Bearer " + bearer);
         Request request;
         assert body != null;
diff --git a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryTokenController.java b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryTokenController.java
index 8687f745..0c071656 100644
--- a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryTokenController.java
+++ b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryTokenController.java
@@ -40,12 +40,6 @@ public class QueryTokenController extends CoreDispatcher {
         tokenResponse.setOperatorId("MA6DFCTD5");
         tokenResponse.setSuccStat(0);
         tokenResponse.setFailReason(0);
-//        if (operator == null) {
-//            resp.setRet("4003");
-//            resp.setMsg("Invalid OperatorID");
-//            tokenResponse.setSuccStat(1);
-//            tokenResponse.setFailReason(1);
-//        } else {
         String data = null;
         AuthSecretToken authSecretToken = authSecretTokenRepository.findByOperatorId3irdptyAndSecretTokenTypeAndOperatorSecret(
                 operatorID, AuthSecretToken.SECRET_TOKEN_TYPE_IN, tokenRequest.getOperatorSecret()).orElse(null);
@@ -79,7 +73,6 @@ public class QueryTokenController extends CoreDispatcher {
             resp.setSig(encrypt.get("Sig").asText());
             log.debug("out.enc: {}", resp);
         }
-//        }
         return resp;
     }
 
@@ -90,9 +83,4 @@ public class QueryTokenController extends CoreDispatcher {
         return dt.toDate();
     }
 
-    private AuthSecretToken getAuthSecretToken(String operatorID, String tokenType) {
-
-        return authSecretTokenRepository.findByOperatorIdAndSecretTokenType(operatorID, tokenType).orElse(null);
-    }
-
 }