From 3123fb75fafc36578dde048daec6875b485dc116 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Mon, 10 Feb 2025 15:32:57 +0800 Subject: [PATCH] pom --- cash-api/pom.xml | 2 +- .../cash-common-api-config}/pom.xml | 20 +++++++++++-- .../main/java/com/czg/config/CacheConfig.java | 0 .../main/java/com/czg/config/CorsFilter.java | 0 .../czg/exception/CzgControllerAdvice.java | 0 cash-common/pom.xml | 3 +- cash-sdk/czg-pay/pom.xml | 1 - .../src/main/java/com/czg/CzgPayUtils.java | 29 ++++++++++++------- .../com/czg/entity/resp/CzgH5PayResp.java | 5 ++++ cash-service/pay-service/pom.xml | 27 +++++++++++++++++ cash-service/pom.xml | 1 + pom.xml | 2 -- 12 files changed, 71 insertions(+), 19 deletions(-) rename {cash-api/api-config => cash-common/cash-common-api-config}/pom.xml (60%) rename {cash-api/api-config => cash-common/cash-common-api-config}/src/main/java/com/czg/config/CacheConfig.java (100%) rename {cash-api/api-config => cash-common/cash-common-api-config}/src/main/java/com/czg/config/CorsFilter.java (100%) rename {cash-api/api-config => cash-common/cash-common-api-config}/src/main/java/com/czg/exception/CzgControllerAdvice.java (100%) create mode 100644 cash-service/pay-service/pom.xml diff --git a/cash-api/pom.xml b/cash-api/pom.xml index c3bba76f..74bc3b0b 100644 --- a/cash-api/pom.xml +++ b/cash-api/pom.xml @@ -43,7 +43,7 @@ com.czg - api-config + cash-common-api-config 1.0.0 diff --git a/cash-api/api-config/pom.xml b/cash-common/cash-common-api-config/pom.xml similarity index 60% rename from cash-api/api-config/pom.xml rename to cash-common/cash-common-api-config/pom.xml index 619b01ab..9a1d4643 100644 --- a/cash-api/api-config/pom.xml +++ b/cash-common/cash-common-api-config/pom.xml @@ -3,12 +3,12 @@ 4.0.0 com.czg - cash-api + cash-common 1.0.0 - api-config - maven-plugin + cash-common-api-config + jar api-config Maven Plugin @@ -19,6 +19,20 @@ + + org.springframework.boot + spring-boot-starter-web + + + org.apache.tomcat.embed + tomcat-embed-core + + + + + org.apache.tomcat.embed + tomcat-embed-core + org.projectlombok lombok diff --git a/cash-api/api-config/src/main/java/com/czg/config/CacheConfig.java b/cash-common/cash-common-api-config/src/main/java/com/czg/config/CacheConfig.java similarity index 100% rename from cash-api/api-config/src/main/java/com/czg/config/CacheConfig.java rename to cash-common/cash-common-api-config/src/main/java/com/czg/config/CacheConfig.java diff --git a/cash-api/api-config/src/main/java/com/czg/config/CorsFilter.java b/cash-common/cash-common-api-config/src/main/java/com/czg/config/CorsFilter.java similarity index 100% rename from cash-api/api-config/src/main/java/com/czg/config/CorsFilter.java rename to cash-common/cash-common-api-config/src/main/java/com/czg/config/CorsFilter.java diff --git a/cash-api/api-config/src/main/java/com/czg/exception/CzgControllerAdvice.java b/cash-common/cash-common-api-config/src/main/java/com/czg/exception/CzgControllerAdvice.java similarity index 100% rename from cash-api/api-config/src/main/java/com/czg/exception/CzgControllerAdvice.java rename to cash-common/cash-common-api-config/src/main/java/com/czg/exception/CzgControllerAdvice.java diff --git a/cash-common/pom.xml b/cash-common/pom.xml index d1d869a5..c3feec44 100644 --- a/cash-common/pom.xml +++ b/cash-common/pom.xml @@ -7,13 +7,14 @@ 1.0.0 - com.czg cash-common pom cash-common-tools cash-common-sa-token + cash-common-redis + cash-common-api-config diff --git a/cash-sdk/czg-pay/pom.xml b/cash-sdk/czg-pay/pom.xml index 0d01eefa..4763f4eb 100644 --- a/cash-sdk/czg-pay/pom.xml +++ b/cash-sdk/czg-pay/pom.xml @@ -9,7 +9,6 @@ 1.0.0 - com.ysk czg-pay diff --git a/cash-sdk/czg-pay/src/main/java/com/czg/CzgPayUtils.java b/cash-sdk/czg-pay/src/main/java/com/czg/CzgPayUtils.java index 8e5b08f8..4bcbc94c 100644 --- a/cash-sdk/czg-pay/src/main/java/com/czg/CzgPayUtils.java +++ b/cash-sdk/czg-pay/src/main/java/com/czg/CzgPayUtils.java @@ -10,6 +10,7 @@ import com.czg.entity.CzgBaseReqParams; import com.czg.entity.CzgBaseRespParams; import com.czg.entity.req.*; import com.czg.enums.CzgPayEnum; +import com.czg.resp.CzgRespCode; import com.czg.resp.CzgResult; import com.czg.utils.MD5Util; import lombok.NonNull; @@ -134,21 +135,22 @@ public class CzgPayUtils { * @param dataJsonStr 带解析数据 * @param clazz 返回的实体类 */ - public static T getCzg(String dataJsonStr, Class clazz) throws Exception { + public static T getCzg(String dataJsonStr, Class clazz) { if (StrUtil.isNotEmpty(dataJsonStr)) { CzgBaseRespParams respParams = JSONObject.parseObject(dataJsonStr, CzgBaseRespParams.class); log.info("超掌柜交易请求响应,{}", respParams); if (!"000000".equals(respParams.getCode())) { log.error("超掌柜回调响应失败,{}", respParams); - throw new Exception("超掌柜回调响应失败"); + return null; } - if (StrUtil.isNotBlank(respParams.getSign())) { - validateSign(respParams.getSign(), respParams.getBizData()); + if (!validateSign(respParams.getSign(), respParams.getBizData())) { + log.error("超掌柜回调 验签失败,{}", respParams); + } } return JSONObject.parseObject(respParams.getBizData(), clazz); } else { - throw new Exception("超掌柜回调接收内容异常"); + return null; } } @@ -178,16 +180,20 @@ public class CzgPayUtils { result.setCode("000000".equals(respParams.getCode()) ? 200 : Integer.parseInt(respParams.getCode())); result.setMsg(respParams.getMsg()); if ("000000".equals(respParams.getCode()) && StrUtil.isNotBlank(respParams.getSign())) { - validateSign(respParams.getSign(), respParams.getBizData()); + if (!validateSign(respParams.getSign(), respParams.getBizData())) { + result.setCode(CzgRespCode.FAILURE.getCode()); + result.setMsg("验签失败"); + } result.setData(respParams.getBizData()); } } else { - throw new Exception("超掌柜交易请求异常"); + result.setCode(resp.getStatus()); + result.setMsg("超掌柜交易请求失败"); + log.error("超掌柜交易请求失败，状态码: {}", resp.getStatus()); } } else { result.setCode(resp.getStatus()); result.setMsg("超掌柜交易请求失败"); - log.error("超掌柜交易请求失败，状态码: {}", resp.getStatus()); } } catch (Exception e) { log.error("超掌柜交易请求异常", e); @@ -198,14 +204,15 @@ public class CzgPayUtils { /** * @param sign 签名 * @param dataJsonStr 业务数据 - * @throws Exception 验签失败 + * @return true 验签通过 false 验签失败 */ - private static void validateSign(String sign, String dataJsonStr) throws Exception { + private static boolean validateSign(String sign, String dataJsonStr) { Map dataMap = JSONObject.parseObject(dataJsonStr, Map.class); String newSign = MD5Util.md5AsHex(sortFields(new TreeMap<>(dataMap))); if (!sign.equals(newSign)) { - throw new Exception("验签失败"); + return false; } + return true; } private static String sortFields(TreeMap map) { diff --git a/cash-sdk/czg-pay/src/main/java/com/czg/entity/resp/CzgH5PayResp.java b/cash-sdk/czg-pay/src/main/java/com/czg/entity/resp/CzgH5PayResp.java index 11db43f4..8738d7a4 100644 --- a/cash-sdk/czg-pay/src/main/java/com/czg/entity/resp/CzgH5PayResp.java +++ b/cash-sdk/czg-pay/src/main/java/com/czg/entity/resp/CzgH5PayResp.java @@ -1,9 +1,14 @@ package com.czg.entity.resp; +import lombok.Data; +import lombok.EqualsAndHashCode; + /** * @author ww * @description H5支付响应参数 */ +@Data +@EqualsAndHashCode(callSuper = true) public class CzgH5PayResp extends CzgBaseResp{ } diff --git a/cash-service/pay-service/pom.xml b/cash-service/pay-service/pom.xml new file mode 100644 index 00000000..2bdbf651 --- /dev/null +++ b/cash-service/pay-service/pom.xml @@ -0,0 +1,27 @@ + + + 4.0.0 + + com.czg + cash-service + 1.0.0 + + + pay-service + + + 21 + 21 + UTF-8 + + + + com.czg + czg-pay + 1.0.0 + + + + \ No newline at end of file diff --git a/cash-service/pom.xml b/cash-service/pom.xml index 64115f03..8786aad7 100644 --- a/cash-service/pom.xml +++ b/cash-service/pom.xml @@ -18,6 +18,7 @@ product-service system-service code-generator + pay-service diff --git a/pom.xml b/pom.xml index 2ceb51aa..dc28a3b3 100644 --- a/pom.xml +++ b/pom.xml @@ -26,8 +26,6 @@ cash-service cash-sdk cash-dependencies - cash-api/api-config - cash-common/cash-common-redis