From f904d27a0bcd75287786c947960f78a3fe2df2b9 Mon Sep 17 00:00:00 2001 From: "yqyg16603827325@126.com" Date: Tue, 16 Nov 2021 18:18:48 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=9B=9E=E8=B0=83=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/hchbox/api/RequestCore.java | 11 ++-- .../module/controller/RechargeController.java | 2 +- .../service/AccountRechargeService.java | 16 +++--- .../impl/AccountRechargeServiceImpl.java | 50 +++++++++++-------- .../impl/SynchronizedAmountServiceImpl.java | 11 ++-- .../src/main/resources/application-dev.yml | 19 +++++++ .../src/main/resources/application-prod.yml | 19 +++++++ .../src/main/resources/application.yml | 21 +------- .../src/main/resources/logback.xml | 4 +- 9 files changed, 91 insertions(+), 62 deletions(-) diff --git a/service/trade-service-others/trade-service-others-account/src/main/java/com/hchbox/api/RequestCore.java b/service/trade-service-others/trade-service-others-account/src/main/java/com/hchbox/api/RequestCore.java index 29d356a..a238ed2 100644 --- a/service/trade-service-others/trade-service-others-account/src/main/java/com/hchbox/api/RequestCore.java +++ b/service/trade-service-others/trade-service-others-account/src/main/java/com/hchbox/api/RequestCore.java @@ -1,5 +1,6 @@ package com.hchbox.api; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.http.HttpUtil; @@ -133,15 +134,15 @@ public class RequestCore { /** * 开通账号推送服务 * - * @param payOrder + * @param payTwoOrder * @return */ - public JSONObject updateSellerAccount(PayOrder payOrder) { + public JSONObject updateSellerAccount(PayTwoOrder payTwoOrder) { String reqUrl = url + API_PREFIX + "/account/updateSellerAccount"; Map map = new HashMap<>(); - map.put("accountBalance", payOrder.getAmount()); - map.put("id", payOrder.getMasterUserId()); - map.put("synchronizationDay", payOrder.getDays()); + map.put("accountBalance", payTwoOrder.getAmount()); + map.put("id", payTwoOrder.getMasterUserId()); + map.put("synchronizationDay", DateUtil.betweenDay(payTwoOrder.getOrderStartTime(), payTwoOrder.getOrderEndTime(), true)); String post = HttpUtil.post(reqUrl, JSONUtil.parseObj(map).toString()); JSONObject jsonObject; try { diff --git a/service/trade-service-others/trade-service-others-account/src/main/java/com/hchbox/module/controller/RechargeController.java b/service/trade-service-others/trade-service-others-account/src/main/java/com/hchbox/module/controller/RechargeController.java index 86cca5e..cba8bcf 100644 --- a/service/trade-service-others/trade-service-others-account/src/main/java/com/hchbox/module/controller/RechargeController.java +++ b/service/trade-service-others/trade-service-others-account/src/main/java/com/hchbox/module/controller/RechargeController.java @@ -44,7 +44,7 @@ public class RechargeController { return accountRechargeService.pcNotifyResponse(request); } - @ApiOperation(value = "支付回调2") + @ApiOperation(value = "同步历史数据支付回调") @RequestMapping(value = "/pay-notify-two") public CommonResult frontRcvResponseTwo(HttpServletRequest request) { return accountRechargeService.pcTwoNotifyResponse(request); diff --git a/service/trade-service-others/trade-service-others-account/src/main/java/com/hchbox/module/service/AccountRechargeService.java b/service/trade-service-others/trade-service-others-account/src/main/java/com/hchbox/module/service/AccountRechargeService.java index 94df61f..4d002ea 100644 --- a/service/trade-service-others/trade-service-others-account/src/main/java/com/hchbox/module/service/AccountRechargeService.java +++ b/service/trade-service-others/trade-service-others-account/src/main/java/com/hchbox/module/service/AccountRechargeService.java @@ -14,7 +14,6 @@ import javax.servlet.http.HttpServletRequest; public interface AccountRechargeService { /** * 充值 - * * @param rechargeOrder * @return */ @@ -22,7 +21,6 @@ public interface AccountRechargeService { /** * 支付宝创建订单 - * * @param aliPayPcVo * @return */ @@ -30,29 +28,27 @@ public interface AccountRechargeService { /** * 支付宝前端页面回调 - * * @param request * @return */ CommonResult pcNotifyResponse(HttpServletRequest request) throws Exception; /** - * 支付宝前端页面回调2 - * - * @param request + * 同步历史数据支付创建订单 + * @param payTwoOrder * @return */ - CommonResult pcTwoNotifyResponse(HttpServletRequest request); + CommonResult aliPayPcTwo(PayTwoOrder payTwoOrder); /** - * @param payTwoOrder + * 同步历史数据支付回调 + * @param request * @return */ - CommonResult aliPayPcTwo(PayTwoOrder payTwoOrder); + CommonResult pcTwoNotifyResponse(HttpServletRequest request); /** * 查询同步数据支付数据 - * * @param nickName * @return */ diff --git a/service/trade-service-others/trade-service-others-account/src/main/java/com/hchbox/module/service/impl/AccountRechargeServiceImpl.java b/service/trade-service-others/trade-service-others-account/src/main/java/com/hchbox/module/service/impl/AccountRechargeServiceImpl.java index baae660..dea3b59 100644 --- a/service/trade-service-others/trade-service-others-account/src/main/java/com/hchbox/module/service/impl/AccountRechargeServiceImpl.java +++ b/service/trade-service-others/trade-service-others-account/src/main/java/com/hchbox/module/service/impl/AccountRechargeServiceImpl.java @@ -161,20 +161,13 @@ public class AccountRechargeServiceImpl implements AccountRechargeService { order.setStatus(DefaultNumberConstants.ONE_NUMBER); payOrderRepository.save(order); i++; - //同步数据 + //同步到聚石塔内数据 JSONObject jsonObject = requestCore.savePayOrder(order); if (DefaultNumberConstants.TWO_HUNDRED == (Integer) jsonObject.get("code")) { i++; //子账号授权 JSONObject jsonObject1 = requestCore.authorizeChildrenAccount(order.getMasterUserId(), order.getNickName(), order.getTemplateId()); - if (DefaultNumberConstants.TWO_HUNDRED == (Integer) jsonObject1.get("code")) { - i++; - // 修改账户信息 开通服务 - JSONObject jsonObject2 = requestCore.updateSellerAccount(order); - if (DefaultNumberConstants.TWO_HUNDRED != (Integer) jsonObject2.get("code")) { - updateRollBack(order, DefaultNumberConstants.THREE_NUMBER); - } - } else { + if (DefaultNumberConstants.TWO_HUNDRED != (Integer) jsonObject1.get("code")) { updateRollBack(order, DefaultNumberConstants.TWO_NUMBER); } } else { @@ -192,14 +185,14 @@ public class AccountRechargeServiceImpl implements AccountRechargeService { private void updateRollBack(PayOrder payOrder, int i) { payOrder.setOrderStatus(i); - if (DefaultNumberConstants.ONE_NUMBER != i) { + if (i > DefaultNumberConstants.ONE_NUMBER) { requestCore.updatePayOrder(payOrder); } payOrderRepository.save(payOrder); } /** - * 支付2 + * 同步历史数据支付 * * @param payTwoOrder * @return {@link CommonResult}<{@link String}> @@ -238,6 +231,11 @@ public class AccountRechargeServiceImpl implements AccountRechargeService { return new CommonResult<>().success(byNickName); } + /** + * 同步历史数据支付回调 + * + * @param request + */ @Override public CommonResult pcTwoNotifyResponse(HttpServletRequest request) { int i = 0; @@ -261,23 +259,35 @@ public class AccountRechargeServiceImpl implements AccountRechargeService { i++; //同步数据 JSONObject jsonObject = requestCore.savePayTwoOrder(order); - if (DefaultNumberConstants.TWO_HUNDRED != (Integer) jsonObject.get("code")) { + if (DefaultNumberConstants.TWO_HUNDRED == (Integer) jsonObject.get("code")) { + i++; + // 修改账户信息 开通服务 + JSONObject jsonObject2 = requestCore.updateSellerAccount(order); + if (DefaultNumberConstants.TWO_HUNDRED == (Integer) jsonObject2.get("code")) { + // 同步主账号 + if (requestCore.updateAccount(order) == DefaultNumberConstants.ZERO_NUMBER) { + order.setOrderStatus(DefaultNumberConstants.TWO_NUMBER); + requestCore.updateTwoPayOrder(order); + log.error("++++++++++++++++同步主账号错误，账号id：{}", order.getMasterUserId()); + } + }else { + log.error("++++++++++++++++修改账户信息，开通淘宝服务失败：{}",order.getNickName()); + order.setOrderStatus(i); + requestCore.updateTwoPayOrder(order); + } + }else { + log.error("++++++++++++++++同步到聚石塔内数据失败：{}", order.getNickName()); order.setOrderStatus(DefaultNumberConstants.ONE_NUMBER); requestCore.updateTwoPayOrder(order); } - if (requestCore.updateAccount(order) == DefaultNumberConstants.ZERO_NUMBER) { - order.setOrderStatus(DefaultNumberConstants.TWO_NUMBER); - requestCore.updateTwoPayOrder(order); - log.error("++++++++++++++++同步主账号错误，账号id：{}", order.getMasterUserId()); - } } } } catch (Exception e) { - order.setOrderStatus(DefaultNumberConstants.ONE_NUMBER); - if (i == 1) { + order.setOrderStatus(i); + if (i > DefaultNumberConstants.ONE_NUMBER) { requestCore.updateTwoPayOrder(order); - payTwoOrderRepository.save(order); } + payTwoOrderRepository.save(order); log.error("the pc response error time {}", LocalTime.now()); throw new TaoMiCommException(ResponseCode.CALLBACK_FAILED.getDesc()); } diff --git a/service/trade-service-others/trade-service-others-account/src/main/java/com/hchbox/module/service/impl/SynchronizedAmountServiceImpl.java b/service/trade-service-others/trade-service-others-account/src/main/java/com/hchbox/module/service/impl/SynchronizedAmountServiceImpl.java index e801526..36fadd3 100644 --- a/service/trade-service-others/trade-service-others-account/src/main/java/com/hchbox/module/service/impl/SynchronizedAmountServiceImpl.java +++ b/service/trade-service-others/trade-service-others-account/src/main/java/com/hchbox/module/service/impl/SynchronizedAmountServiceImpl.java @@ -40,6 +40,11 @@ public class SynchronizedAmountServiceImpl implements SynchronizedAmountService double historyAmount = 0.00; int day = Math.toIntExact(DateUtil.betweenDay(DateUtil.parse(subAccountsVo.getStartTime()), DateUtil.parse(subAccountsVo.getEndTime()), true)); int average; + + payTwoOrder.setOrderStartTime(DateUtil.parse(subAccountsVo.getStartTime())); + payTwoOrder.setOrderEndTime(DateUtil.parse(subAccountsVo.getEndTime())); + payTwoOrder.setNickName(subAccountsVo.getNickname()); + payTwoOrder.setMasterUserId(subAccountsVo.getParentId()); if (taoBaoSaleSize != null && taoBaoSaleSize != DefaultNumberConstants.ZERO_NUMBER) { //历史金额 historyAmount = NumberUtil.mul(taoBaoSaleSize, amount).doubleValue(); @@ -53,12 +58,8 @@ public class SynchronizedAmountServiceImpl implements SynchronizedAmountService double bigDecimal = NumberUtil.mul(average, actualMaximum, amount).doubleValue(); payTwoOrder.setAmount(NumberUtil.round(bigDecimal, 2).doubleValue()); payTwoOrder.setIdenticalAmount(NumberUtil.round(historyAmount, 2).doubleValue()); - payTwoOrder.setOrderStartTime(DateUtil.parse(subAccountsVo.getStartTime())); - payTwoOrder.setOrderEndTime(DateUtil.parse(subAccountsVo.getEndTime())); - payTwoOrder.setNickName(subAccountsVo.getNickname()); - payTwoOrder.setAnticipateNum(NumberUtil.div(bigDecimal, BigDecimal.valueOf(amount)).longValue()); - payTwoOrder.setMasterUserId(subAccountsVo.getParentId()); payTwoOrder.setHistoryNum(taoBaoSaleSize.longValue()); + payTwoOrder.setAnticipateNum(NumberUtil.div(bigDecimal, BigDecimal.valueOf(amount)).longValue()); } else { payTwoOrder.setIdenticalAmount(0.00); payTwoOrder.setHistoryNum((long) DefaultNumberConstants.ZERO_NUMBER); diff --git a/service/trade-service-others/trade-service-others-account/src/main/resources/application-dev.yml b/service/trade-service-others/trade-service-others-account/src/main/resources/application-dev.yml index 33dd53b..e5389ea 100644 --- a/service/trade-service-others/trade-service-others-account/src/main/resources/application-dev.yml +++ b/service/trade-service-others/trade-service-others-account/src/main/resources/application-dev.yml @@ -67,6 +67,25 @@ spring: # sharding-column: task_id # algorithm-expression: dc_tag$->{task_id % 10} +alipay: + protocol: https + # 不需要加/gateway.do，这是新旧SDK的区别，切记 + # gatewayHost: openapi.alipaydev.com + gatewayHost: openapi.alipay.com + signType: RSA2 + # 填APPID + appId: 2021002188618779 + # 填应用私钥，注意是应用私钥，不要填成公钥了_(:з」∠)_ + merchantPrivateKey: MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDD/cy234eah/15CWb59pT3ABaNwDBYXmuFWanULTSYV/6Jxj1lpjABWH3SqXsn+MsYz+pxluIh19Do+A4wGtA5WYKBDidNLRaH9zTO9TUhZCjLFLy/APC1P6qmP41oPhgHGv7rzE7w94WfCBnrJ7gCNewXgp+Aw/zTY2Qi2XOhpqkGVpXgU1DiPufgZP7h42NR9RXmn95RAo8SMxTkIhZZZEiXwSboRv1pMGchqByNRqRzwgLbBU+Ez3sGgVzXynaNb0k4eSnkO/yT1BD7H8YzsFZWf0ymtjpG2GTZ5Vy6WMipxSBNsV0SuimslMSpmXxqpC4gCS53bEd+6CZgX5J5AgMBAAECggEAYjcrgXEe+VewtBj8G8Nv/x9yLfLjx0T5yMeYDZXhx35BNjW7ytavM91uoEUCTJOm43Y93FJqW99U94pnQcAOHM84UQgQteIkalp9gkDrMSKKNsrbkzQbbBjNoaYzbMvBKr5ihTPLU4IW2g0rP+aVlbYD6/wvhk2wwxYJtlUWVyjVs/32C6wrg7iqkSObZGReJyD++H4VCSmpyP6wf3wvPaQKGRrWuUVhTvPawzVRLuIr1T0J4iPfm81OeCiOt2+tXd9PtUaLeFna0OuCsd1NUXFS66KIp34Ok7Q1qthw9TuPXSXtR7gOLze5bxVBC59rLST/M+aUA2pk9/ABUZJHoQKBgQD5rfvoCIaO946oiJFSn5C1/KsXgNMe8hjAxflEK8cRANLkmbZE4qShWPR7/XajyNuVaHDX71lSyfcYAjDnPUI/AvxoQ80KuF817n32Z6b8CZni4A0OrQV6f/XR2GxuSBs5/ATY2l5ZP9OrqCCHfd8/wbaDd6pPVnXgKkftxd6+RQKBgQDI8+VtjbMqVomJJYxkZ910A28EyyAQJbl4WJm2S0i2eoM0txYH64FCCpzXrVIJKIp3dCLTd99rf3Tj/tGVNEaL5pRCfxuVPc+/17hSkFqZQN/+OE9Bn4dzg3P8MoxXnhcrrZHNdo55pD2mU4kk1Av/yv2gvE/IBlT74hR+3rowpQKBgGz1eFEyJ0aM0jzKHGEqMUS6FxASsA95J0Q5ISaW1DCfY2lPizNUlPO0ljzlx7iCFxGEmnohgaGXcbWQfzbqjNZivzPhIsHi4+ntQhsd8Mlch0Ny8z/MUe+7l9MT133pCbisOpFH+pSIPh9TJ575V0vDhZqpxjEJUjeZO/qPtzzhAoGAErqIe3llZWDDWMDjIMh9Xz6irjOwPVEGxCydxtulXzxz1gnqR7qvRVRv4boJl0jr/s4YINVfQUmTv1wUdG9207sdvkTScUpdfmfAihFiID5noe3llRwlJ6LswGiFo/Tb+/olSJzwEm44QLQwZ/pLU/+7O6vRU7cjXIZpmplviPECgYBiLacm7VIsPpB61LGbdBqmjKQLip+KwfWRtVonZlhQqkl8W0eSagDX+HdxtSoBqu5H/VUNMwiVNvPmMLqJLb9VYdZ4Imfmsg9zLumMLWlYpKBnYugD6pezWvvUDNhlc2/H3haE8N9I7divcyP3DhQnDi5KAcClYSXgwXHuK/WWhg== + # 填支付宝公钥，注意不是生成的应用公钥 + aliPayPublicKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlXlo4dqtsOw7yTqIQlbs6S3APkvFatPIjz3YOxx0wcY1MZ3ddVALQFoTdT0NQA6llyCJUAWXUjDOc6JueklHB5vq4GFNyzOzIiUzikQD2SYrKXsTMmEBhbsdgkN5BzKz1v4t5+R49raOaXswdCMvBl7eONg4dxAwSfxH+pQ1VRMZBgKk8JShx9eKC+LryE3TleUR9fwvhNc0RdbVwCdBmUqJJ7UVx2b1UGWNGcYp9UZQcDu4/g1XmleAsA2DOcJKDLGyKFsxLf17SPmpphPWx9LLNcRfgFODxzWl47HpgzyTh3CO7TuFCWYdsJ3UDbgUzaBV8Dm3uLhX65Dtaq1qawIDAQAB + # 回调地址 + notifyUrl: http://localhost:8856/api/account/pay-notify + # 可设置AES密钥，调用AES加解密相关接口时需要（可选） + encryptKey: + #同步历史数据支付回调 + notifyUrlTwo: http://localhost:8856/api/account/pay-notify-two + diff --git a/service/trade-service-others/trade-service-others-account/src/main/resources/application-prod.yml b/service/trade-service-others/trade-service-others-account/src/main/resources/application-prod.yml index 135c197..33f9bc7 100644 --- a/service/trade-service-others/trade-service-others-account/src/main/resources/application-prod.yml +++ b/service/trade-service-others/trade-service-others-account/src/main/resources/application-prod.yml @@ -72,3 +72,22 @@ spring: # algorithm-expression: dc_tag$->{task_id % 10} # jpa: # show-sql: true + +alipay: + protocol: https + # 不需要加/gateway.do，这是新旧SDK的区别，切记 + # gatewayHost: openapi.alipaydev.com + gatewayHost: openapi.alipay.com + signType: RSA2 + # 填APPID + appId: 2021002188618779 + # 填应用私钥，注意是应用私钥，不要填成公钥了_(:з」∠)_ + merchantPrivateKey: MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDD/cy234eah/15CWb59pT3ABaNwDBYXmuFWanULTSYV/6Jxj1lpjABWH3SqXsn+MsYz+pxluIh19Do+A4wGtA5WYKBDidNLRaH9zTO9TUhZCjLFLy/APC1P6qmP41oPhgHGv7rzE7w94WfCBnrJ7gCNewXgp+Aw/zTY2Qi2XOhpqkGVpXgU1DiPufgZP7h42NR9RXmn95RAo8SMxTkIhZZZEiXwSboRv1pMGchqByNRqRzwgLbBU+Ez3sGgVzXynaNb0k4eSnkO/yT1BD7H8YzsFZWf0ymtjpG2GTZ5Vy6WMipxSBNsV0SuimslMSpmXxqpC4gCS53bEd+6CZgX5J5AgMBAAECggEAYjcrgXEe+VewtBj8G8Nv/x9yLfLjx0T5yMeYDZXhx35BNjW7ytavM91uoEUCTJOm43Y93FJqW99U94pnQcAOHM84UQgQteIkalp9gkDrMSKKNsrbkzQbbBjNoaYzbMvBKr5ihTPLU4IW2g0rP+aVlbYD6/wvhk2wwxYJtlUWVyjVs/32C6wrg7iqkSObZGReJyD++H4VCSmpyP6wf3wvPaQKGRrWuUVhTvPawzVRLuIr1T0J4iPfm81OeCiOt2+tXd9PtUaLeFna0OuCsd1NUXFS66KIp34Ok7Q1qthw9TuPXSXtR7gOLze5bxVBC59rLST/M+aUA2pk9/ABUZJHoQKBgQD5rfvoCIaO946oiJFSn5C1/KsXgNMe8hjAxflEK8cRANLkmbZE4qShWPR7/XajyNuVaHDX71lSyfcYAjDnPUI/AvxoQ80KuF817n32Z6b8CZni4A0OrQV6f/XR2GxuSBs5/ATY2l5ZP9OrqCCHfd8/wbaDd6pPVnXgKkftxd6+RQKBgQDI8+VtjbMqVomJJYxkZ910A28EyyAQJbl4WJm2S0i2eoM0txYH64FCCpzXrVIJKIp3dCLTd99rf3Tj/tGVNEaL5pRCfxuVPc+/17hSkFqZQN/+OE9Bn4dzg3P8MoxXnhcrrZHNdo55pD2mU4kk1Av/yv2gvE/IBlT74hR+3rowpQKBgGz1eFEyJ0aM0jzKHGEqMUS6FxASsA95J0Q5ISaW1DCfY2lPizNUlPO0ljzlx7iCFxGEmnohgaGXcbWQfzbqjNZivzPhIsHi4+ntQhsd8Mlch0Ny8z/MUe+7l9MT133pCbisOpFH+pSIPh9TJ575V0vDhZqpxjEJUjeZO/qPtzzhAoGAErqIe3llZWDDWMDjIMh9Xz6irjOwPVEGxCydxtulXzxz1gnqR7qvRVRv4boJl0jr/s4YINVfQUmTv1wUdG9207sdvkTScUpdfmfAihFiID5noe3llRwlJ6LswGiFo/Tb+/olSJzwEm44QLQwZ/pLU/+7O6vRU7cjXIZpmplviPECgYBiLacm7VIsPpB61LGbdBqmjKQLip+KwfWRtVonZlhQqkl8W0eSagDX+HdxtSoBqu5H/VUNMwiVNvPmMLqJLb9VYdZ4Imfmsg9zLumMLWlYpKBnYugD6pezWvvUDNhlc2/H3haE8N9I7divcyP3DhQnDi5KAcClYSXgwXHuK/WWhg== + # 填支付宝公钥，注意不是生成的应用公钥 + aliPayPublicKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlXlo4dqtsOw7yTqIQlbs6S3APkvFatPIjz3YOxx0wcY1MZ3ddVALQFoTdT0NQA6llyCJUAWXUjDOc6JueklHB5vq4GFNyzOzIiUzikQD2SYrKXsTMmEBhbsdgkN5BzKz1v4t5+R49raOaXswdCMvBl7eONg4dxAwSfxH+pQ1VRMZBgKk8JShx9eKC+LryE3TleUR9fwvhNc0RdbVwCdBmUqJJ7UVx2b1UGWNGcYp9UZQcDu4/g1XmleAsA2DOcJKDLGyKFsxLf17SPmpphPWx9LLNcRfgFODxzWl47HpgzyTh3CO7TuFCWYdsJ3UDbgUzaBV8Dm3uLhX65Dtaq1qawIDAQAB + # 回调地址 + notifyUrl: http://47.110.11.213:8856/api/account/pay-notify + # 可设置AES密钥，调用AES加解密相关接口时需要（可选） + encryptKey: + #同步历史数据支付回调 + notifyUrlTwo: http://47.110.11.213:8856/api/account/pay-notify-two diff --git a/service/trade-service-others/trade-service-others-account/src/main/resources/application.yml b/service/trade-service-others/trade-service-others-account/src/main/resources/application.yml index bbee3c7..13f7f64 100644 --- a/service/trade-service-others/trade-service-others-account/src/main/resources/application.yml +++ b/service/trade-service-others/trade-service-others-account/src/main/resources/application.yml @@ -54,25 +54,6 @@ jwt: detect: 1800000 # 续期时间范围，默认1小时，单位毫秒 renew: 3600000 -alipay: - protocol: https - # 不需要加/gateway.do，这是新旧SDK的区别，切记 - # gatewayHost: openapi.alipaydev.com - gatewayHost: openapi.alipay.com - signType: RSA2 - # 填APPID - appId: 2021002188618779 - # 填应用私钥，注意是应用私钥，不要填成公钥了_(:з」∠)_ - merchantPrivateKey: MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDD/cy234eah/15CWb59pT3ABaNwDBYXmuFWanULTSYV/6Jxj1lpjABWH3SqXsn+MsYz+pxluIh19Do+A4wGtA5WYKBDidNLRaH9zTO9TUhZCjLFLy/APC1P6qmP41oPhgHGv7rzE7w94WfCBnrJ7gCNewXgp+Aw/zTY2Qi2XOhpqkGVpXgU1DiPufgZP7h42NR9RXmn95RAo8SMxTkIhZZZEiXwSboRv1pMGchqByNRqRzwgLbBU+Ez3sGgVzXynaNb0k4eSnkO/yT1BD7H8YzsFZWf0ymtjpG2GTZ5Vy6WMipxSBNsV0SuimslMSpmXxqpC4gCS53bEd+6CZgX5J5AgMBAAECggEAYjcrgXEe+VewtBj8G8Nv/x9yLfLjx0T5yMeYDZXhx35BNjW7ytavM91uoEUCTJOm43Y93FJqW99U94pnQcAOHM84UQgQteIkalp9gkDrMSKKNsrbkzQbbBjNoaYzbMvBKr5ihTPLU4IW2g0rP+aVlbYD6/wvhk2wwxYJtlUWVyjVs/32C6wrg7iqkSObZGReJyD++H4VCSmpyP6wf3wvPaQKGRrWuUVhTvPawzVRLuIr1T0J4iPfm81OeCiOt2+tXd9PtUaLeFna0OuCsd1NUXFS66KIp34Ok7Q1qthw9TuPXSXtR7gOLze5bxVBC59rLST/M+aUA2pk9/ABUZJHoQKBgQD5rfvoCIaO946oiJFSn5C1/KsXgNMe8hjAxflEK8cRANLkmbZE4qShWPR7/XajyNuVaHDX71lSyfcYAjDnPUI/AvxoQ80KuF817n32Z6b8CZni4A0OrQV6f/XR2GxuSBs5/ATY2l5ZP9OrqCCHfd8/wbaDd6pPVnXgKkftxd6+RQKBgQDI8+VtjbMqVomJJYxkZ910A28EyyAQJbl4WJm2S0i2eoM0txYH64FCCpzXrVIJKIp3dCLTd99rf3Tj/tGVNEaL5pRCfxuVPc+/17hSkFqZQN/+OE9Bn4dzg3P8MoxXnhcrrZHNdo55pD2mU4kk1Av/yv2gvE/IBlT74hR+3rowpQKBgGz1eFEyJ0aM0jzKHGEqMUS6FxASsA95J0Q5ISaW1DCfY2lPizNUlPO0ljzlx7iCFxGEmnohgaGXcbWQfzbqjNZivzPhIsHi4+ntQhsd8Mlch0Ny8z/MUe+7l9MT133pCbisOpFH+pSIPh9TJ575V0vDhZqpxjEJUjeZO/qPtzzhAoGAErqIe3llZWDDWMDjIMh9Xz6irjOwPVEGxCydxtulXzxz1gnqR7qvRVRv4boJl0jr/s4YINVfQUmTv1wUdG9207sdvkTScUpdfmfAihFiID5noe3llRwlJ6LswGiFo/Tb+/olSJzwEm44QLQwZ/pLU/+7O6vRU7cjXIZpmplviPECgYBiLacm7VIsPpB61LGbdBqmjKQLip+KwfWRtVonZlhQqkl8W0eSagDX+HdxtSoBqu5H/VUNMwiVNvPmMLqJLb9VYdZ4Imfmsg9zLumMLWlYpKBnYugD6pezWvvUDNhlc2/H3haE8N9I7divcyP3DhQnDi5KAcClYSXgwXHuK/WWhg== - # 填支付宝公钥，注意不是生成的应用公钥 - aliPayPublicKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlXlo4dqtsOw7yTqIQlbs6S3APkvFatPIjz3YOxx0wcY1MZ3ddVALQFoTdT0NQA6llyCJUAWXUjDOc6JueklHB5vq4GFNyzOzIiUzikQD2SYrKXsTMmEBhbsdgkN5BzKz1v4t5+R49raOaXswdCMvBl7eONg4dxAwSfxH+pQ1VRMZBgKk8JShx9eKC+LryE3TleUR9fwvhNc0RdbVwCdBmUqJJ7UVx2b1UGWNGcYp9UZQcDu4/g1XmleAsA2DOcJKDLGyKFsxLf17SPmpphPWx9LLNcRfgFODxzWl47HpgzyTh3CO7TuFCWYdsJ3UDbgUzaBV8Dm3uLhX65Dtaq1qawIDAQAB - # 回调地址 - notifyUrl: http://47.110.11.213:8856/api/account/pay-notify - # notifyUrl: http://172.18.0.27:8856/api/account/pay-notify - # 可设置AES密钥，调用AES加解密相关接口时需要（可选） - encryptKey: - notifyUrlTwo: http://47.110.11.213:8856/api/account/pay-notify-two -# notifyUrlTwo: http://172.18.0.27:8856/api/account/pay-notify-two snowflake: workerId: 9 datacenterId: 9 @@ -81,7 +62,7 @@ trade: service: source: url: http://39.100.226.133:80 -# url: http://localhost:80 + taobao: Synchronize: amount: 0.001 diff --git a/service/trade-service-others/trade-service-others-account/src/main/resources/logback.xml b/service/trade-service-others/trade-service-others-account/src/main/resources/logback.xml index d9f3a2f..ac60972 100644 --- a/service/trade-service-others/trade-service-others-account/src/main/resources/logback.xml +++ b/service/trade-service-others/trade-service-others-account/src/main/resources/logback.xml @@ -80,7 +80,9 @@ + - + +