adjust timeout for testing purpose

huanggang
1 parent dd5fc334
Showing 2 changed files with 26 additions and 26 deletions
cashier-boss/src/main/java/com/diligrp/cashier/boss/Constants.java
cashier-pipeline/src/main/java/com/diligrp/cashier/pipeline/client/RcbOnlineHttpClient.java
@@ -14,7 +14,7 @@ public final class Constants {
     // TOKEN的签名长度
     public static final int TOKEN_SIGN_LENGTH = 8;
     // TOKEN过期时长，单位秒 - 5分钟
-    public static final long TOKEN_TIMEOUT_SECONDS = 5 * 60;
+    public static final long TOKEN_TIMEOUT_SECONDS = 10 * 60;
     public final static String CONTENT_TYPE = "application/json;charset=UTF-8";
@@ -83,13 +83,13 @@ public class RcbOnlineHttpClient extends ServiceEndpointSupport {
          params.put("sign", RcbSignatureUtils.sign(params, key));
          String payload = JsonUtils.toJsonString(params);
-         LOG.info("Sending rcb minipro prepay request: {}\n{}", request.getPaymentId(), payload);
+         LOG.info("Sending rcb MiniPro prepay request: {}\n{}", request.getPaymentId(), payload);
          HttpResult result = send(uri + "/cposp/pay/unifiedorder", payload);
          if (result.statusCode != STATUS_OK) {
-             LOG.error("Failed to send rcb minipro prepay, statusCode: {}", result.statusCode);
+             LOG.error("Failed to send rcb MiniPro prepay request: {}", result.statusCode);
              throw new PaymentPipelineException(ErrorCode.SYSTEM_UNKNOWN_ERROR, "调用小程序预支付接口失败: " + result.statusCode);
          }
-         LOG.debug("Received rcb minipro prepay response: {}", result.responseText);
+         LOG.debug("Received from rcb MiniPro pipeline: {}\n{}", request.getPaymentId(), result.responseText);
          Map<String, String> data = JsonUtils.fromJsonString(result.responseText, new TypeReference<>() {});
          String resultCode = data.get("resultCode");
@@ -101,7 +101,7 @@ public class RcbOnlineHttpClient extends ServiceEndpointSupport {
              }
              return data.get("payInfo");
          } else {
-             LOG.error("Failed to send minipro prepay request, errorCode: {}, resultMessage: {}", resultCode, resultMessage);
+             LOG.error("Failed to send MiniPro prepay request: {}\n{}", request.getPaymentId(), result.responseText);
              throw new PaymentPipelineException(ErrorCode.SERVICE_ACCESS_ERROR, "调用小程序预支付接口失败: " + resultMessage);
          }
      }
@@ -117,13 +117,13 @@ public class RcbOnlineHttpClient extends ServiceEndpointSupport {
         params.put("sign", RcbSignatureUtils.sign(params, key));
         String payload = JsonUtils.toJsonString(params);
-        LOG.debug("Sending rcb order query request: {}", payload);
+        LOG.info("Sending rcb query prepay order state request: {}", request.getPaymentId());
         HttpResult result = send(uri + "/cposp/pay/orderQuery", payload);
         if (result.statusCode != STATUS_OK) {
-            LOG.error("Failed to query rcb order, statusCode: {}", result.statusCode);
+            LOG.error("Failed to query rcb prepay order state: {}", result.statusCode);
             throw new PaymentPipelineException(ErrorCode.SYSTEM_UNKNOWN_ERROR, "查询支付状态失败: " + result.statusCode);
         }
-        LOG.debug("Received rcb order query response: {}", result.responseText);
+        LOG.debug("Received from rcb online pipeline: {}\n{}", request.getPaymentId(), result.responseText);
         Map<String, String> data = JsonUtils.fromJsonString(result.responseText, new TypeReference<>() {});
         String signature = data.remove("sign");
@@ -153,8 +153,8 @@ public class RcbOnlineHttpClient extends ServiceEndpointSupport {
             return new OnlinePaymentResponse(request.getPaymentId(), outTradeNo, paymentType,
                 payUserInfo, when, RcbStateUtils.paymentState(orderStatus), errorDesc);
         } else {
-            LOG.error("Failed to query rcb order, errorCode: {}, resultMessage: {}", resultCode, resultMessage);
-            throw new PaymentPipelineException(ErrorCode.SERVICE_ACCESS_ERROR, "调用支付结果查询接口失败");
+            LOG.error("Failed to query rcb prepay order state: {}\n{}", request.getPaymentId(), result.responseText);
+            throw new PaymentPipelineException(ErrorCode.SERVICE_ACCESS_ERROR, "调用支付结果查询接口失败: " + resultMessage);
         }
     }
@@ -169,20 +169,20 @@ public class RcbOnlineHttpClient extends ServiceEndpointSupport {
          params.put("sign", RcbSignatureUtils.sign(params, key));
          String payload = JsonUtils.toJsonString(params);
-         LOG.info("Sending close rcb order request: {}", payload);
+         LOG.info("Sending close rcb prepay order request: {}", request.getPaymentId());
          HttpResult result = send(uri + "/cposp/pay/closeOrder", payload);
          if (result.statusCode != STATUS_OK) {
-             LOG.error("Failed to close rcb order, statusCode: {}", result.statusCode);
+             LOG.error("Failed to close rcb prepay order: {}", request.getPaymentId());
              throw new PaymentPipelineException(ErrorCode.SYSTEM_UNKNOWN_ERROR, "关闭支付订单失败: " + result.statusCode);
          }
-         LOG.info("Received close rcb order response: {}", result.responseText);
+         LOG.debug("Received from rcb online pipeline: {}\n{}", request.getPaymentId(), result.responseText);
          Map<String, String> data = JsonUtils.fromJsonString(result.responseText, new TypeReference<>() {});
          String resultCode = data.get("resultCode");
          String resultMessage =  data.get("resultMessage");
          if (!"00".equals(resultCode)) {
-             LOG.error("Failed to close rcb order, errorCode: {}, resultMessage: {}", resultCode, resultMessage);
-             throw new PaymentPipelineException(ErrorCode.SERVICE_ACCESS_ERROR, "关闭支付订单失败");
+             LOG.error("Failed to close rcb prepay order: {}\n{}", request.getPaymentId(), result.responseText);
+             throw new PaymentPipelineException(ErrorCode.SERVICE_ACCESS_ERROR, "关闭支付订单失败: " + resultMessage);
          }
          String signature = data.remove("sign");
@@ -205,20 +205,21 @@ public class RcbOnlineHttpClient extends ServiceEndpointSupport {
         LocalDateTime now = LocalDateTime.now();
         String payload = JsonUtils.toJsonString(params);
-        LOG.debug("Sending refund request: {}", payload);
+        LOG.info("Sending rcb payment refund request: {}", request.getRefundId());
+
         HttpResult result = send(uri + "/cposp/pay/refund", payload);
         if (result.statusCode != STATUS_OK) {
-            LOG.error("Failed to refund rcb order, statusCode: {}", result.statusCode);
+            LOG.error("Failed to send rcb refund request: {}", request.getRefundId());
             throw new PaymentPipelineException(ErrorCode.SYSTEM_UNKNOWN_ERROR, "发送退款请求失败: " + result.statusCode);
         }
-        LOG.debug("Received rcb order refund response: {}", result.responseText);
+        LOG.debug("Received from rcb online pipeline: {}\n{}", request.getRefundId(), result.responseText);
         Map<String, String> data = JsonUtils.fromJsonString(result.responseText, new TypeReference<>() {});
         String resultCode = data.get("resultCode");
         String resultMessage =  data.get("resultMessage");
         if (!"00".equals(resultCode)) {
-            LOG.error("Failed to refund, errorCode: {}, resultMessage: {}", resultCode, resultMessage);
-            throw new PaymentPipelineException(ErrorCode.SERVICE_ACCESS_ERROR, "发送退款请求失败");
+            LOG.error("Failed to request rcb payment refund: {}\n{}", request.getRefundId(), result.responseText);
+            throw new PaymentPipelineException(ErrorCode.SERVICE_ACCESS_ERROR, "发送退款请求失败: " + resultMessage);
         }
         String signature = data.remove("sign");
@@ -238,20 +239,20 @@ public class RcbOnlineHttpClient extends ServiceEndpointSupport {
      */
     protected String getBatchNo() {
         try {
-            String key = "rcb:online:batchNo" + DateUtils.formatDate(LocalDate.now(), DateUtils.YYYYMMDD);
+            String key = "cashier:rcb:batchNo" + DateUtils.formatDate(LocalDate.now(), DateUtils.YYYYMMDD);
             String batchNo = stringRedisTemplate.opsForValue().get(key);
             if (batchNo != null) {
                 return batchNo;
             }
             String payload = String.format("{\"merchantNo\": \"%s\", \"terminalNo\": \"%s\"}", merchantNo, terminalNo);
-            LOG.debug("Sending signIn request: {}", payload);
+            LOG.debug("Sending rcb signIn request: {}", payload);
             HttpResult result = send(uri + "/cposp/pay/signIn", payload);
             if (result.statusCode != STATUS_OK) {
                 LOG.error("Failed to get rcb batch no, statusCode: {}", result.statusCode);
                 throw new PaymentPipelineException(ErrorCode.SYSTEM_UNKNOWN_ERROR, "获取签到批次号: " + result.statusCode);
             }
-            LOG.debug("Received rcb signIn response: {}", result.responseText);
+            LOG.debug("Received from rcb online pipeline: {}", result.responseText);
             Map<String, String> data = JsonUtils.fromJsonString(result.responseText, new TypeReference<>() {});
             String resultCode = data.get("resultCode");
@@ -274,9 +275,8 @@ public class RcbOnlineHttpClient extends ServiceEndpointSupport {
     protected String getTraceNo() {
         try {
-            String key = "rcb:online:traceNo" + DateUtils.formatDate(LocalDate.now(), DateUtils.YYYYMMDD);
+            String key = "cashier:rcb:traceNo" + DateUtils.formatDate(LocalDate.now(), DateUtils.YYYYMMDD);
             StringBuilder traceNo = new StringBuilder();
-
             List<Object> results = stringRedisTemplate.executePipelined(new SessionCallback<Object>() {
                 @Override
                 public Object execute(@NonNull RedisOperations operations) throws DataAccessException {
@@ -295,7 +295,7 @@ public class RcbOnlineHttpClient extends ServiceEndpointSupport {
             }
             return traceNo.toString();
         } catch (Exception ex) {
-            LOG.error("Failed to get traceNo", ex);
+            LOG.error("Failed to get rcb traceNo", ex);
             throw new PaymentPipelineException(ErrorCode.SERVICE_ACCESS_ERROR, "获取系统跟踪号失败");
         }
     }